| 1 |
diff -Naurp php-7.1.11/sapi/apache2handler/config.m4 BUILD/php-7.1.11/sapi/apache2handler/config.m4 |
| 2 |
--- php-7.1.11/sapi/apache2handler/config.m4 2017-10-25 09:04:42.000000000 +0200 |
| 3 |
+++ BUILD/php-7.1.11/sapi/apache2handler/config.m4 2017-10-29 23:17:21.530899970 +0100 |
| 4 |
@@ -70,20 +70,20 @@ |
| 5 |
if test -z `$APXS -q SYSCONFDIR`; then |
| 6 |
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ |
| 7 |
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ |
| 8 |
- -i -n php7" |
| 9 |
+ -i -n php" |
| 10 |
else |
| 11 |
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` |
| 12 |
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ |
| 13 |
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ |
| 14 |
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ |
| 15 |
-S SYSCONFDIR='$APXS_SYSCONFDIR' \ |
| 16 |
- -i -a -n php7" |
| 17 |
+ -i -a -n php" |
| 18 |
fi |
| 19 |
|
| 20 |
case $host_alias in |
| 21 |
*aix*) |
| 22 |
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" |
| 23 |
- PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) |
| 24 |
+ PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) |
| 25 |
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" |
| 26 |
;; |
| 27 |
*darwin*) |
| 28 |
@@ -99,19 +99,19 @@ |
| 29 |
fi |
| 30 |
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS" |
| 31 |
PHP_SUBST(MH_BUNDLE_FLAGS) |
| 32 |
- PHP_SELECT_SAPI(apache2handler, bundle, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) |
| 33 |
- SAPI_SHARED=libs/libphp7.so |
| 34 |
+ PHP_SELECT_SAPI(apache2handler, bundle, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) |
| 35 |
+ SAPI_SHARED=libs/libphp.so |
| 36 |
INSTALL_IT="$INSTALL_IT $SAPI_SHARED" |
| 37 |
;; |
| 38 |
*beos*) |
| 39 |
if test -f _APP_; then `rm _APP_`; fi |
| 40 |
`ln -s $APXS_BINDIR/httpd _APP_` |
| 41 |
EXTRA_LIBS="$EXTRA_LIBS _APP_" |
| 42 |
- PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) |
| 43 |
+ PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) |
| 44 |
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" |
| 45 |
;; |
| 46 |
*) |
| 47 |
- PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) |
| 48 |
+ PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) |
| 49 |
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" |
| 50 |
;; |
| 51 |
esac |
| 52 |
diff -Naurp php-7.1.11/sapi/apache2handler/mod_php7.c BUILD/php-7.1.11/sapi/apache2handler/mod_php7.c |
| 53 |
--- php-7.1.11/sapi/apache2handler/mod_php7.c 2017-10-25 09:04:42.000000000 +0200 |
| 54 |
+++ BUILD/php-7.1.11/sapi/apache2handler/mod_php7.c 2017-10-29 23:14:04.848912458 +0100 |
| 55 |
@@ -25,7 +25,7 @@ |
| 56 |
#include "php.h" |
| 57 |
#include "php_apache.h" |
| 58 |
|
| 59 |
-AP_MODULE_DECLARE_DATA module php7_module = { |
| 60 |
+AP_MODULE_DECLARE_DATA module php_module = { |
| 61 |
STANDARD20_MODULE_STUFF, |
| 62 |
create_php_config, /* create per-directory config structure */ |
| 63 |
merge_php_config, /* merge per-directory config structures */ |
| 64 |
diff -Naurp php-7.1.11/sapi/apache2handler/php_apache.h BUILD/php-7.1.11/sapi/apache2handler/php_apache.h |
| 65 |
--- php-7.1.11/sapi/apache2handler/php_apache.h 2017-10-25 09:04:42.000000000 +0200 |
| 66 |
+++ BUILD/php-7.1.11/sapi/apache2handler/php_apache.h 2017-10-29 23:17:46.636898376 +0100 |
| 67 |
@@ -31,11 +31,11 @@ |
| 68 |
|
| 69 |
/* Enable per-module logging in Apache 2.4+ */ |
| 70 |
#ifdef APLOG_USE_MODULE |
| 71 |
-APLOG_USE_MODULE(php7); |
| 72 |
+APLOG_USE_MODULE(php); |
| 73 |
#endif |
| 74 |
|
| 75 |
/* Declare this so we can get to it from outside the sapi_apache2.c file */ |
| 76 |
-extern module AP_MODULE_DECLARE_DATA php7_module; |
| 77 |
+extern module AP_MODULE_DECLARE_DATA php_module; |
| 78 |
|
| 79 |
/* A way to specify the location of the php.ini dir in an apache directive */ |
| 80 |
extern char *apache2_php_ini_path_override; |
| 81 |
diff -Naurp php-7.1.11/sapi/apache2handler/php.sym BUILD/php-7.1.11/sapi/apache2handler/php.sym |
| 82 |
--- php-7.1.11/sapi/apache2handler/php.sym 2017-10-25 09:04:42.000000000 +0200 |
| 83 |
+++ BUILD/php-7.1.11/sapi/apache2handler/php.sym 2017-10-29 23:14:04.850912457 +0100 |
| 84 |
@@ -1 +1 @@ |
| 85 |
-php7_module |
| 86 |
+php_module |
| 87 |
diff -Naurp php-7.1.11/sapi/apache2handler/sapi_apache2.c BUILD/php-7.1.11/sapi/apache2handler/sapi_apache2.c |
| 88 |
--- php-7.1.11/sapi/apache2handler/sapi_apache2.c 2017-10-25 09:04:42.000000000 +0200 |
| 89 |
+++ BUILD/php-7.1.11/sapi/apache2handler/sapi_apache2.c 2017-10-29 23:14:04.852912457 +0100 |
| 90 |
@@ -61,7 +61,7 @@ |
| 91 |
|
| 92 |
#define PHP_MAGIC_TYPE "application/x-httpd-php" |
| 93 |
#define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php-source" |
| 94 |
-#define PHP_SCRIPT "php7-script" |
| 95 |
+#define PHP_SCRIPT "php-script" |
| 96 |
|
| 97 |
/* A way to specify the location of the php.ini dir in an apache directive */ |
| 98 |
char *apache2_php_ini_path_override = NULL; |
| 99 |
@@ -561,7 +561,7 @@ typedef struct { |
| 100 |
HashTable config; |
| 101 |
} php_conf_rec; |
| 102 |
zend_string *str; |
| 103 |
- php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php7_module); |
| 104 |
+ php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php_module); |
| 105 |
|
| 106 |
ZEND_HASH_FOREACH_STR_KEY(&c->config, str) { |
| 107 |
zend_restore_ini_entry(str, ZEND_INI_STAGE_SHUTDOWN); |
| 108 |
@@ -590,7 +590,7 @@ static int php_handler(request_rec *r) |
| 109 |
|
| 110 |
#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req); |
| 111 |
|
| 112 |
- conf = ap_get_module_config(r->per_dir_config, &php7_module); |
| 113 |
+ conf = ap_get_module_config(r->per_dir_config, &php_module); |
| 114 |
|
| 115 |
/* apply_config() needs r in some cases, so allocate server_context early */ |
| 116 |
ctx = SG(server_context); |
| 117 |
|
Parent Directory
| 
Revision Log