diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:29:48 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:29:48 +0100 |
| commit | 12b15e5ca4ae7ebf6e50551a4c666ece97068074 (patch) | |
| tree | af4eaae6897444c3d8a987d59b695984a26d25d7 /sapi/apache2handler/php_apache.h | |
| parent | 545c296ef4b5ffdb1cf59583c55129f08d75601b (diff) | |
| parent | 6219a4e844e82f8eacd9ad6d24bb92739dcd6ff6 (diff) | |
| download | php-git-12b15e5ca4ae7ebf6e50551a4c666ece97068074.tar.gz | |
Merge branch 'master' into integer_semantics
Diffstat (limited to 'sapi/apache2handler/php_apache.h')
| -rw-r--r-- | sapi/apache2handler/php_apache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index f1033c9539..f6f4f7a7c9 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -29,7 +29,7 @@ #include "main/php_streams.h" /* Declare this so we can get to it from outside the sapi_apache2.c file */ -extern module AP_MODULE_DECLARE_DATA php5_module; +extern module AP_MODULE_DECLARE_DATA php7_module; /* A way to specify the location of the php.ini dir in an apache directive */ extern char *apache2_php_ini_path_override; |