Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5

Author: faizshukri

NEWS

@@ -7,15 +7,25 @@ PHP                                                                        NEWS
     (Adam)
   . Fixed bug #65108 (is_callable() triggers Fatal Error). 
     (David Soria Parra, Laruence)
+  . Fixed bug #65035 (yield / exit segfault). (Nikita)
+  . Fixed bug #65161 (Generator + autoload + syntax error = segfault). (Nikita)
+  . hex2bin() raises E_WARNING for invalid hex string. (Yasuo)
 
 - OPcache
   . Fixed bug #64827 (Segfault in zval_mark_grey (zend_gc.c)). (Laruence)
   . OPcache must be compatible with LiteSpeed SAPI (Dmitry)
 
+- CGI:
+  . Fixed Bug #65143 (Missing php-cgi man page). (Remi)
+
 - CLI server:
   . Fixed bug #65066 (Cli server not responsive when responding with 422 http
     status code). (Adam)
 
+- DateTime
+  . Fixed fug #65184 (strftime() returns insufficient-length string under
+    multibyte locales). (Anatol)
+
 - GD
   . Fixed #65070 (bgcolor does not use the same format as the input image with
     imagerotate). (Pierre)
@@ -25,20 +35,40 @@ PHP                                                                        NEWS
     that other formats. (Remi)
 
 - Intl:
-  . Fixed bug #62759: Buggy grapheme_substr() on edge case. (Stas)
+  . Add IntlCalendar::setMinimalDaysInFirstWeek()/
+    intlcal_set_minimal_days_in_first_week().
+  . Fixed trailing space in the name of constant IntlCalendar::FIELD_FIELD_COUNT.
+  . Fixed bug #62759 (Buggy grapheme_substr() on edge case). (Stas)
+  . Fixed bug #61860 (Offsets may be wrong for grapheme_stri* functions).
+    (Stas)
 
 - PDO:
   . Allowed PDO_OCI to compile with Oracle Database 12c client libraries.
     (Chris Jones)
 
+- Pgsql
+  . pg_unescape_bytea() raises E_WARNING for invalid inputs. (Yasuo)
+
+- Phar:
+  . Fixed Bug #65142 (Missing phar man page). (Remi)
+
+- Session:
+  . Added optional create_sid() argument to session_set_save_handler(),
+    SessionHandler and new SessionIdInterface. (Leigh, Arpad)
+
 - Sockets:
   . Implemented FR #63472 (Setting SO_BINDTODEVICE with socket_set_option).
     (Damjan Cvetko)
 
 - SPL:
+  . Fixed bug #65136 (RecursiveDirectoryIterator segfault). (Laruence)
   . Fixed bug #61828 (Memleak when calling Directory(Recursive)Iterator
     /Spl(Temp)FileObject ctor twice). (Laruence)
 
+- CGI/FastCGI SAPI:
+  . Added PHP_FCGI_BACKLOG, overrides the default listen backlog. (Arnaud Le
+    Blanc)
+
 20 Jun 2013, PHP 5.5.0
 
 - Core:

UPGRADING

