Merge branch 'PHP-5.6' into PHP-7.0

4 files changed, 23 insertions, 5 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 == '-') {
diff --git a/sapi/cli/php_http_parser.h b/sapi/cli/php_http_parser.h
index 402e7e3c83..fa4873abeb 100644
--- a/sapi/cli/php_http_parser.h
+++ b/sapi/cli/php_http_parser.h
@@ -88,6 +88,7 @@ enum php_http_method
   , PHP_HTTP_LOCK
   , PHP_HTTP_MKCOL
   , PHP_HTTP_MOVE
+  , PHP_HTTP_MKCALENDAR
   , PHP_HTTP_PROPFIND
   , PHP_HTTP_PROPPATCH
   , PHP_HTTP_SEARCH
diff --git a/sapi/cli/tests/bug69655.phpt b/sapi/cli/tests/bug69655.phpt
index 188b9c31ee..73791c95d5 100644
--- a/sapi/cli/tests/bug69655.phpt
+++ b/sapi/cli/tests/bug69655.phpt
@@ -10,7 +10,7 @@ include "skipif.inc";
 <?php
 include "php_cli_server.inc";
 php_cli_server_start();
-foreach (['MKCALENDAR', 'MKCO', 'MKCOLL', 'M'] as $method) {
+foreach (['MKCO', 'MKCOLL', 'M'] as $method) {
     $context = stream_context_create(['http' => ['method' => $method]]);
     // the following is supposed to emit a warning for unsupported methods
     file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS, false, $context);
@@ -25,6 +25,3 @@ Warning: file_get_contents(http://localhost:8964): failed to open stream: HTTP r
 
 Warning: file_get_contents(http://localhost:8964): failed to open stream: HTTP request failed! HTTP/1.0 501 Not Implemented
  in %s on line %d
-
-Warning: file_get_contents(http://localhost:8964): failed to open stream: HTTP request failed! HTTP/1.0 501 Not Implemented
- in %s on line %d
diff --git a/sapi/cli/tests/bug69953.phpt b/sapi/cli/tests/bug69953.phpt
new file mode 100644
index 0000000000..4de41fee40
--- /dev/null
+++ b/sapi/cli/tests/bug69953.phpt
@@ -0,0 +1,17 @@
+--TEST--
+FR #69953 (Support MKCALENDAR request method)
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start('echo $_SERVER["REQUEST_METHOD"];');
+$context = stream_context_create(['http' => ['method' => 'MKCALENDAR']]);
+var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS, false, $context));
+?>
+--EXPECT--
+string(10) "MKCALENDAR"