pop

diff --git a/meta b/meta
index 05b3f35a69490d649713458684a780f77606da2b..a891933aafed08733b1531e5448d9d03e85a1780 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 2893fa56924ea53e5f2d862735414db152eee5b0
-Head: 53932f9c5925f54b15f98fe644d872d7ac4722a7
+Previous: c9efc8967a1aa0c2f1422dd2fac9276a39d1a2ee
+Head: a184890ccc7ad7f83a9f2c84643286c9efb2a75b
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: b0bd56d129bc21e6683e742da4eaac5b7709067c
   rs-delay: 49e4eb6354a6b75a966040a156a8441ee5b18ba3
   rs-async-opt: 53932f9c5925f54b15f98fe644d872d7ac4722a7
+  rs-async-nonblock: a184890ccc7ad7f83a9f2c84643286c9efb2a75b
 Unapplied:
-  rs-async-nonblock: 992a8c5abcb0199fd6214fd31b6695573ccb5bf5
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3
 Hidden:

diff --git a/patches/rs-async-nonblock b/patches/rs-async-nonblock
index 9fa6d34204427b61dfc2f6c7792172f25d06b353..22a812219d8d06601ba0177b9498bf002fc53b78 100644 (file)
--- a/patches/rs-async-nonblock
+++ b/patches/rs-async-nonblock
@@ -1,5 +1,5 @@
-Bottom: 456260422aff51feca00c1ee2db83c3d63b6e111
-Top:    8f6ed845f1d4f512d6113d3b4ff5776c7e330fc4
+Bottom: 0811012347b0773da571fc97d17714e8e0e598f4
+Top:    8fde2d81ba8df54624406b0a9293e9aca478d450
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-16 15:23:41 -0700
 
@@ -24,7 +24,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 8d5a22d..2b25ef5 100644
+index ecaa779..181d54a 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -57,6 +57,7 @@ static int use_rs = 1;
@@ -75,17 +75,6 @@ index 8d5a22d..2b25ef5 100644
                                return ret;
                }
  
-@@ -323,8 +335,8 @@ static void set_options(int rs)
-                       break;
-       }
- 
--      rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
--                    (void *) &no_delay, sizeof(no_delay));
-+      val = 1;
-+      rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY, (void *) &val, sizeof(val));
- 
-       if (flags & MSG_DONTWAIT) {
-               rs_fcntl(rs, F_SETFL, O_NONBLOCK);
 @@ -377,8 +389,8 @@ static int server_connect(void)
                        fds.fd = lrs;
                        fds.events = POLLIN;
@@ -127,7 +116,7 @@ index 8d5a22d..2b25ef5 100644
  }
  
  static int run(void)
-@@ -562,6 +577,9 @@ int main(int argc, char **argv)
+@@ -564,6 +579,9 @@ int main(int argc, char **argv)
                }
        }