summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Schindler <thetaphi@php.net>2009-08-03 10:14:20 +0000
committerUwe Schindler <thetaphi@php.net>2009-08-03 10:14:20 +0000
commita525ea8c5b10cccffba7c9c9b05a985a860ff440 (patch)
tree7ccbe3f887be342ae88317bd419263c469d07b3c
parentb691c3457931bb82c7f433a07f7d7d807289440a (diff)
downloadphp-git-a525ea8c5b10cccffba7c9c9b05a985a860ff440.tar.gz
MFH: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX
-rw-r--r--NEWS2
-rw-r--r--sapi/nsapi/nsapi.c7
2 files changed, 9 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 9aaa0c411b..9c591dd165 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ PHP NEWS
- Fixed regression in cURL extension that prevented flush of data to output
defined as a file handle. (Ilia)
+- Fixed bug #46020 (with Sun Java System Web Server 7.0 on HPUX, #define HPUX).
+ (Uwe Schindler)
- Fixed bug #49132 (posix_times returns false without error).
(phpbugs at gunnu dot us)
- Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu)
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index d5e070685d..8c2c4856ef 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -57,6 +57,13 @@
#endif
/*
+ * The manual define of HPUX is to fix bug #46020, nsapi.h needs this to detect HPUX
+ */
+#ifdef __hpux
+#define HPUX
+#endif
+
+/*
* NSAPI includes
*/
#include "nsapi.h"