diff options
author | Anatol Belski <ab@php.net> | 2014-09-20 19:46:44 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-09-20 19:46:44 +0200 |
commit | 132cd8be0d13eaeee200cfa09b0596f6619c6a7e (patch) | |
tree | 7a928718769260e60252c0e048d2f10d0cd94f8c /sapi/apache_hooks/php_apache_http.h | |
parent | 763bfb4f3b0e66d5a961f9f367aa86e9f9da262e (diff) | |
parent | 268bcdc1cb668f76b85a84bc4d32194548cc185a (diff) | |
download | php-git-132cd8be0d13eaeee200cfa09b0596f6619c6a7e.tar.gz |
Merge branch 'pull-request/805'
* pull-request/805:
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Diffstat (limited to 'sapi/apache_hooks/php_apache_http.h')
-rw-r--r-- | sapi/apache_hooks/php_apache_http.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/apache_hooks/php_apache_http.h b/sapi/apache_hooks/php_apache_http.h index 23cf7fea69..e6610741c7 100644 --- a/sapi/apache_hooks/php_apache_http.h +++ b/sapi/apache_hooks/php_apache_http.h @@ -36,7 +36,7 @@ #include "php_ini.h" #include "ext/standard/php_standard.h" -#include "mod_php5.h" +#include "mod_php7.h" zval *php_apache_request_new(request_rec *r); |