diff options
| author | Christopher Jones <sixd@php.net> | 2012-09-18 18:31:13 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-09-18 18:31:13 -0700 |
| commit | 2a352f6af790c820578e7f543907cab304de82fa (patch) | |
| tree | c4a5f967a093ceaee93b8e4c012cb676dd789689 /sapi/cli/php_http_parser.h | |
| parent | d90a7f15001528cd149b4f119269905da2486684 (diff) | |
| parent | 6793e09a4ef164fac343e50c39d284fbbe3e6050 (diff) | |
| download | php-git-2a352f6af790c820578e7f543907cab304de82fa.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
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)
Diffstat (limited to 'sapi/cli/php_http_parser.h')
| -rw-r--r-- | sapi/cli/php_http_parser.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/cli/php_http_parser.h b/sapi/cli/php_http_parser.h index 0f6c13dd35..2bf2356725 100644 --- a/sapi/cli/php_http_parser.h +++ b/sapi/cli/php_http_parser.h @@ -80,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 |