Imported Upstream version 5.3.1upstream/5.3.1

76 files changed, 419 insertions, 380 deletions

diff --git a/sapi/aolserver/README b/sapi/aolserver/README
index 80559fac2..0d1c998e2 100644
--- a/sapi/aolserver/README
+++ b/sapi/aolserver/README
@@ -1,4 +1,4 @@
-AOLserver README ($Id: README,v 1.6 2004/01/17 13:00:03 sniper Exp $)
+AOLserver README ($Id: README 149024 2004-01-17 13:00:38Z sniper $)
 
 To compile PHP 4.0 as a module for AOLserver, you need:
 
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 5584ef745..2cb8048af 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -22,7 +22,7 @@
  * - CGI/1.1 conformance
  */
 
-/* $Id: aolserver.c,v 1.81.2.2.2.1.2.8 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: aolserver.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 /* conflict between PHP and AOLserver headers */
 #define Debug php_Debug
@@ -205,7 +205,7 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS)
 	int i;
 	
 	php_info_print_table_start();
-	php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.81.2.2.2.1.2.8 2008/12/31 11:15:48 sebastian Exp $");
+	php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c 272370 2008-12-31 11:15:49Z sebastian $");
 	php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
 	php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
 	php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index 003ec909d..efc0c8b3e 100644
