Merge branch 'master' into assert

dstogov · dstogov · commit ca8ecabf2a5f · 2015-03-02T10:49:23.000+03:00
* master:
  Update NEWS
  Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize)
  windows only test
  Align entries format
  Align entries format for 5.6.7
  Align entries format for 5.5.23
  Bump header year
  Fixed bug #69144 (strtr not replacing with partly matching replace pairs)
  Fixed test?
  Revert mktime()/gmmktime()'s arginfo
  Update NEWS
  Fixed bug #69141 Missing arguments in reflection info for some builtin functions
  Add NEWS entry
  Remove useless date warning
  Fix ARG_INFO for levenshtein
  Fix ARG_INFO for levenshtein
  fix dir separator in tests
  Update NEWS
  Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()).
diff --git a/NEWS b/NEWS
@@ -56,6 +56,7 @@
   . Fixed day_of_week function as it could sometimes return negative values
     internally. (Derick)
   . Removed $is_dst parameter from mktime() and gmmktime(). (Nikita)
+  . Removed date.timezone warning (https://wiki.php.net/rfc/date.timezone_warning_removal). (Bob)
 
 - DBA:
   . Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike)
@@ -74,7 +75,7 @@
   . New FILTER_VALIDATE_DOMAIN and better RFC conformance for FILTER_VALIDATE_URL. (Kevin Dunglas)
 
 - FPM:
-  . Fixed bug #68945 (Unknown admin values segfault pools) (Laruence)
+  . Fixed bug #68945 (Unknown admin values segfault pools). (Laruence)
   . Fixed bug #65933 (Cannot specify config lines longer than 1024 bytes). (Chris Wright)
   . Implement request #67106 (Split main fpm config). (Elan Ruusamäe, Remi)
 
@@ -97,8 +98,8 @@
     + Opcache). (Laruence)
 
 - OpenSSL:
-  . Fixed bug #61285, #68329, #68046, #41631: encrypted streams don't observe
-    socket timeouts (Brad Broerman)
+  . Fixed bug #61285, #68329, #68046, #41631 (encrypted streams don't observe
+    socket timeouts). (Brad Broerman)
 
 - pcntl:
   . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
@@ -120,11 +121,10 @@
 
 - Session:
   . Fixed bug #67694 (Regression in session_regenerate_id()). (Tjerk)
-  . Fixed bug #68941 (mod_files.sh is a bash-script) (bugzilla at ii.nl, Yasuo)
+  . Fixed bug #68941 (mod_files.sh is a bash-script). (bugzilla at ii.nl, Yasuo)
 
 - SOAP:
-  . Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes).
-    (Laruence)
+  . Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes). (Laruence)
 
 - SPL:
   . Implemented #67886 (SplPriorityQueue/SplHeap doesn't expose extractFlags
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -827,13 +827,6 @@ PHP_RSHUTDOWN_FUNCTION(date)
  */
 #define DATE_FORMAT_COOKIE   "l, d-M-Y H:i:s T"
 
-#define DATE_TZ_ERRMSG \
-	"It is not safe to rely on the system's timezone settings. You are " \
-	"*required* to use the date.timezone setting or the " \
-	"date_default_timezone_set() function. In case you used any of those " \
-	"methods and you are still getting this warning, you most likely " \
-	"misspelled the timezone identifier. "
-
 #define SUNFUNCS_RET_TIMESTAMP 0
 #define SUNFUNCS_RET_STRING    1
 #define SUNFUNCS_RET_DOUBLE    2
