4 files changed, 12 insertions, 5 deletions
diff --git a/sapi/nsapi/config.m4 b/sapi/nsapi/config.m4
index a117438ab..6e2478bcd 100644
--- a/sapi/nsapi/config.m4
+++ b/sapi/nsapi/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.17.6.2 2007/07/11 23:20:37 jani Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
 dnl
 
 PHP_ARG_WITH(nsapi, for NSAPI support,
diff --git a/sapi/nsapi/config.w32 b/sapi/nsapi/config.w32
index f81825da5..f0e36ef2a 100644
--- a/sapi/nsapi/config.w32
+++ b/sapi/nsapi/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.4.8.1 2009/03/20 18:49:37 pajoye Exp $
+// $Id: config.w32 277527 2009-03-20 18:49:37Z pajoye $
 
 ARG_ENABLE('nsapi', 'Build NSAPI for Netscape/iPlanet/SunONE webservers', 'no');
 
diff --git a/sapi/nsapi/nsapi-readme.txt b/sapi/nsapi/nsapi-readme.txt
index a93d69ec6..a2590ac91 100644
--- a/sapi/nsapi/nsapi-readme.txt
+++ b/sapi/nsapi/nsapi-readme.txt
@@ -151,4 +151,4 @@ for the correct DLL name. The DLL with the biggest filesize is the right one.
 But be warned: SUPPORT FOR nsapi_virtual() IS EXPERIMENTAL !!!
 
 
-$Id: nsapi-readme.txt,v 1.12.6.1 2006/10/27 07:29:51 thetaphi Exp $
+$Id: nsapi-readme.txt 242949 2007-09-26 15:44:16Z cvs2svn $
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 912a95ae6..cf088b1d6 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.19 2009/03/23 23:13:14 thetaphi Exp $ */
+/* $Id: nsapi.c 286722 2009-08-03 10:13:49Z thetaphi $ */
 
 /*
  * PHP includes
@@ -55,6 +55,13 @@
 #define XP_UNIX
 #endif
 #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
@@ -307,7 +314,7 @@ PHP_MSHUTDOWN_FUNCTION(nsapi)
 PHP_MINFO_FUNCTION(nsapi)
 {
 	php_info_print_table_start();
-	php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.69.2.3.2.6.2.19 $");
+	php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 286722 $");
 	php_info_print_table_row(2, "Server Software", system_version());
 	php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
 	 (nsapi_servact_service)?((zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0))?"not supported with zlib.output_compression":"enabled"):"not supported on this platform" );