]> granicus.if.org Git - php/commitdiff
Update sapi_apache2.c
authorjfha73 <jfha73@gmail.com>
Thu, 18 Sep 2014 17:30:17 +0000 (13:30 -0400)
committerAnatol Belski <ab@php.net>
Thu, 18 Sep 2014 18:43:31 +0000 (20:43 +0200)
Change of php5 for php7

sapi/apache2handler/sapi_apache2.c

index aed77413ea8b11585c6fc06dbf0eefe223552190..08e6caff3c9d2b68a9ffb8cd8ff183d911d4cc7a 100644 (file)
@@ -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);