diff options
| author | Jerome Loyet <fat@php.net> | 2012-09-27 23:57:06 +0200 |
|---|---|---|
| committer | Jerome Loyet <fat@php.net> | 2012-09-27 23:57:06 +0200 |
| commit | 0bffdd723fb1acbc8b1ef62768fa2f33c2d02bbc (patch) | |
| tree | 04bbcd1a5da16ea5246d39c1bcae45b9eb67c526 /sapi/cli/php_http_parser.h | |
| parent | 1fa8ecd082607858084994ad7081ef06e37db5f5 (diff) | |
| parent | 6a50a8640c562a41d90c7ab46affa767b97d2621 (diff) | |
| download | php-git-0bffdd723fb1acbc8b1ef62768fa2f33c2d02bbc.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (367 commits)
fix unix/win dir separators
Fix bug #63173: Crash when invoking invalid array callback
Correct the test summary
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Avoid calling select if maxfd returned by curl_multi_fdset is -1
Fixing NEWS file
Fixed bug #63111 (is_callable() lies for abstract static method)
updated lib versions
Fix folding
fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
Bug #63000: MCAST_JOIN_GROUP on OSX is broken
Fixed bug #61442 (exception threw in __autoload can not be catched)
Merging PR #116
Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver
updated libary versions
split tests for the new zlib version on win
Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
update news
Support building PHP with the native client toolchain.
...
Diffstat (limited to 'sapi/cli/php_http_parser.h')
| -rw-r--r-- | sapi/cli/php_http_parser.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sapi/cli/php_http_parser.h b/sapi/cli/php_http_parser.h index b740a0995e..2bf2356725 100644 --- a/sapi/cli/php_http_parser.h +++ b/sapi/cli/php_http_parser.h @@ -32,7 +32,10 @@ extern "C" { # include "win32/php_stdint.h" # include "config.w32.h" #else -# include <stdint.h> +# include "php_config.h" +# ifdef HAVE_STDINT_H +# include <stdint.h> +# endif #endif /* Compile with -DPHP_HTTP_PARSER_STRICT=0 to make less checks, but run @@ -77,6 +80,7 @@ enum php_http_method , PHP_HTTP_HEAD , PHP_HTTP_POST , PHP_HTTP_PUT + , PHP_HTTP_PATCH /* pathological */ , PHP_HTTP_CONNECT , PHP_HTTP_OPTIONS @@ -99,6 +103,8 @@ enum php_http_method , PHP_HTTP_NOTIFY , PHP_HTTP_SUBSCRIBE , PHP_HTTP_UNSUBSCRIBE + /* unknown, not implemented */ + , PHP_HTTP_NOT_IMPLEMENTED }; |