pajoye Wed, 06 Jul 2011 11:13:38 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313001
Log:
- add apache 2.3 (upcoming 2.4) handler
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/apache2handler/config.w32
U php/php-src/trunk/sapi/apache2handler/config.w32
Modified: php/php-src/branches/PHP_5_4/sapi/apache2handler/config.w32
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/apache2handler/config.w32 2011-07-06
11:00:55 UTC (rev 313000)
+++ php/php-src/branches/PHP_5_4/sapi/apache2handler/config.w32 2011-07-06
11:13:38 UTC (rev 313001)
@@ -5,7 +5,7 @@
if (PHP_APACHE2HANDLER != "no") {
if (PHP_ZTS == "no") {
- WARNING("Apache2 module requires an --enable-zts build of PHP
on windows");
+ WARNING("Apache 2.0 module requires an --enable-zts build of
PHP on windows");
} else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER",
PHP_PHP_BUILD + "\\include\\apache2") &&
CHECK_LIB("libhttpd.lib", "apache2handler",
PHP_PHP_BUILD + "\\lib\\apache2") &&
CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD
+ "\\lib\\apache2") &&
@@ -23,7 +23,7 @@
if (PHP_APACHE2_2HANDLER != "no") {
if (PHP_ZTS == "no") {
- WARNING("Apache2 module requires an --enable-zts build of PHP
on windows");
+ WARNING("Apache 2.2 module requires an --enable-zts build of
PHP on windows");
} else if (CHECK_HEADER_ADD_INCLUDE("httpd.h",
"CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") &&
CHECK_LIB("libhttpd.lib", "apache2_2handler",
PHP_PHP_BUILD + "\\lib\\apache2_2") &&
CHECK_LIB("libapr-1.lib", "apache2_2handler",
PHP_PHP_BUILD + "\\lib\\apache2_2") &&
@@ -37,3 +37,22 @@
WARNING("Could not find apache2.2 libraries/headers");
}
}
+
+ARG_ENABLE('apache2-3handler', 'Build Apache 2.3.x handler', 'no');
+if (PHP_APACHE2_3HANDLER != "no") {
+ if (PHP_ZTS == "no") {
+ WARNING("Apache 2.3 module requires an --enable-zts build of
PHP on windows");
+ } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h",
"CFLAGS_APACHE2_3HANDLER", PHP_PHP_BUILD + "\\include\\apache2_3") &&
+ CHECK_LIB("libhttpd.lib", "apache2_3handler",
PHP_PHP_BUILD + "\\lib\\apache2_3") &&
+ CHECK_LIB("libapr-1.lib", "apache2_3handler",
PHP_PHP_BUILD + "\\lib\\apache2_3") &&
+ CHECK_LIB("libaprutil-1.lib", "apache2_3handler",
PHP_PHP_BUILD + "\\lib\\apache2_3")
+ ) {
+ SAPI('apache2_3handler', 'mod_php5.c sapi_apache2.c
apache_config.c php_functions.c',
+ 'php' + PHP_VERSION + 'apache2_3.dll',
+ '/D PHP_APACHE2_EXPORTS /I win32',
+ 'sapi\\apache2handler');
+ } else {
+ WARNING("Could not find apache2.3 libraries/headers");
+ }
+}
+
Modified: php/php-src/trunk/sapi/apache2handler/config.w32
===================================================================
--- php/php-src/trunk/sapi/apache2handler/config.w32 2011-07-06 11:00:55 UTC
(rev 313000)
+++ php/php-src/trunk/sapi/apache2handler/config.w32 2011-07-06 11:13:38 UTC
(rev 313001)
@@ -5,7 +5,7 @@
if (PHP_APACHE2HANDLER != "no") {
if (PHP_ZTS == "no") {
- WARNING("Apache2 module requires an --enable-zts build of PHP
on windows");
+ WARNING("Apache 2.0 module requires an --enable-zts build of
PHP on windows");
} else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER",
PHP_PHP_BUILD + "\\include\\apache2") &&
CHECK_LIB("libhttpd.lib", "apache2handler",
PHP_PHP_BUILD + "\\lib\\apache2") &&
CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD
+ "\\lib\\apache2") &&
@@ -23,7 +23,7 @@
if (PHP_APACHE2_2HANDLER != "no") {
if (PHP_ZTS == "no") {
- WARNING("Apache2 module requires an --enable-zts build of PHP
on windows");
+ WARNING("Apache 2.2 module requires an --enable-zts build of
PHP on windows");
} else if (CHECK_HEADER_ADD_INCLUDE("httpd.h",
"CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") &&
CHECK_LIB("libhttpd.lib", "apache2_2handler",
PHP_PHP_BUILD + "\\lib\\apache2_2") &&
CHECK_LIB("libapr-1.lib", "apache2_2handler",
PHP_PHP_BUILD + "\\lib\\apache2_2") &&
@@ -37,3 +37,22 @@
WARNING("Could not find apache2.2 libraries/headers");
}
}
+
+ARG_ENABLE('apache2-3handler', 'Build Apache 2.3.x handler', 'no');
+if (PHP_APACHE2_3HANDLER != "no") {
+ if (PHP_ZTS == "no") {
+ WARNING("Apache 2.3 module requires an --enable-zts build of
PHP on windows");
+ } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h",
"CFLAGS_APACHE2_3HANDLER", PHP_PHP_BUILD + "\\include\\apache2_3") &&
+ CHECK_LIB("libhttpd.lib", "apache2_3handler",
PHP_PHP_BUILD + "\\lib\\apache2_3") &&
+ CHECK_LIB("libapr-1.lib", "apache2_3handler",
PHP_PHP_BUILD + "\\lib\\apache2_3") &&
+ CHECK_LIB("libaprutil-1.lib", "apache2_3handler",
PHP_PHP_BUILD + "\\lib\\apache2_3")
+ ) {
+ SAPI('apache2_3handler', 'mod_php5.c sapi_apache2.c
apache_config.c php_functions.c',
+ 'php' + PHP_VERSION + 'apache2_3.dll',
+ '/D PHP_APACHE2_EXPORTS /I win32',
+ 'sapi\\apache2handler');
+ } else {
+ WARNING("Could not find apache2.3 libraries/headers");
+ }
+}
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
