From: Nikita Popov <nikic@php.net>
Date: Thu, 3 Mar 2016 18:26:22 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.5RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3240dd93b3f8a92ae587df20d7e07d436d0be2a9;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

3240dd93b3f8a92ae587df20d7e07d436d0be2a9
diff --cc NEWS
index 80559e77b8,cf0cb05082..f65d84afdd
--- a/NEWS
+++ b/NEWS
@@@ -1,20 -1,13 +1,23 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2016, PHP 5.6.20
 +?? ??? 2016 PHP 7.0.5
  
+ - CLI Server:
+   . Fixed bug #69953 (Support MKCALENDAR request method). (Christoph)
+ 
  - Core:
 +  . Fixed bug #71695 (Global variables are reserved before execution).
 +    (Laruence)
 +  . Fixed bug #71629 (Out-of-bounds access in php_url_decode in context
 +    php_stream_url_wrap_rfc2397). (mt at debian dot org)
 +  . Fixed bug #71622 (Strings used in pass-as-reference cannot be used to
 +    invoke C::$callable()). (Bob)
    . Fixed bug #71596 (Segmentation fault on ZTS with date function
      (setlocale)). (Anatol)
 +  . Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap()). (Dmitry)
 +  . Fixed bug #71470 (Leaked 1 hashtable iterators). (Nikita)
 +  . Fixed bug #71575 (ISO C does not allow extra ‘;’ outside of a function).
 +    (asgrim)
  
  - Curl:
    . Fixed bug #71694 (Support constant CURLM_ADDED_ALREADY). (mpyw)
diff --cc sapi/cli/php_http_parser.c
index aa9f28638f,71730322e0..5f8eb3ce0b
--- a/sapi/cli/php_http_parser.c
+++ b/sapi/cli/php_http_parser.c
@@@ -89,9 -89,9 +89,10 @@@ static const char *method_strings[] 
    , "LOCK"
    , "MKCOL"
    , "MOVE"
+   , "MKCALENDAR"
    , "PROPFIND"
    , "PROPPATCH"
 +  , "SEARCH"
    , "UNLOCK"
    , "REPORT"
    , "MKACTIVITY"
diff --cc sapi/cli/php_http_parser.h
index 402e7e3c83,f2e1246ca8..fa4873abeb
--- a/sapi/cli/php_http_parser.h
+++ b/sapi/cli/php_http_parser.h
@@@ -88,9 -88,9 +88,10 @@@ enum php_http_metho
    , PHP_HTTP_LOCK
    , PHP_HTTP_MKCOL
    , PHP_HTTP_MOVE
+   , PHP_HTTP_MKCALENDAR
    , PHP_HTTP_PROPFIND
    , PHP_HTTP_PROPPATCH
 +  , PHP_HTTP_SEARCH
    , PHP_HTTP_UNLOCK
    /* subversion */
    , PHP_HTTP_REPORT