diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /sapi/apache_hooks/php_apache_http.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'sapi/apache_hooks/php_apache_http.h')
| -rw-r--r-- | sapi/apache_hooks/php_apache_http.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache_hooks/php_apache_http.h b/sapi/apache_hooks/php_apache_http.h index f79bd91c50..5684de9179 100644 --- a/sapi/apache_hooks/php_apache_http.h +++ b/sapi/apache_hooks/php_apache_http.h @@ -28,11 +28,11 @@ #include "http_main.h" #include "http_protocol.h" #include "http_request.h" -#include "http_log.h" +#include "http_log.h" #include "util_script.h" #include "php_variables.h" -#include "php_main.h" +#include "php_main.h" #include "php_ini.h" #include "ext/standard/php_standard.h" |