diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-03 19:26:22 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-03 19:27:35 +0100 |
| commit | 3240dd93b3f8a92ae587df20d7e07d436d0be2a9 (patch) | |
| tree | 255516dd3b0071767cc09ab788e366c59c8d0d29 /sapi/cli/php_http_parser.c | |
| parent | 159602bd866edb2a3c8de7192864ef6aa7a0201d (diff) | |
| parent | 2d4ad66ff2e9f64e23461325f3c73bd5791653c2 (diff) | |
| download | php-git-3240dd93b3f8a92ae587df20d7e07d436d0be2a9.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'sapi/cli/php_http_parser.c')
| -rw-r--r-- | sapi/cli/php_http_parser.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sapi/cli/php_http_parser.c b/sapi/cli/php_http_parser.c index aa9f28638f..5f8eb3ce0b 100644 --- a/sapi/cli/php_http_parser.c +++ b/sapi/cli/php_http_parser.c @@ -89,6 +89,7 @@ static const char *method_strings[] = , "LOCK" , "MKCOL" , "MOVE" + , "MKCALENDAR" , "PROPFIND" , "PROPPATCH" , "SEARCH" @@ -585,7 +586,7 @@ size_t php_http_parser_execute (php_http_parser *parser, case 'G': parser->method = PHP_HTTP_GET; break; case 'H': parser->method = PHP_HTTP_HEAD; break; case 'L': parser->method = PHP_HTTP_LOCK; break; - case 'M': parser->method = PHP_HTTP_MKCOL; /* or MOVE, MKACTIVITY, MERGE, M-SEARCH */ break; + case 'M': parser->method = PHP_HTTP_MKCOL; /* or MOVE, MKCALENDAR, MKACTIVITY, MERGE, M-SEARCH */ break; case 'N': parser->method = PHP_HTTP_NOTIFY; break; case 'O': parser->method = PHP_HTTP_OPTIONS; break; case 'P': parser->method = PHP_HTTP_POST; /* or PROPFIND or PROPPATCH or PUT */ break; @@ -623,6 +624,8 @@ size_t php_http_parser_execute (php_http_parser *parser, } else if (parser->method == PHP_HTTP_MKCOL) { if (index == 1 && ch == 'O') { parser->method = PHP_HTTP_MOVE; + } else if (index == 3 && ch == 'A') { + parser->method = PHP_HTTP_MKCALENDAR; } else if (index == 1 && ch == 'E') { parser->method = PHP_HTTP_MERGE; } else if (index == 1 && ch == '-') { |