@@ -954,7 +947,9 @@ static PHP_INI_MH(OnUpdate_date_timezone)
 	DATEG(timezone_valid) = 0;
 	if (stage == PHP_INI_STAGE_RUNTIME) {
 		if (!timelib_timezone_id_is_valid(DATEG(default_timezone), DATE_TIMEZONEDB)) {
-			php_error_docref(NULL, E_WARNING, DATE_TZ_ERRMSG);
+			if (DATEG(default_timezone) && *DATEG(default_timezone)) {
+				php_error_docref(NULL, E_WARNING, "Invalid date.timezone value '%s', we selected the timezone 'UTC' for now.", DATEG(default_timezone));
+			}
 		} else {
 			DATEG(timezone_valid) = 1;
 		}
@@ -994,7 +989,6 @@ static char* guess_timezone(const timelib_tzdb *tzdb)
 		return DATEG(default_timezone);
 	}
 	/* Fallback to UTC */
-	php_error_docref(NULL, E_WARNING, DATE_TZ_ERRMSG "We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone.");
 	return "UTC";
 }
 
diff --git a/ext/date/tests/bug68942.phpt b/ext/date/tests/bug68942.phpt
@@ -6,4 +6,4 @@ $data = unserialize('a:2:{i:0;O:12:"DateTimeZone":2:{s:13:"timezone_type";a:2:{i
 var_dump($data);
 ?>
 --EXPECTF--
-Fatal error: DateTimeZone::__wakeup(): Timezone initialization failed in %s/bug68942.php on line %d
+Fatal error: DateTimeZone::__wakeup(): Timezone initialization failed in %s%ebug68942.php on line %d
diff --git a/ext/date/tests/bug68942_2.phpt b/ext/date/tests/bug68942_2.phpt
@@ -6,4 +6,4 @@ $data = unserialize('a:2:{i:0;O:8:"DateTime":3:{s:4:"date";s:26:"2000-01-01 00:0
 var_dump($data);
 ?>
 --EXPECTF--
-Fatal error: Invalid serialization data for DateTime object in %s/bug68942_2.php on line %d
+Fatal error: Invalid serialization data for DateTime object in %s%ebug68942_2.php on line %d
diff --git a/ext/date/tests/date_default_timezone_get-1.phpt b/ext/date/tests/date_default_timezone_get-1.phpt
@@ -12,9 +12,6 @@ date.timezone=
 	echo date_default_timezone_get(), "\n";
 	echo date('e'), "\n";
 ?>
---EXPECTF--
-Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_get-1.php on line 3
+--EXPECT--
 UTC
-
-Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_get-1.php on line 4
 UTC
diff --git a/ext/date/tests/date_default_timezone_get-2.phpt b/ext/date/tests/date_default_timezone_get-2.phpt
@@ -12,5 +12,4 @@ date.timezone=
 	echo date_default_timezone_get(), "\n";
 ?>
 --EXPECTF--
-Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_get-2.php on line 3
 UTC
diff --git a/ext/date/tests/date_default_timezone_set-1.phpt b/ext/date/tests/date_default_timezone_set-1.phpt
@@ -21,10 +21,7 @@ date.timezone=
 	echo date(DATE_ISO8601, $date3), "\n";
 	echo date(DATE_ISO8601, $date4), "\n";
 ?>
---EXPECTF--
-Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 3
-
-Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 4
+--EXPECT--
 America/Indiana/Knox
 2005-01-12T03:00:00-0500
 2005-07-12T03:00:00-0500
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -2581,7 +2581,7 @@ static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *act
 	}
 
 	if ((trace = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "trace", sizeof("trace")-1)) != NULL &&
-	    Z_LVAL_P(trace) > 0) {
+	    Z_TYPE_P(trace) == IS_LONG && Z_LVAL_P(trace) > 0) {
 		add_property_stringl(this_ptr, "__last_request", buf, buf_size);
 	}
 
@@ -2609,7 +2609,7 @@ static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *act
 		}
 		ret = FALSE;
 	} else if ((trace = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "trace", sizeof("trace")-1)) != NULL &&
-	    Z_LVAL_P(trace) > 0) {
+	    Z_TYPE_P(trace) == IS_LONG && Z_LVAL_P(trace) > 0) {
 		add_property_str(this_ptr, "__last_response", zend_string_copy(Z_STR_P(response)));
 	}
 	zval_ptr_dtor(&func);
