diff options
| author | jfha73 <jfha73@gmail.com> | 2014-09-18 13:30:17 -0400 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-18 20:43:31 +0200 |
| commit | b0064fc27f6b4aab6cf365c84985d225eeff7b24 (patch) | |
| tree | cb0a24f508edeea32dbba97b4cb69fc0f35b1b30 /sapi/apache2handler/sapi_apache2.c | |
| parent | 1d936e7054a8180e2f00a57116c76da594ddd677 (diff) | |
| download | php-git-b0064fc27f6b4aab6cf365c84985d225eeff7b24.tar.gz | |
Update sapi_apache2.c
Change of php5 for php7
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index aed77413ea..08e6caff3c 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -67,7 +67,7 @@ #define PHP_MAGIC_TYPE "application/x-httpd-php" #define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php-source" -#define PHP_SCRIPT "php5-script" +#define PHP_SCRIPT "php7-script" /* A way to specify the location of the php.ini dir in an apache directive */ char *apache2_php_ini_path_override = NULL; @@ -519,7 +519,7 @@ typedef struct { HashTable config; } php_conf_rec; zend_string *str; - php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php5_module); + php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php7_module); ZEND_HASH_FOREACH_STR_KEY(&c->config, str) { zend_restore_ini_entry(str, ZEND_INI_STAGE_SHUTDOWN); @@ -544,7 +544,7 @@ static int php_handler(request_rec *r) #define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC); - conf = ap_get_module_config(r->per_dir_config, &php5_module); + conf = ap_get_module_config(r->per_dir_config, &php7_module); /* apply_config() needs r in some cases, so allocate server_context early */ ctx = SG(server_context); |