Bug 1293329, NSPR_4_13_BETA3, reusing r=ted
authorKai Engert <kaie@kuix.de>
Mon, 12 Sep 2016 05:36:36 -0700
changeset 357026 13e09cb5ffe9e9da162fbf048885aa2a4a9020d3
parent 357025 e8b53c6a566ec9f6d9abb194498044a6003c2b86
child 357027 e5400de3999089ffbd5a88752f775317b6f7deb0
push id1324
push usermtabara@mozilla.com
push dateMon, 16 Jan 2017 13:07:44 +0000
treeherdermozilla-release@a01c49833940 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1293329
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1293329, NSPR_4_13_BETA3, reusing r=ted
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/pr/src/pthreads/ptio.c
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_13_BETA2
+NSPR_4_13_BETA3
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -5,8 +5,9 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
+
--- a/nsprpub/pr/src/pthreads/ptio.c
+++ b/nsprpub/pr/src/pthreads/ptio.c
@@ -3333,16 +3333,17 @@ static PRFileDesc *pt_SetMethods(
                 break;
             case PR_DESC_SOCKET_UDP:
                 fd->methods = PR_GetUDPMethods();
                 pt_MakeFdNonblock(osfd);
                 break;
             case PR_DESC_PIPE:
                 fd->methods = PR_GetPipeMethods();
                 pt_MakeFdNonblock(osfd);
+                fd->secret->nonblocking = PR_TRUE;
                 break;
             default:
                 break;
         }
     }
     return fd;
 }  /* pt_SetMethods */