@@ -2909,7 +2909,7 @@ PHP_METHOD(SoapClient, __call)
 
 	/* Add default headers */
 	this_ptr = getThis();
-	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1)) != NULL) {
+	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1)) != NULL && Z_TYPE_P(tmp) == IS_ARRAY) {
 		HashTable *default_headers = Z_ARRVAL_P(tmp);
 		if (soap_headers) {
 			if (!free_soap_headers) {
diff --git a/ext/soap/tests/bugs/bug69085.phpt b/ext/soap/tests/bugs/bug69085.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #69085 (SoapClient's __call() type confusion through unserialize())
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+
+$dummy = unserialize('O:10:"SoapClient":5:{s:3:"uri";s:1:"a";s:8:"location";s:22:"http://localhost/a.xml";s:17:"__default_headers";i:1337;s:15:"__last_response";s:1:"a";s:5:"trace";s:1:"x";}');
+try {
+	$dummy->whatever();
+} catch (Exception $e) {
+	echo "okey";
+}
+--EXPECT--
+okey
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -1419,6 +1419,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setcookie, 0, 0, 1)
 	ZEND_ARG_INFO(0, path)
 	ZEND_ARG_INFO(0, domain)
 	ZEND_ARG_INFO(0, secure)
+	ZEND_ARG_INFO(0, httponly)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1)
@@ -1428,6 +1429,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1)
 	ZEND_ARG_INFO(0, path)
 	ZEND_ARG_INFO(0, domain)
 	ZEND_ARG_INFO(0, secure)
+	ZEND_ARG_INFO(0, httponly)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_headers_sent, 0, 0, 0)
@@ -1533,12 +1535,14 @@ ZEND_BEGIN_ARG_INFO(arginfo_iptcparse, 0)
 	ZEND_ARG_INFO(0, iptcdata)
 ZEND_END_ARG_INFO()
 /* }}} */
+
 /* {{{ lcg.c */
 ZEND_BEGIN_ARG_INFO(arginfo_lcg_value, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
+
 /* {{{ levenshtein.c */
-ZEND_BEGIN_ARG_INFO(arginfo_levenshtein, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_levenshtein, 0, 0, 2)
 	ZEND_ARG_INFO(0, str1)
 	ZEND_ARG_INFO(0, str2)
 	ZEND_ARG_INFO(0, cost_ins)
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -3140,7 +3140,7 @@ static void php_strtr_array(zval *return_value, zend_string *input, HashTable *p
 			pos++;
 		}
 	}