@@ -40,40 +40,45 @@ PHP 5.5 UPGRADE NOTES
   (http://php.net/foreach#control-structures.foreach.list,
   http://wiki.php.net/rfc/foreachlist)
 
-- Support finally keyword. (Laruence)
+- Support "finally" keyword. (Laruence)
   (http://php.net/exceptions, http://wiki.php.net/rfc/finally)
 
 - Support constant array/string dereferencing. (Laruence)
-  (https://wiki.php.net/rfc/constdereference)
+  (http://php.net/manual/en/language.types.array.php,
+   https://wiki.php.net/rfc/constdereference)
 
 - Add support for using empty() on the result of function calls and
   other expressions. Thus it is now possible to write empty(getArray()),
-  for example. (https://wiki.php.net/rfc/empty_isset_exprs)
+  for example. (http://php.net/manual/en/function.empty.php,
+  https://wiki.php.net/rfc/empty_isset_exprs)
 
 - Added generators.
   (http://php.net/generators, https://wiki.php.net/rfc/generators)
 
 - ClassName::class syntax returning full class name for a class as a
-  string constant.
-  (http://php.net/oop5.basic#language.oop5.basic.class.class,
+  string constant.  (http://php.net/oop5.basic,
   https://wiki.php.net/rfc/class_name_scalars)
 
 - Added support for non-scalar Iterator keys in foreach.
-  (https://wiki.php.net/rfc/foreach-non-scalar-keys).
+  (http://php.net/manual/en/control-structures.foreach.php,
+  https://wiki.php.net/rfc/foreach-non-scalar-keys).
 
 - Bundled Zend OPcache extension to improve performance
   (http://php.net/manual/en/book.opcache.php,
   https://wiki.php.net/rfc/optimizerplus)
 
 - Added a simplified password hashing API
-  (http://php.net/password)
+  (http://php.net/password, https://wiki.php.net/rfc/password_hash)
 
 ========================================
 2. Changes in SAPI modules
 ========================================
 
 - Support for changing the process's title in CLI/CLI-Server
-  SAPIs. (Keyur) (https://wiki.php.net/rfc/cli_process_title)
+  SAPIs. (Keyur)
+  (http://php.net/manual/en/function.cli-set-process-title.php,
+  http://php.net/manual/en/function.cli-get-process-title.php,
+  https://wiki.php.net/rfc/cli_process_title)
 
 - Support for systemd in php-fpm: Add --with-fpm-systemd option to
   report health to systemd, and add systemd_interval option to

Zend/tests/generators/bug65035.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #65035: yield / exit segfault
+--FILE--
+<?php
+
+function gen() {
+    fn();
+    yield;
+}
+
+function fn() {
+    exit('Done');
+}
+
+$gen = gen();
+$gen->current();
+
+?>
+--EXPECT--
+Done

Zend/tests/generators/bug65161.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #65161: Generator + autoload + syntax error = segfault
+--FILE--
+<?php
+
+function autoload() {
+    foo();
+}
+spl_autoload_register('autoload');
+
+function testGenerator() {
+    new SyntaxError('param');
+    yield;
+}
+
+foreach (testGenerator() as $i);
+
+?>
+--EXPECTF--
+Fatal error: Call to undefined function foo() in %s on line %d

Zend/zend_alloc.c

@@ -2465,7 +2465,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 	size_t res = nmemb;
 	unsigned long overflow = 0;
 
-	__asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1"
+	__asm__ ("mull %3\n\taddl %4,%0\n\tadcl $0,%1"
 	     : "=&a"(res), "=&d" (overflow)
 	     : "%0"(res),
 	       "rm"(size),
@@ -2493,7 +2493,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 
         __asm__ ("mul" LP_SUFF  " %3\n\t"
                  "add %4,%0\n\t"
-                 "adc %1,%1"
+                 "adc $0,%1"
              : "=&a"(res), "=&d" (overflow)
              : "%0"(res),
                "rm"(size),
@@ -2535,7 +2535,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
         size_t res;
         unsigned long overflow;
 
-        __asm__ ("mul %0,%2,%3\n\tumulh %1,%2,%3\n\tadds %0,%0,%4\n\tadc %1,%1,%1"
+        __asm__ ("mul %0,%2,%3\n\tumulh %1,%2,%3\n\tadds %0,%0,%4\n\tadc %1,%1,xzr"
              : "=&r"(res), "=&r"(overflow)
              : "r"(nmemb),
                "r"(size),

Zend/zend_generators.c

@@ -55,6 +55,12 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished
 			zval_ptr_dtor(&execute_data->current_this);
 		}
 
+		/* A fatal error / die occured during the generator execution. Trying to clean
+		 * up the stack may not be safe in this case. */
+		if (CG(unclean_shutdown)) {
+			return;
+		}
+
 		/* If the generator is closed before it can finish execution (reach
 		 * a return statement) we have to free loop variables manually, as
 		 * we don't know whether the SWITCH_FREE / FREE opcodes have run */

ext/date/php_date.c

@@ -1678,6 +1678,13 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 			break;
 		}
 	}
+#if defined(PHP_WIN32) && _MSC_VER >= 1700
+	/* VS2012 strftime() returns number of characters, not bytes.
+		See VC++11 bug id 766205. */
+	if (real_len > 0) {
+		real_len = strlen(buf);
+	}
+#endif
 
 	timelib_time_dtor(ts);
 	if (!gmt) {

ext/date/tests/bug65184.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Test bug #65184 strftime() returns insufficient-length string under multibyte locales
+--SKIPIF--
+<?php
+if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
+    die("skip Test is valid for Windows");
+}
+?>
+--FILE--
+<?php
+	setlocale(LC_ALL, 'Japanese_Japan.932');
+	/* timestamp has to be some wednesday */
+	$s = strftime('%A', 1372884126);
+
+	for ($i = 0; $i < strlen($s); $i++) {
+		printf("%x ", ord($s[$i]));
+	}
+	echo "\n";
+
+	echo strlen(strftime('%A')), "\n";
+?>
+===DONE===
+--EXPECT--
+90 85 97 6a 93 fa 
+6
+===DONE===

ext/dba/tests/bug38698.phpt

@@ -8,10 +8,18 @@ Bug #38698 (Bug #38698 for some keys cdbmake creates corrupted db and cdb can't
 --FILE--
 <?php
 
+function isLittleEndian() {
+    return 0x00FF === current(unpack('v', pack('S',0x00FF)));
+}
+
 $db_file = dirname(__FILE__) .'/129php.cdb';
 
 if (($db_make=dba_open($db_file, "n", 'cdb_make'))!==FALSE) {
-	dba_insert(pack('i',129), "Booo!", $db_make);
+	if (isLittleEndian() === FALSE) {
+        dba_insert(pack('V',129), "Booo!", $db_make);
+	} else{
+		dba_insert(pack('i',129), "Booo!", $db_make);
+	}
 	dba_close($db_make);
 	// write md5 checksum of generated database file
 	var_dump(md5_file($db_file));

ext/imap/php_imap.c

@@ -1270,7 +1270,6 @@ PHP_FUNCTION(imap_reopen)
 	int mailbox_len;
 	long options = 0, retries = 0;
 	pils *imap_le_struct;
-	MAILSTREAM *imap_stream;
 	long flags=NIL;
 	long cl_flags=NIL;
 
@@ -1298,12 +1297,12 @@ PHP_FUNCTION(imap_reopen)
 		RETURN_FALSE;
 	}
 
-	imap_stream = mail_open(imap_le_struct->imap_stream, mailbox, flags);
-	if (imap_stream == NIL) {
+	imap_le_struct->imap_stream = mail_open(imap_le_struct->imap_stream, mailbox, flags);
+	if (imap_le_struct->imap_stream == NIL) {
+		zend_list_delete(Z_RESVAL_P(streamind));
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't re-open stream");
 		RETURN_FALSE;
 	}
-	imap_le_struct->imap_stream = imap_stream;
 	RETURN_TRUE;
 }
 /* }}} */

ext/intl/calendar/calendar_class.cpp

@@ -361,6 +361,10 @@ ZEND_BEGIN_ARG_INFO_EX(ainfo_cal_setLenient, 0, 0, 1)
 	ZEND_ARG_INFO(0, isLenient)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(ainfo_cal_set_minimal_days_in_first_week, 0, 0, 1)
+	ZEND_ARG_INFO(0, numberOfDays)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(ainfo_cal_from_date_time, 0, 0, 1)
 	ZEND_ARG_INFO(0, dateTime)
 ZEND_END_ARG_INFO()
@@ -433,6 +437,7 @@ static const zend_function_entry Calendar_class_functions[] = {
 #endif
 	PHP_ME_MAPPING(setFirstDayOfWeek,	intlcal_set_first_day_of_week, ainfo_cal_dow,					ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(setLenient,			intlcal_set_lenient,		ainfo_cal_setLenient,				ZEND_ACC_PUBLIC)
+	PHP_ME_MAPPING(setMinimalDaysInFirstWeek,intlcal_set_minimal_days_in_first_week,ainfo_cal_set_minimal_days_in_first_week,ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(equals,				intlcal_equals,				ainfo_cal_other_cal,				ZEND_ACC_PUBLIC)
 #if U_ICU_VERSION_MAJOR_NUM >= 49
 	PHP_ME_MAPPING(getRepeatedWallTimeOption,intlcal_get_repeated_wall_time_option,ainfo_cal_void,		ZEND_ACC_PUBLIC)
@@ -523,7 +528,7 @@ void calendar_register_IntlCalendar_class(TSRMLS_D)
 	CALENDAR_DECL_LONG_CONST("FIELD_JULIAN_DAY",			UCAL_JULIAN_DAY);
 	CALENDAR_DECL_LONG_CONST("FIELD_MILLISECONDS_IN_DAY",	UCAL_MILLISECONDS_IN_DAY);
 	CALENDAR_DECL_LONG_CONST("FIELD_IS_LEAP_MONTH",			UCAL_IS_LEAP_MONTH);
-	CALENDAR_DECL_LONG_CONST("FIELD_FIELD_COUNT ",			UCAL_FIELD_COUNT);
+	CALENDAR_DECL_LONG_CONST("FIELD_FIELD_COUNT",			UCAL_FIELD_COUNT);
 	CALENDAR_DECL_LONG_CONST("FIELD_DAY_OF_MONTH",			UCAL_DAY_OF_MONTH);
 
 	CALENDAR_DECL_LONG_CONST("DOW_SUNDAY",					UCAL_SUNDAY);

ext/intl/calendar/calendar_methods.cpp

@@ -997,6 +997,32 @@ U_CFUNC PHP_FUNCTION(intlcal_set_lenient)
 	RETURN_TRUE;
 }
 
+U_CFUNC PHP_FUNCTION(intlcal_set_minimal_days_in_first_week)
+{
+	long	num_days;
+	CALENDAR_METHOD_INIT_VARS;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
+			"Ol", &object, Calendar_ce_ptr, &num_days) == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			"intlcal_set_minimal_days_in_first_week: bad arguments", 0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	if (num_days < 1 || num_days > 7) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			"intlcal_set_minimal_days_in_first_week: invalid number of days; "
+			"must be between 1 and 7", 0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	CALENDAR_METHOD_FETCH_OBJECT;
+
+	co->ucal->setMinimalDaysInFirstWeek((uint8_t)num_days);
+
+	RETURN_TRUE;
+}
+
 U_CFUNC PHP_FUNCTION(intlcal_equals)
 {
 	zval			*other_object;

ext/intl/calendar/calendar_methods.h

@@ -91,6 +91,8 @@ PHP_FUNCTION(intlcal_set_first_day_of_week);
 
 PHP_FUNCTION(intlcal_set_lenient);
 
+PHP_FUNCTION(intlcal_set_minimal_days_in_first_week);
+
 PHP_FUNCTION(intlcal_equals);
 
 PHP_FUNCTION(intlcal_get_repeated_wall_time_option);