--- a/sapi/aolserver/config.m4
+++ b/sapi/aolserver/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.15.22.1 2007/07/11 23:20:36 jani Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
 dnl
 
 PHP_ARG_WITH(aolserver,,
diff --git a/sapi/aolserver/config.w32 b/sapi/aolserver/config.w32
index 676d38ec5..5ffc49d6a 100644
--- a/sapi/aolserver/config.w32
+++ b/sapi/aolserver/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/19 20:39:02 wez Exp $
+// $Id: config.w32 146950 2003-12-19 20:39:04Z wez $
 
 ARG_WITH('aolserver', 'Build AOLserver support', 'no');
 
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 0f5ed6bac..2db1b68b9 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.75.4.2 2007/07/11 23:20:36 jani Exp $
+dnl $Id: config.m4 239540 2007-07-11 23:20:37Z jani $
 dnl
 AC_DEFUN([PHP_APACHE_FD_CHECK], [
 AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[
diff --git a/sapi/apache/config.w32 b/sapi/apache/config.w32
index 36ae1411c..79e246655 100644
--- a/sapi/apache/config.w32
+++ b/sapi/apache/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.7.8.1 2008/04/15 16:55:53 auroraeosrose Exp $
+// $Id: config.w32 257603 2008-04-15 16:55:53Z auroraeosrose $
 
 ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
 
diff --git a/sapi/apache/libpre.c b/sapi/apache/libpre.c
index 48eebf7e0..2fc8c2ac4 100644
--- a/sapi/apache/libpre.c
+++ b/sapi/apache/libpre.c
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: libpre.c,v 1.6.2.1.2.1.2.2 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: libpre.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #ifdef NETWARE
 
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 9bb98ceba..ce0f81967 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <zeev@zend.com>                      |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.11 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: mod_php5.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php_apache_http.h"
 #include "http_conf_globals.h"
diff --git a/sapi/apache/mod_php5.h b/sapi/apache/mod_php5.h
index c5a4d1b10..7f7c159e1 100644
--- a/sapi/apache/mod_php5.h
+++ b/sapi/apache/mod_php5.h
@@ -15,7 +15,7 @@
    | Author: Rasmus Lerdorf <rasmus@php.net>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.h,v 1.4.2.1.2.1.2.3 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: mod_php5.h 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #ifndef MOD_PHP5_H
 #define MOD_PHP5_H
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 44d969a89..09e8a6519 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -17,7 +17,7 @@
    |          David Sklar <sklar@student.net>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.89.2.4.2.6.2.10 2009/01/05 16:24:26 iliaa Exp $ */
+/* $Id: php_apache.c 272840 2009-01-05 16:24:26Z iliaa $ */
 
 #include "php_apache_http.h"
 
diff --git a/sapi/apache/php_apache_http.h b/sapi/apache/php_apache_http.h
index 42e32adcd..936484a15 100644
--- a/sapi/apache/php_apache_http.h
+++ b/sapi/apache/php_apache_http.h
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_apache_http.h,v 1.13.2.1.2.1.2.3 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: php_apache_http.h 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #define NO_REGEX_EXTRA_H
 
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index f736119ee..dce6e5bcc 100644
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -19,7 +19,7 @@
    | Stig Bakken <ssb@php.net>                                            |
    +----------------------------------------------------------------------+
  */
-/* $Id: sapi_apache.c,v 1.47.2.1.2.1.2.2 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: sapi_apache.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php_apache_http.h"
 
diff --git a/sapi/apache2filter/apache_config.c b/sapi/apache2filter/apache_config.c
index 0afd83d57..e06b16856 100644
--- a/sapi/apache2filter/apache_config.c
+++ b/sapi/apache2filter/apache_config.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: apache_config.c,v 1.34.2.1.2.3.2.2 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: apache_config.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 1fa03d4a9..77823664f 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.41.2.1.2.2.2.2 2008/03/09 12:35:56 lstrojny Exp $
+dnl $Id: config.m4 254692 2008-03-09 12:35:56Z lstrojny $
 dnl
 
 PHP_ARG_WITH(apxs2filter,,
diff --git a/sapi/apache2filter/config.w32 b/sapi/apache2filter/config.w32
index 5aa9078c6..6e7aab59c 100755
--- a/sapi/apache2filter/config.w32
+++ b/sapi/apache2filter/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.1.2.1.2.1 2008/05/14 03:13:17 auroraeosrose Exp $
+// $Id: config.w32 259731 2008-05-14 03:13:17Z auroraeosrose $
 
 ARG_ENABLE('apache2filter', 'Build Apache 2.x filter', 'no');
 
diff --git a/sapi/apache2filter/php_apache.h b/sapi/apache2filter/php_apache.h
index 49bd5f262..3f54fa714 100644
--- a/sapi/apache2filter/php_apache.h
+++ b/sapi/apache2filter/php_apache.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_apache.h,v 1.25.2.1.2.2.2.4 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: php_apache.h 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #ifndef PHP_APACHE_H
 #define PHP_APACHE_H
diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c
index 845f70dff..d0b662f6c 100644
--- a/sapi/apache2filter/php_functions.c
+++ b/sapi/apache2filter/php_functions.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_functions.c,v 1.44.2.2.2.2.2.9 2009/01/05 16:24:26 iliaa Exp $ */
+/* $Id: php_functions.c 272840 2009-01-05 16:24:26Z iliaa $ */
 
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index d963c1c56..22f368edd 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.136.2.2.2.8.2.7 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: sapi_apache2.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include <fcntl.h>
 
diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c
index 24358fa08..8057050e4 100644
--- a/sapi/apache2handler/apache_config.c
+++ b/sapi/apache2handler/apache_config.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: apache_config.c,v 1.7.2.1.2.4.2.4 2008/12/31 14:45:14 bjori Exp $ */
+/* $Id: apache_config.c 272413 2008-12-31 14:45:14Z bjori $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 08ab1b909..2cb3313f7 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.14.2.1.2.2.2.3 2008/03/11 22:47:39 lstrojny Exp $
+dnl $Id: config.m4 254930 2008-03-11 22:47:39Z lstrojny $
 dnl
 
 PHP_ARG_WITH(apxs2,,
diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32
index 70aee0b71..ad3191823 100644
--- a/sapi/apache2handler/config.w32
+++ b/sapi/apache2handler/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.1.6.2.2.1 2008/05/14 03:13:17 auroraeosrose Exp $
+// $Id: config.w32 259731 2008-05-14 03:13:17Z auroraeosrose $
 
 ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
 
diff --git a/sapi/apache2handler/mod_php5.c b/sapi/apache2handler/mod_php5.c
index 68082eca6..038a7122a 100644
--- a/sapi/apache2handler/mod_php5.c
+++ b/sapi/apache2handler/mod_php5.c
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mod_php5.c,v 1.5.2.1.2.1.2.2 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: mod_php5.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h
index b0ac5464e..8573967a9 100644
--- a/sapi/apache2handler/php_apache.h
+++ b/sapi/apache2handler/php_apache.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_apache.h,v 1.8.2.1.2.2.2.3 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: php_apache.h 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #ifndef PHP_APACHE_H
 #define PHP_APACHE_H
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 65b280642..87bed1113 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_functions.c,v 1.18.2.6.2.5.2.11 2009/01/19 19:32:40 scottmac Exp $ */
+/* $Id: php_functions.c 273971 2009-01-19 19:32:40Z scottmac $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 00ef1b28e..62504af42 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.15.2.6 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: sapi_apache2.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4
index 12fc9fd50..12c568767 100644
--- a/sapi/apache_hooks/config.m4
+++ b/sapi/apache_hooks/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.7.4.2 2007/07/11 23:20:36 jani Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
 dnl
 AC_DEFUN([PHP_APACHE_FD_CHECK], [
 AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[
diff --git a/sapi/apache_hooks/config.w32 b/sapi/apache_hooks/config.w32
index 76869bd24..abc28c996 100644
--- a/sapi/apache_hooks/config.w32
+++ b/sapi/apache_hooks/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.2.8.1 2008/04/15 16:55:53 auroraeosrose Exp $
+// $Id: config.w32 257603 2008-04-15 16:55:53Z auroraeosrose $
 
 ARG_WITH('apache-hooks', 'Build Apache 1.3.x (hooks) version of PHP', 'no');
 
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c
index 4c2f346a7..53d38ec91 100644
--- a/sapi/apache_hooks/mod_php5.c
+++ b/sapi/apache_hooks/mod_php5.c
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <zeev@zend.com>					  |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.c,v 1.11.2.1.2.5.2.5 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: mod_php5.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php_apache_http.h"
 
diff --git a/sapi/apache_hooks/mod_php5.h b/sapi/apache_hooks/mod_php5.h
index 85767d196..4bb98ad04 100644
--- a/sapi/apache_hooks/mod_php5.h
+++ b/sapi/apache_hooks/mod_php5.h
@@ -15,7 +15,7 @@
    | Author: Rasmus Lerdorf <rasmus@php.net>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.h,v 1.2.2.1.2.1.2.3 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: mod_php5.h 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #ifndef MOD_PHP5_H
 #define MOD_PHP5_H
diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index 1c9600537..f26328645 100644
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -17,7 +17,7 @@
    |          David Sklar <sklar@student.net>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.19.2.3.2.5.2.18 2009/03/16 10:13:18 pajoye Exp $ */
+/* $Id: php_apache.c 277250 2009-03-16 10:13:18Z pajoye $ */
 
 #include "php_apache_http.h"
 
diff --git a/sapi/apache_hooks/sapi_apache.c b/sapi/apache_hooks/sapi_apache.c
index 6df3fc770..c4a26af07 100644
--- a/sapi/apache_hooks/sapi_apache.c
+++ b/sapi/apache_hooks/sapi_apache.c
@@ -19,7 +19,7 @@
    | Stig Bakken <ssb@php.net>                                            |
    +----------------------------------------------------------------------+
  */
-/* $Id: sapi_apache.c,v 1.9.2.1.2.1.2.2 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: sapi_apache.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php_apache_http.h"
 
diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index 3ec0f4d8e..c1d89a3a7 100644
--- a/sapi/caudium/caudium.c
+++ b/sapi/caudium/caudium.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: caudium.c,v 1.36.2.1.2.1.2.4 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: caudium.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php.h"
 #ifdef HAVE_CAUDIUM
@@ -444,7 +444,7 @@ static void php_info_caudium(ZEND_MODULE_INFO_FUNC_ARGS)
 {
   /*  char buf[512]; */
   php_info_print_table_start();
-  php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.36.2.1.2.1.2.4 2008/12/31 11:15:48 sebastian Exp $");
+  php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c 272370 2008-12-31 11:15:49Z sebastian $");
   /*  php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
       php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
       php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4
index c1d32d8d7..b5d355538 100644
--- a/sapi/caudium/config.m4
+++ b/sapi/caudium/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.14.2.1.2.2 2007/07/11 23:20:36 jani Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
 dnl 
 
 RESULT=no
diff --git a/sapi/cgi/CHANGES b/sapi/cgi/CHANGES
index de0b36907..de029474e 100755
--- a/sapi/cgi/CHANGES
+++ b/sapi/cgi/CHANGES
@@ -1,34 +1,34 @@
-In PHP5.3 all additional configure options (except --enable-cgi) are removed:

-

-  --enable-fastcgi          CGI: If this is enabled, the cgi module will

-                            be built with support for fastcgi also

-

-                            Now fastcgi is always enabled

-

-  --disable-path-info-check CGI: If this is disabled, paths such as

-                            /info.php/test?a=b will fail to work

-

-                            Now it is enabled by default, but can be disabled

-                            with ini directive "cgi.fix_pathinfo=0"

-

-  --enable-force-cgi-redirect

-                            CGI: Enable the security check for internal server

-                            redirects.  You should use this if you are

-                            running the CGI version with Apache

-  							

-                            Now it is enabled by default, but can be disabled

-                            with ini directive "cgi.force_redirect=0"

-

-  --enable-discard-path     CGI: If this is enabled, the PHP CGI binary

-                            can safely be placed outside of the

-                            web tree and people will not be able

-                            to circumvent .htaccess security

-

-                            This option had effect only with

-                            --disable-path-info-check or "cgi.fix_pathinfo=0".

-                            Seems it needs only for CGI configuration that

-                            require each script start from "#! /usr/bin/php".

-

-                            Now it is disabled by default, but can be enabled

-                            with ini directive "cgi.discard_path=1".

-

+In PHP5.3 all additional configure options (except --enable-cgi) are removed:
+
+  --enable-fastcgi          CGI: If this is enabled, the cgi module will
+                            be built with support for fastcgi also
+
+                            Now fastcgi is always enabled
+
+  --disable-path-info-check CGI: If this is disabled, paths such as
+                            /info.php/test?a=b will fail to work
+
+                            Now it is enabled by default, but can be disabled
+                            with ini directive "cgi.fix_pathinfo=0"
+
+  --enable-force-cgi-redirect
+                            CGI: Enable the security check for internal server
+                            redirects.  You should use this if you are
+                            running the CGI version with Apache
+  							
+                            Now it is enabled by default, but can be disabled
+                            with ini directive "cgi.force_redirect=0"
+
+  --enable-discard-path     CGI: If this is enabled, the PHP CGI binary
+                            can safely be placed outside of the
+                            web tree and people will not be able
+                            to circumvent .htaccess security
+
+                            This option had effect only with
+                            --disable-path-info-check or "cgi.fix_pathinfo=0".
+                            Seems it needs only for CGI configuration that
+                            require each script start from "#! /usr/bin/php".
+
+                            Now it is disabled by default, but can be enabled
+                            with ini directive "cgi.discard_path=1".
+
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 04d8cbbd8..c01dce1dd 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.44 2009/06/22 14:10:40 pajoye Exp $ */
+/* $Id: cgi_main.c 289795 2009-10-20 12:57:44Z tony2001 $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -159,6 +159,7 @@ static const opt_struct OPTIONS[] = {
 typedef struct _php_cgi_globals_struct {
 	zend_bool rfc2616_headers;
 	zend_bool nph;
+	zend_bool check_shebang_line;
 	zend_bool fix_pathinfo;
 	zend_bool force_redirect;
 	zend_bool discard_path;
@@ -753,7 +754,11 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha
 		  if it is inside the docroot, we scan the tree up to the docroot 
 			to find more user.ini, if not we only scan the current path.
 		  */
+#ifdef PHP_WIN32
+		if (strnicmp(s1, s2, s_len) == 0) {
+#else 
 		if (strncmp(s1, s2, s_len) == 0) {
+#endif
 			ptr = s2 + start;  /* start is the point where doc_root ends! */
 			while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
 				*ptr = 0;
@@ -776,7 +781,7 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha
 static int sapi_cgi_activate(TSRMLS_D)
 {
 	char *path, *doc_root, *server_name;
-	uint path_len, doc_root_len;
+	uint path_len, doc_root_len, server_name_len;
 
 	/* PATH_TRANSLATED should be defined at this stage but better safe than sorry :) */
 	if (!SG(request_info).path_translated) {
@@ -788,7 +793,11 @@ static int sapi_cgi_activate(TSRMLS_D)
 		server_name = sapi_cgibin_getenv("SERVER_NAME", sizeof("SERVER_NAME") - 1 TSRMLS_CC);
 		/* SERVER_NAME should also be defined at this stage..but better check it anyway */
 		if (server_name) {
-			php_ini_activate_per_host_config(server_name, strlen(server_name) + 1 TSRMLS_CC);
+			server_name_len = strlen(server_name);
+			server_name = estrndup(server_name, server_name_len);
+			zend_str_tolower(server_name, server_name_len);
+			php_ini_activate_per_host_config(server_name, server_name_len + 1 TSRMLS_CC);
+			efree(server_name);
 		}
 	}
 
@@ -819,13 +828,21 @@ static int sapi_cgi_activate(TSRMLS_D)
 			/* DOCUMENT_ROOT should also be defined at this stage..but better check it anyway */
 			if (doc_root) {
 				doc_root_len = strlen(doc_root);
-				if (IS_SLASH(doc_root[doc_root_len - 1])) {
+				if (doc_root_len > 0 && IS_SLASH(doc_root[doc_root_len - 1])) {
 					--doc_root_len;
 				}
+#ifdef PHP_WIN32
+				/* paths on windows should be case-insensitive */
+				doc_root = estrndup(doc_root, doc_root_len);
+				zend_str_tolower(doc_root, doc_root_len);
+#endif
 				php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, doc_root_len - 1 TSRMLS_CC);
 			}
 		}
 
+#ifdef PHP_WIN32
+		efree(doc_root);
+#endif
 		efree(path);
 	}
 
@@ -1279,9 +1296,6 @@ static void init_request_info(TSRMLS_D)
 				if (pt) {
 					efree(pt);
 				}
-				if (is_valid_path(script_path_translated)) {
-					SG(request_info).path_translated = estrdup(script_path_translated);
-				}
 			} else {
 				/* make sure path_info/translated are empty */
 				if (!orig_script_filename ||
@@ -1310,9 +1324,6 @@ static void init_request_info(TSRMLS_D)
 				} else {
 					SG(request_info).request_uri = env_script_name;
 				}
-				if (is_valid_path(script_path_translated)) {
-					SG(request_info).path_translated = estrdup(script_path_translated);
-				}
 				free(real_path);
 			}
 		} else {
@@ -1325,9 +1336,10 @@ static void init_request_info(TSRMLS_D)
 			if (!CGIG(discard_path) && env_path_translated) {
 				script_path_translated = env_path_translated;
 			}
-			if (is_valid_path(script_path_translated)) {
-				SG(request_info).path_translated = estrdup(script_path_translated);
-			}
+		}
+
+		if (is_valid_path(script_path_translated)) {
+			SG(request_info).path_translated = estrdup(script_path_translated);
 		}
 
 		SG(request_info).request_method = sapi_cgibin_getenv("REQUEST_METHOD", sizeof("REQUEST_METHOD")-1 TSRMLS_CC);
@@ -1369,6 +1381,7 @@ void fastcgi_cleanup(int signal)
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("cgi.rfc2616_headers",     "0",  PHP_INI_ALL,    OnUpdateBool,   rfc2616_headers, php_cgi_globals_struct, php_cgi_globals)
 	STD_PHP_INI_ENTRY("cgi.nph",                 "0",  PHP_INI_ALL,    OnUpdateBool,   nph, php_cgi_globals_struct, php_cgi_globals)
+	STD_PHP_INI_ENTRY("cgi.check_shebang_line",  "1",  PHP_INI_SYSTEM, OnUpdateBool,   check_shebang_line, php_cgi_globals_struct, php_cgi_globals)
 	STD_PHP_INI_ENTRY("cgi.force_redirect",      "1",  PHP_INI_SYSTEM, OnUpdateBool,   force_redirect, php_cgi_globals_struct, php_cgi_globals)
 	STD_PHP_INI_ENTRY("cgi.redirect_status_env", NULL, PHP_INI_SYSTEM, OnUpdateString, redirect_status_env, php_cgi_globals_struct, php_cgi_globals)
 	STD_PHP_INI_ENTRY("cgi.fix_pathinfo",        "1",  PHP_INI_SYSTEM, OnUpdateBool,   fix_pathinfo, php_cgi_globals_struct, php_cgi_globals)
@@ -1385,6 +1398,7 @@ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals TSRMLS_
 {
 	php_cgi_globals->rfc2616_headers = 0;
 	php_cgi_globals->nph = 0;
+	php_cgi_globals->check_shebang_line = 1;
 	php_cgi_globals->force_redirect = 1;
 	php_cgi_globals->redirect_status_env = NULL;
 	php_cgi_globals->fix_pathinfo = 1;
@@ -2024,7 +2038,7 @@ consult the installation file that came with this distribution, or visit \n\
 				1. we are running from shell and got filename was there
 				2. we are running as cgi or fastcgi
 			*/
-			if (cgi || SG(request_info).path_translated) {
+			if (cgi || fastcgi || SG(request_info).path_translated) {
 				if (php_fopen_primary_script(&file_handle TSRMLS_CC) == FAILURE) {
 					if (errno == EACCES) {
 						SG(sapi_headers).http_response_code = 403;
@@ -2058,6 +2072,26 @@ consult the installation file that came with this distribution, or visit \n\
 				}
 			}
 
+			if (CGIG(check_shebang_line) && file_handle.handle.fp && (file_handle.handle.fp != stdin)) {
+				/* #!php support */
+				c = fgetc(file_handle.handle.fp);
+				if (c == '#') {
+					while (c != '\n' && c != '\r' && c != EOF) {
+						c = fgetc(file_handle.handle.fp);	/* skip to end of line */
+					}
+					/* handle situations where line is terminated by \r\n */
+					if (c == '\r') {
+						if (fgetc(file_handle.handle.fp) != '\n') {
+							long pos = ftell(file_handle.handle.fp);
+							fseek(file_handle.handle.fp, pos - 1, SEEK_SET);
+						}
+					}
+					CG(start_lineno) = 2;
+				} else {
+					rewind(file_handle.handle.fp);
+				}
+			}
+
 			switch (behavior) {
 				case PHP_MODE_STANDARD:
 					php_execute_script(&file_handle TSRMLS_CC);
@@ -2108,26 +2142,14 @@ consult the installation file that came with this distribution, or visit \n\
 
 fastcgi_request_done:
 			{
-				char *path_translated;
-
-				/* Go through this trouble so that the memory manager doesn't warn
-				 * about SG(request_info).path_translated leaking
-				 */
-				if (SG(request_info).path_translated) {
-					path_translated = strdup(SG(request_info).path_translated);
-					STR_FREE(SG(request_info).path_translated);
-					SG(request_info).path_translated = path_translated;
-				}
+				STR_FREE(SG(request_info).path_translated);
 
 				php_request_shutdown((void *) 0);
+
 				if (exit_status == 0) {
 					exit_status = EG(exit_status);
 				}
 
-				if (SG(request_info).path_translated) {
-					free(SG(request_info).path_translated);
-					SG(request_info).path_translated = NULL;
-				}
 				if (free_query_string && SG(request_info).query_string) {
 					free(SG(request_info).query_string);
 					SG(request_info).query_string = NULL;
diff --git a/sapi/cgi/config.w32 b/sapi/cgi/config.w32
index a6a54ad89..1e73e211f 100644
--- a/sapi/cgi/config.w32
+++ b/sapi/cgi/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.2.4.1.2.2.2.3 2007/10/05 16:00:30 rrichards Exp $
+// $Id: config.w32 243567 2007-10-05 16:00:30Z rrichards $
 
 ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes');
 
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index 7aae33bf7..5943c632b 100644
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.17.2.2.2.6.2.2 2007/10/01 12:40:54 jani Exp $
+dnl $Id: config9.m4 243300 2007-10-01 12:40:54Z jani $
 dnl
 
 PHP_ARG_ENABLE(cgi,,
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
index ff8e880a8..156a689c5 100644
--- a/sapi/cgi/fastcgi.c
+++ b/sapi/cgi/fastcgi.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: fastcgi.c,v 1.4.2.13.2.28.2.11 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: fastcgi.c 287777 2009-08-26 19:17:32Z pajoye $ */
 
 #include "php.h"
 #include "fastcgi.h"
@@ -398,20 +398,20 @@ int fcgi_listen(const char *path, int backlog)
 	} else {
 #ifdef _WIN32
 		SECURITY_DESCRIPTOR  sd;
-		SECURITY_ATTRIBUTES  sa;
+		SECURITY_ATTRIBUTES  saw;
 		PACL                 acl;
 		HANDLE namedPipe;
 
-		memset(&sa, 0, sizeof(sa));
-		sa.nLength = sizeof(sa);
-		sa.bInheritHandle = FALSE;
-		acl = prepare_named_pipe_acl(&sd, &sa);
+		memset(&sa, 0, sizeof(saw));
+		saw.nLength = sizeof(saw);
+		saw.bInheritHandle = FALSE;
+		acl = prepare_named_pipe_acl(&sd, &saw);
 
 		namedPipe = CreateNamedPipe(path,
 			PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
 			PIPE_TYPE_BYTE | PIPE_WAIT | PIPE_READMODE_BYTE,
 			PIPE_UNLIMITED_INSTANCES,
-			8192, 8192, 0, &sa);
+			8192, 8192, 0, &saw);
 		if (namedPipe == INVALID_HANDLE_VALUE) {
 			return -1;
 		}		
diff --git a/sapi/cgi/fastcgi.h b/sapi/cgi/fastcgi.h
index a3570b7bd..c4f62b8da 100644
--- a/sapi/cgi/fastcgi.h
+++ b/sapi/cgi/fastcgi.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: fastcgi.h,v 1.2.2.4.2.5.2.5 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: fastcgi.h 272370 2008-12-31 11:15:49Z sebastian $ */
 
 /* FastCGI protocol */
 
diff --git a/sapi/cgi/tests/006.phpt b/sapi/cgi/tests/006.phpt
index e183fea6b..a2b2b2903 100644
--- a/sapi/cgi/tests/006.phpt
+++ b/sapi/cgi/tests/006.phpt
@@ -2,6 +2,8 @@
 syntax check
 --SKIPIF--
 <?php include "skipif.inc"; ?>
+--INI--
+display_errors=stdout
 --FILE--
 <?php
 include "include.inc";
@@ -42,7 +44,7 @@ class test
 
 file_put_contents($filename, $code);
 
-var_dump(`"$php" -l "$filename" 2>/dev/null`);
+var_dump(`"$php" -n -l "$filename" 2>/dev/null`);
 
 @unlink($filename);
 
diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index e8043577e..882cab4ba 100644
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.22.2.1.2.1.2.1 2008/09/01 13:15:31 dmitry Exp $
+dnl $Id: config.m4 265790 2008-09-01 13:15:31Z dmitry $
 dnl
 
 PHP_ARG_ENABLE(cli,,
diff --git a/sapi/cli/config.w32 b/sapi/cli/config.w32
index f167828fc..cd106f197 100644
--- a/sapi/cli/config.w32
+++ b/sapi/cli/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.4.4.1.2.2 2007/10/05 16:00:30 rrichards Exp $
+// $Id: config.w32 243567 2007-10-05 16:00:30Z rrichards $
 
 ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes');
 ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index edc8f2953..aeade0940 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.129.2.13.2.22.2.26 2009/06/05 18:50:32 mattwil Exp $ */
+/* $Id: php_cli.c 287973 2009-09-02 20:02:17Z pajoye $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -298,7 +298,7 @@ static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{
 		remaining -= ret;
 	}
 
-	return str_length;
+	return (ptr - str);
 }
 /* }}} */
 
@@ -672,10 +672,12 @@ int main(int argc, char *argv[])
 #if defined(PHP_WIN32) && defined(_DEBUG) && defined(PHP_WIN32_DEBUG_HEAP)
 	{
 		int tmp_flag;
-		
+		_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+		_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
 		_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
 		_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
-
+		_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
+		_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
 		tmp_flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
 		tmp_flag |= _CRTDBG_DELAY_FREE_MEM_DF;
 		tmp_flag |= _CRTDBG_LEAK_CHECK_DF;
diff --git a/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c
index c79aa227c..66010d7b0 100644
--- a/sapi/cli/php_cli_readline.c
+++ b/sapi/cli/php_cli_readline.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli_readline.c,v 1.3.2.5.2.3.2.3 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: php_cli_readline.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php.h"
 
diff --git a/sapi/cli/php_cli_readline.h b/sapi/cli/php_cli_readline.h
index a200f656c..d2fd65935 100644
--- a/sapi/cli/php_cli_readline.h
+++ b/sapi/cli/php_cli_readline.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli_readline.h,v 1.2.2.1.2.1.2.2 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: php_cli_readline.h 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php.h"
 
diff --git a/sapi/continuity/capi.c b/sapi/continuity/capi.c
index 504739df3..250fa1424 100644
--- a/sapi/continuity/capi.c
+++ b/sapi/continuity/capi.c
@@ -110,7 +110,7 @@ PHP_MSHUTDOWN_FUNCTION(continuity)
 PHP_MINFO_FUNCTION(continuity)
 {
         php_info_print_table_start();
-        php_info_print_table_row(2, "Continuity Module Revision", "$Revision: 1.11.2.2.2.1.2.5 $");
+        php_info_print_table_row(2, "Continuity Module Revision", "$Revision: 272370 $");
         php_info_print_table_row(2, "Server Version", conFget_build());
 #ifdef CONTINUITY_CDPEXT
 	php_info_print_table_row(2,"CDP Extensions", "enabled");
diff --git a/sapi/continuity/config.m4 b/sapi/continuity/config.m4
index b22ac5bd3..b91dd63eb 100644
--- a/sapi/continuity/config.m4
+++ b/sapi/continuity/config.m4
@@ -1,4 +1,4 @@
-dnl ## $Id: config.m4,v 1.3.4.1 2007/07/11 23:20:36 jani Exp $ -*- sh -*-
+dnl ## $Id: config.m4 239540 2007-07-11 23:20:37Z jani $ -*- sh -*-
 
 PHP_ARG_WITH(continuity, for Continuity support,
 [  --with-continuity=DIR   Build PHP as Continuity Server module. 
diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4
index a02cdd215..c9c9030ee 100644
--- a/sapi/embed/config.m4
+++ b/sapi/embed/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.9.4.2 2007/07/11 23:20:36 jani Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
 dnl
 
 PHP_ARG_ENABLE(embed,,
diff --git a/sapi/embed/config.w32 b/sapi/embed/config.w32
index 673c7e07b..8effedd25 100644
--- a/sapi/embed/config.w32
+++ b/sapi/embed/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/19 23:19:19 wez Exp $
+// $Id: config.w32 146968 2003-12-19 23:19:19Z wez $
 
 ARG_ENABLE('embed', 'Embedded SAPI library', 'no');
 
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index d3df27ade..e32c3a387 100644
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -15,7 +15,7 @@
    | Author: Edin Kadribasic <edink@php.net>                              |
    +----------------------------------------------------------------------+
 */
-/* $Id: php_embed.c,v 1.11.2.1.2.5.2.6 2009/01/04 20:18:57 pajoye Exp $ */
+/* $Id: php_embed.c 286569 2009-07-30 20:20:56Z garretts $ */
 
 #include "php_embed.h"
 #include "ext/standard/php_standard.h"
@@ -108,7 +108,7 @@ static int php_embed_startup(sapi_module_struct *sapi_module)
 	return SUCCESS;
 }
 
-sapi_module_struct php_embed_module = {
+extern EMBED_SAPI_API sapi_module_struct php_embed_module = {
 	"embed",                       /* name */
 	"PHP Embedded Library",        /* pretty name */
 	
@@ -152,7 +152,7 @@ static const zend_function_entry additional_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-int php_embed_init(int argc, char **argv PTSRMLS_DC)
+EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC)
 {
 	zend_llist global_vars;
 #ifdef ZTS
@@ -217,7 +217,7 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
   return SUCCESS;
 }
 
-void php_embed_shutdown(TSRMLS_D)
+EMBED_SAPI_API void php_embed_shutdown(TSRMLS_D)
 {
 	php_request_shutdown((void *) 0);
 	php_module_shutdown(TSRMLS_C);
diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h
index 8c2fbb1e3..19d1c982e 100644
--- a/sapi/embed/php_embed.h
+++ b/sapi/embed/php_embed.h
@@ -15,7 +15,7 @@
    | Author: Edin Kadribasic <edink@php.net>                              |
    +----------------------------------------------------------------------+
 */
-/* $Id: php_embed.h,v 1.6.2.2.2.1.2.2 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: php_embed.h 286569 2009-07-30 20:20:56Z garretts $ */
 
 #ifndef _PHP_EMBED_H_
 #define _PHP_EMBED_H_
@@ -57,10 +57,16 @@
   php_embed_shutdown(TSRMLS_C); \
 }
 
+#ifndef PHP_WIN32
+    #define EMBED_SAPI_API SAPI_API
+#else
+    #define EMBED_SAPI_API 
+#endif 
+
 BEGIN_EXTERN_C() 
-int php_embed_init(int argc, char **argv PTSRMLS_DC);
-void php_embed_shutdown(TSRMLS_D);
-extern sapi_module_struct php_embed_module;
+EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC);
+EMBED_SAPI_API void php_embed_shutdown(TSRMLS_D);
+extern EMBED_SAPI_API sapi_module_struct php_embed_module;
 END_EXTERN_C()
 
 
diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4
index acf383114..41a4f3f4a 100644
--- a/sapi/isapi/config.m4
+++ b/sapi/isapi/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.17.4.3 2007/07/11 23:20:36 jani Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
 dnl
 
 PHP_ARG_WITH(isapi, for Zeus ISAPI support,
diff --git a/sapi/isapi/config.w32 b/sapi/isapi/config.w32
index bb720fe39..30eef2c1e 100644
--- a/sapi/isapi/config.w32
+++ b/sapi/isapi/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.4.8.1 2008/05/14 03:13:17 auroraeosrose Exp $
+// $Id: config.w32 259731 2008-05-14 03:13:17Z auroraeosrose $
 
 ARG_ENABLE('isapi', 'Build ISAPI version of PHP', 'no');
 
diff --git a/sapi/isapi/php5isapi.c b/sapi/isapi/php5isapi.c
index 19d85874e..0f44efe4a 100644
--- a/sapi/isapi/php5isapi.c
+++ b/sapi/isapi/php5isapi.c
@@ -16,7 +16,7 @@
    |          Ben Mansell <ben@zeus.com> (Zeus Support)                   |
    +----------------------------------------------------------------------+
  */
-/* $Id: php5isapi.c,v 1.8.2.2.2.3.2.5 2009/03/30 14:24:16 kalle Exp $ */
+/* $Id: php5isapi.c 278022 2009-03-30 14:24:16Z kalle $ */
 
 #include "php.h"
 #include <httpext.h>
diff --git a/sapi/litespeed/README b/sapi/litespeed/README
index ef3fe80ad..3f138c216 100644
--- a/sapi/litespeed/README
+++ b/sapi/litespeed/README
@@ -1,225 +1,225 @@
-Introduction

-============

-

-LiteSpeed SAPI module is a dedicated interface for PHP integration with

-LiteSpeed Web Server. LiteSpeed SAPI has similar architecture to the

-FastCGI SAPI with there major enhancements: better performance, dynamic 

-spawning and PHP configuration modification through web server

-configuration and .htaccess files.  

-

-Our simple benchmark test ("hello world") shows that PHP with

-LiteSpeed SAPI has 30% better performance over PHP with FastCGI SAPI,

-which is nearly twice the performance that Apache mod_php can deliver. 

- 

-A major drawback of FastCGI PHP comparing to Apache mod_php is lacking

-the flexibilities in PHP configurations. PHP configurations cannot be 

-changed at runtime via configuration files like .htaccess files or web

-server's virtual host configuration. In shared hosting environment, 

-each hosting account will has its own "open_basedir" overridden in 

-server configuration to enhance server security when mod_php is used.

-usually, FastCGI PHP is not an option in shared hosting environment 

-due to lacking of this flexibility. LiteSpeed SAPI is carefully designed

-to address this issue. PHP configurations can be modified the same way 

-as that in mod_php with the the same configuration directives. 

-

-PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for 

-PHP scripting with LiteSpeed web server. 

-

-

-Building PHP with LiteSpeed SAPI

-================================

-

-You need to add "--with-litespeed" to the configure command to build

-PHP with LiteSpeed SAPI, all other SAPI related configure options

-should be removed. 

-

-For example: 

-    ./configure --with-litespeed

-    make

-

-You should find an executable called 'php' under sapi/litespeed/

-directory after the compilation succeeds. Copy it to

-'lsws/fcgi-bin/lsphp' or wherever you prefer, if LiteSpeed web server

-has been configured to run PHP with LiteSpeed SAPI already, you just

-need to overwrite the old executable with this one and you are all

-set. 

-

-Start PHP from command line

-===========================

-

-Usually, lsphp is managed by LiteSpeed web server in a single server

-installation. lsphp can be used in clustered environment with one 

-LiteSpeed web server at the front, load balancing lsphp processes 

-running on multiple backend servers. In such environment, lsphp can be

-start manually from command with option "-b <socket_address>", socket 

-address can be IPv4, IPv6 or Unix Domain Socket address. 

-for example:

-

-    ./lsphp -b [::]:3000

-

-have lsphp bind to port 3000 on all IPv4 and IPv6 address,

-

-    ./lsphp -b *:3000

-

-have lsphp bind to port 300 on all IPv4 address.

-

-    ./lsphp -b 192.168.0.2:3000

-

-have lsphp bind to address 192.168.0.2:3000.

-

-    ./lsphp -b /tmp/lsphp_manual.sock

-

-have lsphp accept request on Unix domain socket "/tmp/lsphp_manual.sock"

-

-

-Using LiteSpeed PHP with LiteSpeed Web Server

-=============================================

-

-Detailed information about how to configure LiteSpeed web server with

-PHP support is available from our website, at: 

-

-http://www.litespeedtech.com/docs/HowTo_QA.html

-

-Usually, PHP support has been configured out of box, you don't need to

-change it unless you want to change PHP interface from FastCGI to

-LiteSpeed SAPI or vice versa. 

-

-Brief instructions are as follow:

-

-1) Login to web administration interface, go to 'Server'->'Ext App' tab,

-   add an external application of type "LSAPI app", "Command" should be

-   set to a shell command that executes the PHP binary you just built. 

-   "Instances" should be set to "1". Add "LSAPI_CHILDREN" environment 

-   variable to match the value of "Max Connections". More tunable 

-   environment variable described below can be added. 

-

-2) Go to 'Server'->'Script Handler' tab, add a script handler

-   configuration: set 'suffix' to 'php', 'Handler Type' to 'LiteSpeed

-   API', 'Handler Name' should be the name of external application

-   just defined. 

-

-

-3) Click 'Apply Changes' link on the top left of the page, then click 

-   'graceful restart'. Now PHP is running with LiteSpeed SAPI. 

-

-Tunings

--------

-

-There are a few environment variables that can be tweaked to control the

-behavior of LSAPI application.  

-

-* LSAPI_CHILDREN or PHP_LSAPI_CHILDREN  (default: 0)

-

-There are two ways to let PHP handle multiple requests concurrently, 

-Server Managed Mode and Self Managed Mode. In Server Managed Mode, 

-LiteSpeed web server dynamically spawn/stop PHP processes, in this mode

-"Instances" should match "Max Connections" configuration for PHP 

-external application. To start PHP in Self Managed Mode, "Instances" 

-should be set to "1", while "LSAPI_CHILDREN" environment variable should

-be set to match the value of "Max Connections" and >1. Web Server will 

-start one PHP process, this process will start/stop children PHP processes 

-dynamically based on on demand. If "LSAPI_CHILDREN" <=1, PHP will be 

-started in server managed mode.

-

-Self Managed Mode is preferred because all PHP processes can share one 

-shared memory block for the opcode cache.

-

-Usually, there is no need to set value of LSAPI_CHILDREN over 100 in

-most server environment. 

-

-

-* LSAPI_AVOID_FORK              (default: 0)

-

-LSAPI_AVOID_FORK specifies the policy of the internal process manager in

-"Self Managed Mode". When set to 0, the internal process manager will stop

-and start children process on demand to save system resource. This is

-preferred in a shared hosting environment. When set to 1, the internal

-process manager will try to avoid freqently stopping and starting children

-process. This might be preferred in a dedicate hosting environment.

-

-

-* LSAPI_EXTRA_CHILDREN          (default: 1/3 of LSAPI_CHILDREN or 0)

-

-LSAPI_EXTRA_CHILDREN controls the maximum number of extra children processes

-can be started when some or all existing children processes are in

-malfunctioning state. Total number of children processes will be reduced to

-LSAPI_CHILDREN level as soon as service is back to normal.

-When LSAPI_AVOID_FORK is set to 0, the default value is 1/3 of

-LSAPI_CHIDLREN, When LSAPI_AVOID_FORK is set to 1, the default value is 0.

-

-

-* LSAPI_MAX_REQS or PHP_LSAPI_MAX_REQUESTS (default value: 10000)

-

-This controls how many requests each child process will handle before

-it exits automatically. Several PHP functions have been identified 

-having memory leaks. This parameter can help reducing memory usage 

-of leaky PHP functions. 

-

-

-* LSAPI_MAX_IDLE                (default value: 300 seconds)

-

-In Self Managed Mode, LSAPI_MAX_IDLE controls how long a idle child  

-process will wait for a new request before it exits. This option help 

-releasing system resources taken by idle processes.

-

-

-* LSAPI_MAX_IDLE_CHILDREN

-    (default value: 1/3 of LSAPI_CHILDREN or LSAPI_CHILDREN)

-

-In Self Managed Mode, LSAI_MAX_IDLE_CHILDREN controls how many idle 

-children processes are allowed. Excessive idle children processes

-will be killed by the parent process immediately.

-When LSAPI_AVOID_FORK is set to 0, the default value is 1/3 of

-LSAPI_CHIDLREN, When LSAPI_AVOID_FORK is set to 1, the default value

-is LSAPI_CHILDREN.

-

-

-* LSAPI_MAX_PROCESS_TIME        (default value: 300 seconds)

-

-In Self Managed Mode, LSAPI_MAX_PROCESS_TIME controls the maximum 

-processing time allowed when processing a request. If a child process

-can not finish processing of a request in the given time period, it 

-will be killed by the parent process. This option can help getting rid 

-of dead or runaway child process.

-

-

-* LSAPI_PGRP_MAX_IDLE           (default value: FOREVER )

-

-In Self Managed Mode, LSAPI_PGRP_MAX_IDLE controls how long the parent

-process will wait before exiting when there is no child process.

-This option help releasing system resources taken by an idle parent 

-process.

-

-

-* LSAPI_PPID_NO_CHECK

-

-By default a LSAPI application check the existence of its parent process

-and exits automatically if the parent process died. This is to reduce 

-orphan process when web server is restarted. However, it is desireable 

-to disable this feature, such as when a LSAPI process was started 

-manually from command line. LSAPI_PPID_NO_CHECK should be set when 

-you want to disable the checking of existence of parent process.

-When PHP started by "-b" option, it is disabled automatically. 

-

-

-Compatibility with Apache mod_php

-=================================

-

-LSAPI PHP supports PHP configuration overridden via web server configuration 

-as well as .htaccess. 

-Since 4.0 release "apache_response_headers" function is supported.

-

-

-

-Contact

-=======

-

-For support questions, please post to our free support forum, at:

-

-http://www.litespeedtech.com/forum/

-

-For bug report, please send bug report to bug [at] litespeedtech.com.

-

-

-

-

+Introduction
+============
+
+LiteSpeed SAPI module is a dedicated interface for PHP integration with
+LiteSpeed Web Server. LiteSpeed SAPI has similar architecture to the
+FastCGI SAPI with there major enhancements: better performance, dynamic 
+spawning and PHP configuration modification through web server
+configuration and .htaccess files.  
+
+Our simple benchmark test ("hello world") shows that PHP with
+LiteSpeed SAPI has 30% better performance over PHP with FastCGI SAPI,
+which is nearly twice the performance that Apache mod_php can deliver. 
+ 
+A major drawback of FastCGI PHP comparing to Apache mod_php is lacking
+the flexibilities in PHP configurations. PHP configurations cannot be 
+changed at runtime via configuration files like .htaccess files or web
+server's virtual host configuration. In shared hosting environment, 
+each hosting account will has its own "open_basedir" overridden in 
+server configuration to enhance server security when mod_php is used.
+usually, FastCGI PHP is not an option in shared hosting environment 
+due to lacking of this flexibility. LiteSpeed SAPI is carefully designed
+to address this issue. PHP configurations can be modified the same way 
+as that in mod_php with the the same configuration directives. 
+
+PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for 
+PHP scripting with LiteSpeed web server. 
+
+
+Building PHP with LiteSpeed SAPI
+================================
+
+You need to add "--with-litespeed" to the configure command to build
+PHP with LiteSpeed SAPI, all other SAPI related configure options
+should be removed. 
+
+For example: 
+    ./configure --with-litespeed
+    make
+
+You should find an executable called 'php' under sapi/litespeed/
+directory after the compilation succeeds. Copy it to
+'lsws/fcgi-bin/lsphp' or wherever you prefer, if LiteSpeed web server
+has been configured to run PHP with LiteSpeed SAPI already, you just
+need to overwrite the old executable with this one and you are all
+set. 
+
+Start PHP from command line
+===========================
+
+Usually, lsphp is managed by LiteSpeed web server in a single server
+installation. lsphp can be used in clustered environment with one 
+LiteSpeed web server at the front, load balancing lsphp processes 
+running on multiple backend servers. In such environment, lsphp can be
+start manually from command with option "-b <socket_address>", socket 
+address can be IPv4, IPv6 or Unix Domain Socket address. 
+for example:
+
+    ./lsphp -b [::]:3000
+
+have lsphp bind to port 3000 on all IPv4 and IPv6 address,
+
+    ./lsphp -b *:3000
+
+have lsphp bind to port 300 on all IPv4 address.
+
+    ./lsphp -b 192.168.0.2:3000
+
+have lsphp bind to address 192.168.0.2:3000.
+
+    ./lsphp -b /tmp/lsphp_manual.sock
+
+have lsphp accept request on Unix domain socket "/tmp/lsphp_manual.sock"
+
+
+Using LiteSpeed PHP with LiteSpeed Web Server
+=============================================
+
+Detailed information about how to configure LiteSpeed web server with
+PHP support is available from our website, at: 
+
+http://www.litespeedtech.com/docs/HowTo_QA.html
+
+Usually, PHP support has been configured out of box, you don't need to
+change it unless you want to change PHP interface from FastCGI to
+LiteSpeed SAPI or vice versa. 
+
+Brief instructions are as follow:
+
+1) Login to web administration interface, go to 'Server'->'Ext App' tab,
+   add an external application of type "LSAPI app", "Command" should be
+   set to a shell command that executes the PHP binary you just built. 
+   "Instances" should be set to "1". Add "LSAPI_CHILDREN" environment 
+   variable to match the value of "Max Connections". More tunable 
+   environment variable described below can be added. 
+
+2) Go to 'Server'->'Script Handler' tab, add a script handler
+   configuration: set 'suffix' to 'php', 'Handler Type' to 'LiteSpeed
+   API', 'Handler Name' should be the name of external application
+   just defined. 
+
+
+3) Click 'Apply Changes' link on the top left of the page, then click 
+   'graceful restart'. Now PHP is running with LiteSpeed SAPI. 
+
+Tunings
+-------
+
+There are a few environment variables that can be tweaked to control the
+behavior of LSAPI application.  
+
+* LSAPI_CHILDREN or PHP_LSAPI_CHILDREN  (default: 0)
+
+There are two ways to let PHP handle multiple requests concurrently, 
+Server Managed Mode and Self Managed Mode. In Server Managed Mode, 
+LiteSpeed web server dynamically spawn/stop PHP processes, in this mode
+"Instances" should match "Max Connections" configuration for PHP 
+external application. To start PHP in Self Managed Mode, "Instances" 
+should be set to "1", while "LSAPI_CHILDREN" environment variable should
+be set to match the value of "Max Connections" and >1. Web Server will 
+start one PHP process, this process will start/stop children PHP processes 
+dynamically based on on demand. If "LSAPI_CHILDREN" <=1, PHP will be 
+started in server managed mode.
+
+Self Managed Mode is preferred because all PHP processes can share one 
+shared memory block for the opcode cache.
+
+Usually, there is no need to set value of LSAPI_CHILDREN over 100 in
+most server environment. 
+
+
+* LSAPI_AVOID_FORK              (default: 0)
+
+LSAPI_AVOID_FORK specifies the policy of the internal process manager in
+"Self Managed Mode". When set to 0, the internal process manager will stop
+and start children process on demand to save system resource. This is
+preferred in a shared hosting environment. When set to 1, the internal
+process manager will try to avoid freqently stopping and starting children
+process. This might be preferred in a dedicate hosting environment.
+
+
+* LSAPI_EXTRA_CHILDREN          (default: 1/3 of LSAPI_CHILDREN or 0)
+
+LSAPI_EXTRA_CHILDREN controls the maximum number of extra children processes
+can be started when some or all existing children processes are in
+malfunctioning state. Total number of children processes will be reduced to
+LSAPI_CHILDREN level as soon as service is back to normal.
+When LSAPI_AVOID_FORK is set to 0, the default value is 1/3 of
+LSAPI_CHIDLREN, When LSAPI_AVOID_FORK is set to 1, the default value is 0.
+
+
+* LSAPI_MAX_REQS or PHP_LSAPI_MAX_REQUESTS (default value: 10000)
+
+This controls how many requests each child process will handle before
+it exits automatically. Several PHP functions have been identified 
+having memory leaks. This parameter can help reducing memory usage 
+of leaky PHP functions. 
+
+
+* LSAPI_MAX_IDLE                (default value: 300 seconds)
+
+In Self Managed Mode, LSAPI_MAX_IDLE controls how long a idle child  
+process will wait for a new request before it exits. This option help 
+releasing system resources taken by idle processes.
+
+
+* LSAPI_MAX_IDLE_CHILDREN
+    (default value: 1/3 of LSAPI_CHILDREN or LSAPI_CHILDREN)
+
+In Self Managed Mode, LSAI_MAX_IDLE_CHILDREN controls how many idle 
+children processes are allowed. Excessive idle children processes
+will be killed by the parent process immediately.
+When LSAPI_AVOID_FORK is set to 0, the default value is 1/3 of
+LSAPI_CHIDLREN, When LSAPI_AVOID_FORK is set to 1, the default value
+is LSAPI_CHILDREN.
+
+
+* LSAPI_MAX_PROCESS_TIME        (default value: 300 seconds)
+
+In Self Managed Mode, LSAPI_MAX_PROCESS_TIME controls the maximum 
+processing time allowed when processing a request. If a child process
+can not finish processing of a request in the given time period, it 
+will be killed by the parent process. This option can help getting rid 
+of dead or runaway child process.
+
+
+* LSAPI_PGRP_MAX_IDLE           (default value: FOREVER )
+
+In Self Managed Mode, LSAPI_PGRP_MAX_IDLE controls how long the parent
+process will wait before exiting when there is no child process.
+This option help releasing system resources taken by an idle parent 
+process.
+
+
+* LSAPI_PPID_NO_CHECK
+
+By default a LSAPI application check the existence of its parent process
+and exits automatically if the parent process died. This is to reduce 
+orphan process when web server is restarted. However, it is desireable 
+to disable this feature, such as when a LSAPI process was started 
+manually from command line. LSAPI_PPID_NO_CHECK should be set when 
+you want to disable the checking of existence of parent process.
+When PHP started by "-b" option, it is disabled automatically. 
+
+
+Compatibility with Apache mod_php
+=================================
+
+LSAPI PHP supports PHP configuration overridden via web server configuration 
+as well as .htaccess. 
+Since 4.0 release "apache_response_headers" function is supported.
+
+
+
+Contact
+=======
+
+For support questions, please post to our free support forum, at:
+
+http://www.litespeedtech.com/forum/
+
+For bug report, please send bug report to bug [at] litespeedtech.com.
+
+
+
+
diff --git a/sapi/litespeed/config.m4 b/sapi/litespeed/config.m4
index 7d72a28cc..b4f3caa30 100644
--- a/sapi/litespeed/config.m4
+++ b/sapi/litespeed/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.2.2.4 2008/08/07 19:32:15 nlopess Exp $
+dnl $Id: config.m4 264419 2008-08-07 19:32:15Z nlopess $
 dnl
 
 AC_MSG_CHECKING(for LiteSpeed support)
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index 70409c903..aed599e11 100644
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: lsapi_main.c,v 1.7.2.3 2008/08/26 22:05:17 gwang Exp $ */
+/* $Id: lsapi_main.c 265533 2008-08-26 22:05:17Z gwang $ */
 
 #include "php.h"
 #include "SAPI.h"
diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
index 5d0e43aba..febe6b768 100644
--- a/sapi/litespeed/lsapilib.c
+++ b/sapi/litespeed/lsapilib.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: lsapilib.c,v 1.5.2.6 2009/02/27 23:33:01 gwang Exp $ */
+/* $Id: lsapilib.c 276590 2009-02-27 23:33:01Z gwang $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
diff --git a/sapi/milter/config.m4 b/sapi/milter/config.m4
index a34563ae6..6c212dca4 100644
--- a/sapi/milter/config.m4
+++ b/sapi/milter/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.6.6.2 2007/07/11 23:20:36 jani Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
 dnl
 
 PHP_ARG_WITH(milter, for Milter support,
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index c07e8c98b..baa62b2de 100644
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_milter.c,v 1.14.2.2.2.3.2.10 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: php_milter.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php.h"
 #include "php_globals.h"
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" );
diff --git a/sapi/phttpd/config.m4 b/sapi/phttpd/config.m4
index ca5cd80a5..935dbf3d6 100644
--- a/sapi/phttpd/config.m4
+++ b/sapi/phttpd/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.7.22.3 2007/07/11 23:20:37 jani Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
 dnl 
 
 PHP_ARG_WITH(phttpd, for PHTTPD support,
diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4
index 633d7bb7a..bf8f59ad3 100644
--- a/sapi/pi3web/config.m4
+++ b/sapi/pi3web/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.10.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(pi3web, for Pi3Web support,
diff --git a/sapi/pi3web/config.w32 b/sapi/pi3web/config.w32
index b9bd29c6d..107a5d046 100644
--- a/sapi/pi3web/config.w32
+++ b/sapi/pi3web/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.3 2004/01/17 13:00:15 sniper Exp $
+// $Id: config.w32 149024 2004-01-17 13:00:38Z sniper $
 
 ARG_WITH('pi3web', 'Pi3Web', 'no');
 
diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index 7f34858ca..7af5d5061 100644
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: pi3web_sapi.c,v 1.60.2.1.2.1.2.3 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: pi3web_sapi.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -57,7 +57,7 @@ static void php_info_pi3web(ZEND_MODULE_INFO_FUNC_ARGS)
 	PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n");
 	PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server Information</th></tr>\n");
 	php_info_print_table_header(2, "Information Field", "Value");
-	php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.60.2.1.2.1.2.3 2008/12/31 11:15:49 sebastian Exp $");
+	php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c 272370 2008-12-31 11:15:49Z sebastian $");
 	php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp());
 	snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled());
 	php_info_print_table_row(2, "Debug Enabled", variable_buf);
diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index 1e32d94b7..f750e3582 100644
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.17.2.1.2.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(roxen,, 
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 94a6f51ad..eabe14d63 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: roxen.c,v 1.61.2.2.2.1.2.3 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: roxen.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php.h"
 #ifdef HAVE_ROXEN
@@ -438,7 +438,7 @@ static void php_info_roxen(ZEND_MODULE_INFO_FUNC_ARGS)
 {
   /*  char buf[512]; */
   php_info_print_table_start();
-  php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.61.2.2.2.1.2.3 2008/12/31 11:15:49 sebastian Exp $");
+  php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c 272370 2008-12-31 11:15:49Z sebastian $");
   /*  php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
       php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
       php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
diff --git a/sapi/thttpd/README b/sapi/thttpd/README
index 4be522f03..b0245841a 100644
--- a/sapi/thttpd/README
+++ b/sapi/thttpd/README
@@ -1,5 +1,5 @@
 README FOR THTTPD MODULE (by Sascha Schumann)        
-($Date: 2003/02/19 10:57:21 $)
+($Date: 2003-02-19 11:57:21 +0100 (Wed, 19 Feb 2003) $)
 
 	This is a SAPI module for PHP 4.x supporting thttpd, the tiny,
 	turbo, throttling HTTP server by Jef Poskanzer.
diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4
index c0500b86e..9c3d4d7fb 100644
--- a/sapi/thttpd/config.m4
+++ b/sapi/thttpd/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.23.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(thttpd,,
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index fd7a80fd5..187bddf65 100644
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: thttpd.c,v 1.95.2.1.2.1.2.3 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: thttpd.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #include "php.h"
 #include "SAPI.h"
diff --git a/sapi/tux/README b/sapi/tux/README
index aac26ccb4..3a5294c77 100644
--- a/sapi/tux/README
+++ b/sapi/tux/README
@@ -1,5 +1,5 @@
 README FOR THE TUX MODULE (by Sascha Schumann)        
-($Date: 2004/01/17 13:00:17 $)
+($Date: 2004-01-17 14:00:38 +0100 (Sat, 17 Jan 2004) $)
 
     This is a SAPI module for the TUX web-server by Ingo Molnar.
 
diff --git a/sapi/tux/config.m4 b/sapi/tux/config.m4
index 323318534..1933d3627 100644
--- a/sapi/tux/config.m4
+++ b/sapi/tux/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.4.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(tux,,
diff --git a/sapi/webjames/config.m4 b/sapi/webjames/config.m4
index 351781a61..cf019013d 100644
--- a/sapi/webjames/config.m4
+++ b/sapi/webjames/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.5.22.2 2007/07/11 23:20:37 jani Exp $
+dnl $Id: config.m4 239540 2007-07-11 23:20:37Z jani $
 dnl
 
 PHP_ARG_WITH(webjames,,