-	if (result.s && result.s->len) {
+	if (result.s) {
 		smart_str_appendl(&result, str + old_pos, slen - old_pos);
 		smart_str_0(&result);
 		RETVAL_STR(result.s);
diff --git a/ext/standard/tests/mail/bug69115.phpt b/ext/standard/tests/mail/bug69115.phpt
@@ -1,12 +1,19 @@
 --TEST--
 Bug #69115 crash in mail (plus indirect pcre test)
+--SKIPIF--
+<?php
+if( substr(PHP_OS, 0, 3) != 'WIN' ) {
+   die('skip...Windows only test');
+}
+
+require_once(dirname(__FILE__).'/mail_skipif.inc');
+?>
 --FILE--
 <?php
 /* Just ensure it doesn't crash when trimming headers */
 $message = "Line 1\r\nLine 2\r\nLine 3";
-mail('caffeinated@not-ever-reached-example.com', 'My Subject', $message, "From: me@me.me");
+mail('user@example.com', 'My Subject', $message, "From: me@me.me");
 ?>
 ===DONE===
---EXPECTF--
-%A
+--EXPECT--
 ===DONE===
diff --git a/ext/standard/tests/serialize/bug69139.phpt b/ext/standard/tests/serialize/bug69139.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #69139 (Crash in gc_zval_possible_root on unserialize)
+--FILE--
+<?php
+$str = 'a:1126666:{i:0;r:1;i:-09610;r:1;i:-0;i:0;i:0;O:1:"A":2119X:i:0;i:0;i:0;i:0;i:0;O:1:"A":2116:{i:0;r:5;i:-096766610;r:1;i:-610;r:1;i:0;i:0;';
+@unserialize($str);
+echo "Alive";
+?>
+--EXPECT--
+Alive
diff --git a/ext/standard/tests/strings/bug69144.phpt b/ext/standard/tests/strings/bug69144.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #69144 (strtr not replacing with partly matching replace pairs)
+--FILE--
+<?php
+$tests = array('bar' => '', 'foo' => 'o', 'foobar' => '', 'hello' => 'hello');
+
+foreach ($tests as $input => $expected) {
+    if ($expected !== ($actual = strtr($input, array("fo" => "", "foobar" => "", "bar" => "")))) {
+        echo "KO `$input` became `$actual` instead of `$expected`\n";
+    }
+}
+echo "okey";
+?>
+--EXPECT--
+okey
diff --git a/ext/standard/var.c b/ext/standard/var.c
@@ -1036,7 +1036,7 @@ PHP_FUNCTION(unserialize)
 			zend_hash_destroy(class_hash);
 			FREE_HASHTABLE(class_hash);
 		}
-		zval_dtor(return_value);
+		zval_ptr_dtor(return_value);
 		if (!EG(exception)) {
 			php_error_docref(NULL, E_NOTICE, "Error at offset " ZEND_LONG_FMT " of %d bytes", (zend_long)((char*)p - buf), buf_len);
 		}
diff --git a/header b/header
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2014 The PHP Group                                |
+  | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Original file line number	Diff line number	Diff line change
`@@ -2581,7 +2581,7 @@ static int do_request(zval this_ptr, xmlDoc request, char location, char act`
`2581`	`2581`	`}`
`2582`	`2582`
`2583`	`2583`	`if ((trace = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "trace", sizeof("trace")-1)) != NULL &&`
`2584`		`- Z_LVAL_P(trace) > 0) {`
	`2584`	`+ Z_TYPE_P(trace) == IS_LONG && Z_LVAL_P(trace) > 0) {`
`2585`	`2585`	`add_property_stringl(this_ptr, "__last_request", buf, buf_size);`
`2586`	`2586`	`}`
`2587`	`2587`
`@@ -2609,7 +2609,7 @@ static int do_request(zval this_ptr, xmlDoc request, char location, char act`
`2609`	`2609`	`}`
`2610`	`2610`	`ret = FALSE;`
`2611`	`2611`	`} else if ((trace = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "trace", sizeof("trace")-1)) != NULL &&`
`2612`		`- Z_LVAL_P(trace) > 0) {`
	`2612`	`+ Z_TYPE_P(trace) == IS_LONG && Z_LVAL_P(trace) > 0) {`
`2613`	`2613`	`add_property_str(this_ptr, "__last_response", zend_string_copy(Z_STR_P(response)));`
`2614`	`2614`	`}`
`2615`	`2615`	`zval_ptr_dtor(&func);`
`@@ -2909,7 +2909,7 @@ PHP_METHOD(SoapClient, __call)`
`2909`	`2909`
`2910`	`2910`	`/* Add default headers */`
`2911`	`2911`	`this_ptr = getThis();`
`2912`		`- if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1)) != NULL) {`
	`2912`	`+ if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1)) != NULL && Z_TYPE_P(tmp) == IS_ARRAY) {`
`2913`	`2913`	`HashTable *default_headers = Z_ARRVAL_P(tmp);`
`2914`	`2914`	`if (soap_headers) {`
`2915`	`2915`	`if (!free_soap_headers) {`