[nginx] svn commit: r4731 - in branches/stable-1.2: . auto/os src/os/unix

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-07-02 17:22:31 +0000 (Mon, 02 Jul 2012)
New Revision: 4731
URL: http://trac.nginx.org/nginx/changeset/4731/nginx

Log:
Merge of r4693: fixed "sendmsg() failed" alerts on HP-UX.

HP-UX needs _HPUX_ALT_XOPEN_SOCKET_API to be defined to be able to
use various POSIX versions of networking functions.  Notably sendmsg()
resulted in "sendmsg() failed (9: Bad file number)" alerts without it.

See xopen_networking(7) for more details.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/auto/os/conf
   branches/stable-1.2/src/os/unix/ngx_posix_config.h

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-07-02 17:08:26 UTC (rev 4730)
+++ branches/stable-1.2	2012-07-02 17:22:31 UTC (rev 4731)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4692,4694-4696,4699,4704-4706
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4696,4699,4704-4706
\ No newline at end of property
Modified: branches/stable-1.2/auto/os/conf
===================================================================
--- branches/stable-1.2/auto/os/conf	2012-07-02 17:08:26 UTC (rev 4730)
+++ branches/stable-1.2/auto/os/conf	2012-07-02 17:22:31 UTC (rev 4731)
@@ -48,6 +48,7 @@
         CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
         CORE_SRCS="$UNIX_SRCS"
         CC_AUX_FLAGS="$CC_AUX_FLAGS -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
+        CC_AUX_FLAGS="$CC_AUX_FLAGS -D_HPUX_ALT_XOPEN_SOCKET_API"
     ;;
 
     OSF1:*)

Modified: branches/stable-1.2/src/os/unix/ngx_posix_config.h
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_posix_config.h	2012-07-02 17:08:26 UTC (rev 4730)
+++ branches/stable-1.2/src/os/unix/ngx_posix_config.h	2012-07-02 17:22:31 UTC (rev 4731)
@@ -12,6 +12,7 @@
 #if (NGX_HPUX)
 #define _XOPEN_SOURCE
 #define _XOPEN_SOURCE_EXTENDED  1
+#define _HPUX_ALT_XOPEN_SOCKET_API
 #endif