1 diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/acinclude.m4 php-4.4.9.changed/acinclude.m4
2 --- php-4.4.9.org/acinclude.m4 2013-10-07 13:35:57.560042156 +0200
3 +++ php-4.4.9.changed/acinclude.m4 2013-10-07 13:35:39.659624293 +0200
8 + if test -n "$FORCE_APACHE_VERSION"; then
9 + ac_output="Server version: Apache/${FORCE_APACHE_VERSION} (PLD/Linux)"
15 diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/configure.in php-4.4.9.changed/configure.in
16 --- php-4.4.9.org/configure.in 2013-10-07 13:35:57.586709445 +0200
17 +++ php-4.4.9.changed/configure.in 2013-10-07 13:34:26.551250929 +0200
18 @@ -1421,6 +1421,21 @@
22 + if test "$PHP_SAPI" = "apache2handler" || test "$PHP_SAPI" = "apache2filter"; then
23 + if test "$APACHE_VERSION" -ge 2004001; then
24 + if test -z "$APACHE_THREADED_MPM"; then
26 ++--------------------------------------------------------------------+
29 +| You have built PHP for Apache's current non-threaded MPM. |
30 +| If you change Apache to use a threaded MPM you must reconfigure |
31 +| PHP with --enable-maintainer-zts |
37 # Warn about linking Apache with libpthread if oci8 extension is enabled on linux.
38 if test "$PHP_OCI8" != "no" -o "$PHP_ORACLE" != "no"; then
39 if test "$PHP_SAPI" = "apache"; then
40 diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/sapi/apache2filter/config.m4 php-4.4.9.changed/sapi/apache2filter/config.m4
41 --- php-4.4.9.org/sapi/apache2filter/config.m4 2004-12-17 00:14:28.000000000 +0100
42 +++ php-4.4.9.changed/sapi/apache2filter/config.m4 2013-10-07 13:34:26.551250929 +0200
44 APXS_BINDIR=`$APXS -q BINDIR`
45 APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
46 APXS_CFLAGS=`$APXS -q CFLAGS`
47 - APXS_MPM=`$APXS -q MPM_NAME`
48 APU_BINDIR=`$APXS -q APU_BINDIR`
49 APR_BINDIR=`$APXS -q APR_BINDIR`
55 - if test "$APXS_MPM" != "prefork"; then
56 - PHP_BUILD_THREAD_SAFE
57 + if test "$APACHE_VERSION" -lt 2004001; then
58 + APXS_MPM=`$APXS -q MPM_NAME`
59 + if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
60 + PHP_BUILD_THREAD_SAFE
63 + APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
64 + if test -n "$APACHE_THREADED_MPM"; then
65 + PHP_BUILD_THREAD_SAFE
70 diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/sapi/apache2handler/config.m4 php-4.4.9.changed/sapi/apache2handler/config.m4
71 --- php-4.4.9.org/sapi/apache2handler/config.m4 2013-10-07 13:35:57.520041222 +0200
72 +++ php-4.4.9.changed/sapi/apache2handler/config.m4 2013-10-07 13:34:26.551250929 +0200
74 APXS_BINDIR=`$APXS -q BINDIR`
75 APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
76 APXS_CFLAGS=`$APXS -q CFLAGS`
77 - APXS_MPM=`$APXS -q MPM_NAME`
78 APU_BINDIR=`$APXS -q APU_BINDIR`
79 APR_BINDIR=`$APXS -q APR_BINDIR`
85 - if test "$APXS_MPM" != "prefork"; then
86 - PHP_BUILD_THREAD_SAFE
87 + if test "$APACHE_VERSION" -lt 2004001; then
88 + APXS_MPM=`$APXS -q MPM_NAME`
89 + if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
90 + PHP_BUILD_THREAD_SAFE
93 + APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
94 + if test -n "$APACHE_THREADED_MPM"; then
95 + PHP_BUILD_THREAD_SAFE
100 --- php-4.4.9/sapi.org/apache2handler/php_functions.c 2007-12-31 08:22:55.000000000 +0100
101 +++ php-4.4.9/sapi/apache2handler/php_functions.c 2014-08-11 13:09:01.932246720 +0200
104 static char *php_apache_get_version()
106 +#if MODULE_MAGIC_NUMBER_MAJOR >= 20060905
107 + return (char *) ap_get_server_banner();
109 return (char *) ap_get_server_version();
113 /* {{{ proto string apache_get_version(void)
117 server_rec *serv = ((php_struct *) SG(server_context))->r->server;
118 -#if !defined(WIN32) && !defined(WINNT)
119 +#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE)
120 +#if MODULE_MAGIC_NUMBER_MAJOR >= 20081201
121 + AP_DECLARE_DATA extern unixd_config_rec ap_unixd_config;
123 AP_DECLARE_DATA extern unixd_config_rec unixd_config;
127 for (n = 0; ap_loaded_modules[n]; ++n) {
128 char *s = (char *) ap_loaded_modules[n]->name;
131 snprintf(tmp, sizeof(tmp), "%s:%u", serv->server_hostname, serv->port);
132 php_info_print_table_row(2, "Hostname:Port", tmp);
134 -#if !defined(WIN32) && !defined(WINNT)
136 +#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE)
137 +#if MODULE_MAGIC_NUMBER_MAJOR >= 20081201
138 + snprintf(tmp, sizeof(tmp), "%s(%d)/%d", ap_unixd_config.user_name, ap_unixd_config.user_id, ap_unixd_config.group_id);
140 snprintf(tmp, sizeof(tmp), "%s(%d)/%d", unixd_config.user_name, unixd_config.user_id, unixd_config.group_id);
142 php_info_print_table_row(2, "User/Group", tmp);