set versions

set versions for 7.1.6RC1
Merge branch 'PHP-7.0' into PHP-7.1
2026-11-09 10:10:50 +00:00 · 2017-06-07 09:05:10 +01:00 · 2017-05-23 22:01:56 +01:00 · 2017-05-23 12:33:23 +02:00 · 2017-05-23 12:31:03 +02:00 · 2017-05-20 13:51:18 +02:00
88 changed files with 640 additions and 67 deletions
@@ -24,7 +24,7 @@ environment:
        PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
        PHP_BUILD_OBJ_DIR: c:\obj
        PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-        PHP_BUILD_SDK_BRANCH: php-sdk-2.0.1
+        PHP_BUILD_SDK_BRANCH: php-sdk-2.0.4
        # ext and env setup for tests
        #MYSQL_TEST_PASSWD: Password12!
        #MYSQL_TEST_USER: root
@@ -43,7 +43,7 @@ environment:
 services:
        # the setup scripts have to be touched, once some other db version is used
        - mysql
-        - postgresql95
+        - postgresql96

 platform:
        - x64
@@ -1,5 +1,39 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+7 Jun 2017, PHP 7.1.6
+
+- Core:
+  . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i).
+    (Laruence)
+  . Fixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST).
+    (Laruence)
+  . Fixed bug #74589 (__DIR__ wrong for unicode character). (Anatol)
+
+- intl:
+  . Fixed bug #74468 (wrong reflection on Collator::sortWithSortKeys). (villfa)
+
+- MySQLi:
+  . Fixed bug #74547 (mysqli::change_user() doesn't accept null as $database
+    argument w/strict_types). (Anatol)
+
+- Opcache:
+  . Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled). (Laruence)
+
+- phar:
+  . Fixed bug #51918 (Phar::webPhar() does not handle requests sent through PUT
+    and DELETE method). (Christian Weiske)
+
+- Readline:
+  . Fixed bug #74490 (readline() moves the cursor to the beginning of the line).
+    (Anatol)
+
+- Standard:
+  . Fixed bug #74510 (win32/sendmail.c anchors CC header but not BCC).
+    (Damian Wadley, Anatol)
+
+- xmlreader:
+  . Fixed bug #74457 (Wrong reflection on XMLReader::expand). (villfa)
+
 11 May 2017, PHP 7.1.5

 - Core:
@@ -15,6 +49,7 @@ PHP                                                                        NEWS
    (Matt Ficken)
  . Fixed bug #74337 (php-cgi.exe crash on facebook callback).
    (Anton Serbulov)
+  . Patch for bug #74216 was reverted. (Anatol)

 - Date:
  . Fixed bug #74404 (Wrong reflection on DateTimeZone::getTransitions).
@@ -33,6 +68,10 @@ PHP                                                                        NEWS
  . Fixed bug #74343 (compile fails on solaris 11 with system gd2 library).
    (krakjoe)

+- MySQLi:
+  . Fixed bug #74432 (mysqli_connect adding ":3306" to $host if $port parameter
+    not given). (Anatol)
+
 - MySQLnd:
  . Fixed bug #74376 (Invalid free of persistent results on error/connection
    loss). (Yussuf Khalil)
@@ -57,6 +96,8 @@ PHP                                                                        NEWS
    key). (Jakub Zelenka)
  . Fixed bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without
    seconds). (Moritz Fain)
+  . Fixed bug #73808 (iv length warning too restrictive for aes-128-ccm).
+    (Jakub Zelenka)

 - phar:
  . Fixed bug #74383 (phar method parameters reflection correction). 
@@ -0,0 +1,11 @@
+--TEST--
+Bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())
+--FILE--
+<?php 
+"000000"[0]::d;
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Class '0' not found in %sbug74546.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug74546.php on line %d
@@ -0,0 +1,29 @@
+--TEST--
+Bug #74606 (Segfault within try/catch/finally nesting in Generators)
+--FILE--
+<?php
+
+function gen() {
+	$array = ["foo"];
+	$array[] = "bar";
+
+	foreach ($array as $item) {
+		try {
+			try {
+				yield;
+			} finally {
+				echo "fin $item\n";
+			}
+		} catch (\Exception $e) {
+			echo "catch\n";
+			continue;
+		}
+	}
+}
+gen()->throw(new Exception);
+
+?>
+--EXPECT--
+fin foo
+catch
+fin bar
@@ -6455,7 +6455,11 @@ static zend_bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast) /* {{{ */
 		{
 			zend_string *filename = CG(compiled_filename);
 			zend_string *dirname = zend_string_init(ZSTR_VAL(filename), ZSTR_LEN(filename), 0);
+#ifdef ZEND_WIN32
+			php_win32_ioutil_dirname(ZSTR_VAL(dirname), ZSTR_LEN(dirname));
+#else
 			zend_dirname(ZSTR_VAL(dirname), ZSTR_LEN(dirname));
+#endif

 			if (strcmp(ZSTR_VAL(dirname), ".") == 0) {
 				dirname = zend_string_extend(dirname, MAXPATHLEN, 0);
@@ -7370,8 +7374,11 @@ void zend_compile_class_const(znode *result, zend_ast *ast) /* {{{ */
 		return;
 	}

-	zend_eval_const_expr(&class_ast);
-	zend_eval_const_expr(&const_ast);
+	zend_eval_const_expr(&ast->child[0]);
+	zend_eval_const_expr(&ast->child[1]);
+
+	class_ast = ast->child[0];
+	const_ast = ast->child[1];

 	if (class_ast->kind == ZEND_AST_ZVAL) {
 		zend_string *resolved_name;
@@ -8309,8 +8316,11 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */
 				break;
 			}

-			zend_eval_const_expr(&class_ast);
-			zend_eval_const_expr(&name_ast);
+			zend_eval_const_expr(&ast->child[0]);
+			zend_eval_const_expr(&ast->child[1]);
+
+			class_ast = ast->child[0];
+			name_ast = ast->child[1];

 			if (name_ast->kind == ZEND_AST_ZVAL && zend_string_equals_literal_ci(zend_ast_get_str(name_ast), "class")) {
 				zend_error_noreturn(E_COMPILE_ERROR,
@@ -108,7 +108,7 @@ static void zend_generator_cleanup_unfinished_execution(
 		if (UNEXPECTED(generator->frozen_call_stack)) {
 			zend_generator_restore_call_stack(generator);
 		}
-		zend_cleanup_unfinished_execution(execute_data, op_num, 0);
+		zend_cleanup_unfinished_execution(execute_data, op_num, catch_op_num);
 	}
 }
 /* }}} */
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);

 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=1
-PHP_RELEASE_VERSION=5
+PHP_RELEASE_VERSION=6
 PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
@@ -494,6 +494,7 @@ limits.h \
 locale.h \
 monetary.h \
 netdb.h \
+poll.h \
 pwd.h \
 resolv.h \
 signal.h \
@@ -88,6 +88,10 @@ ZEND_BEGIN_ARG_INFO_EX( collator_sort_args, 0, 0, 1 )
 	ZEND_ARG_INFO( 0, flags )
 ZEND_END_ARG_INFO()

+ZEND_BEGIN_ARG_INFO_EX( collator_sort_with_sort_keys_args, 0, 0, 1 )
+	ZEND_ARG_ARRAY_INFO( 1, arr, 0 )
+ZEND_END_ARG_INFO()
+
 /* }}} */

 /* {{{ Collator_class_functions
@@ -99,7 +103,7 @@ zend_function_entry Collator_class_functions[] = {
 	ZEND_FENTRY( create, ZEND_FN( collator_create ), collator_1_arg, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
 	PHP_NAMED_FE( compare, ZEND_FN( collator_compare ), collator_2_args )
 	PHP_NAMED_FE( sort, ZEND_FN( collator_sort ), collator_sort_args )
-	PHP_NAMED_FE( sortWithSortKeys, ZEND_FN( collator_sort_with_sort_keys ), collator_sort_args )
+	PHP_NAMED_FE( sortWithSortKeys, ZEND_FN( collator_sort_with_sort_keys ), collator_sort_with_sort_keys_args )
 	PHP_NAMED_FE( asort, ZEND_FN( collator_asort ), collator_sort_args )
 	PHP_NAMED_FE( getAttribute, ZEND_FN( collator_get_attribute ), collator_1_arg )
 	PHP_NAMED_FE( setAttribute, ZEND_FN( collator_set_attribute ), collator_2_args )
@@ -154,6 +154,11 @@ ZEND_BEGIN_ARG_INFO_EX(collator_sort_args, 0, 0, 2)
 	ZEND_ARG_INFO(0, sort_flags)
 ZEND_END_ARG_INFO()

+ZEND_BEGIN_ARG_INFO_EX(collator_sort_with_sort_keys_args, 0, 0, 2)
+	ZEND_ARG_OBJ_INFO(0, coll, Collator, 0)
+	ZEND_ARG_ARRAY_INFO(1, arr, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(numfmt_parse_arginfo, 0, 0, 2)
 	ZEND_ARG_INFO(0, formatter)
 	ZEND_ARG_INFO(0, string)
@@ -629,7 +634,7 @@ zend_function_entry intl_functions[] = {
 	PHP_FE( collator_get_strength, collator_0_args )
 	PHP_FE( collator_set_strength, collator_1_arg )
 	PHP_FE( collator_sort, collator_sort_args )
-	PHP_FE( collator_sort_with_sort_keys, collator_sort_args )
+	PHP_FE( collator_sort_with_sort_keys, collator_sort_with_sort_keys_args )
 	PHP_FE( collator_asort, collator_sort_args )
 	PHP_FE( collator_get_locale, collator_1_arg )
 	PHP_FE( collator_get_error_code, collator_0_args )
@@ -0,0 +1,22 @@
+--TEST--
+Bug #74468 Wrong reflection on Collator::sortWithSortKeys
+--SKIPIF--
+<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if (version_compare(INTL_ICU_VERSION, '51.2') >=  0) die('skip for ICU < 51.2'); ?>
+--FILE--
+<?php
+$rm = new ReflectionMethod(Collator::class, 'sortWithSortKeys');
+var_dump($rm->getNumberOfParameters());
+var_dump($rm->getNumberOfRequiredParameters());
+
+$rf = new ReflectionFunction('collator_sort_with_sort_keys');
+var_dump($rf->getNumberOfParameters());
+var_dump($rf->getNumberOfRequiredParameters());
+?>
+===DONE===
+--EXPECT--
+int(1)
+int(1)
+int(2)
+int(2)
+===DONE===
@@ -19,8 +19,8 @@ var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG, 'pt_PT'));

 ?>
 ==DONE==
--EXPECT--
+--EXPECTF--
 string(30) "Western European Standard Time"
 string(30) "Western European Standard Time"
-string(32) "Hora Padrão da Europa Ocidental"
+string(32) "Hora %cadrão da Europa Ocidental"
 ==DONE==
@@ -619,7 +619,7 @@ PHP_FUNCTION(mysqli_change_user)
 	const		CHARSET_INFO * old_charset;
 #endif

-	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osss", &mysql_link, mysqli_link_class_entry, &user, &user_len, &password, &password_len, &dbname, &dbname_len) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osss!", &mysql_link, mysqli_link_class_entry, &user, &user_len, &password, &password_len, &dbname, &dbname_len) == FAILURE) {
 		return;
 	}
 	MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
@@ -261,6 +261,17 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_query, 0, 0, 2)
 	MYSQLI_ZEND_ARG_OBJ_INFO_LINK()
 	ZEND_ARG_INFO(0, query)
+	ZEND_ARG_INFO(0, resultmode)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_multi_query, 0, 0, 1)
+	MYSQLI_ZEND_ARG_OBJ_INFO_LINK()
+	ZEND_ARG_INFO(0, query)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_real_query, 0, 0, 1)
+	MYSQLI_ZEND_ARG_OBJ_INFO_LINK()
+	ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_prepare, 0, 0, 2)
@@ -275,6 +286,19 @@ ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_query, 0, 0, 1)
 	ZEND_ARG_INFO(0, query)
+	ZEND_ARG_INFO(0, resultmode)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_prepare, 0, 0, 1)
+	ZEND_ARG_INFO(0, query)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_multi_query, 0, 0, 1)
+	ZEND_ARG_INFO(0, query)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_real_query, 0, 0, 1)
+	ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_options, 0, 0, 3)
@@ -442,7 +466,7 @@ const zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_insert_id,							arginfo_mysqli_only_link)
 	PHP_FE(mysqli_kill,									arginfo_mysqli_kill)
 	PHP_FE(mysqli_more_results,							arginfo_mysqli_only_link)
-	PHP_FE(mysqli_multi_query, 							arginfo_mysqli_query)
+	PHP_FE(mysqli_multi_query, 							arginfo_mysqli_multi_query)
 	PHP_FE(mysqli_next_result,							arginfo_mysqli_only_link)
 	PHP_FE(mysqli_num_fields,							arginfo_mysqli_only_result)
 	PHP_FE(mysqli_num_rows,								arginfo_mysqli_only_result)
@@ -456,7 +480,7 @@ const zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_query,								arginfo_mysqli_query)
 	PHP_FE(mysqli_real_connect,							arginfo_mysqli_real_connect)
 	PHP_FE(mysqli_real_escape_string,					arginfo_mysqli_real_escape_string)
-	PHP_FE(mysqli_real_query,							arginfo_mysqli_query)
+	PHP_FE(mysqli_real_query,							arginfo_mysqli_real_query)
 #if defined(MYSQLI_USE_MYSQLND)
 	PHP_FE(mysqli_reap_async_query,						arginfo_mysqli_only_link)
 #endif
@@ -542,7 +566,7 @@ const zend_function_entry mysqli_link_methods[] = {
 	PHP_FALIAS(get_warnings, mysqli_get_warnings, arginfo_mysqli_no_params)
 	PHP_FALIAS(init,mysqli_init_method, arginfo_mysqli_no_params)
 	PHP_FALIAS(kill,mysqli_kill, arginfo_class_mysqli_kill)
-	PHP_FALIAS(multi_query, mysqli_multi_query, arginfo_class_mysqli_query)
+	PHP_FALIAS(multi_query, mysqli_multi_query, arginfo_class_mysqli_multi_query)
 	PHP_FALIAS(__construct, mysqli_link_construct, arginfo_mysqli_connect)
 	PHP_FALIAS(more_results, mysqli_more_results, arginfo_mysqli_no_params)
 	PHP_FALIAS(next_result, mysqli_next_result, arginfo_mysqli_no_params)
@@ -551,7 +575,7 @@ const zend_function_entry mysqli_link_methods[] = {
 #if defined(MYSQLI_USE_MYSQLND)
 	ZEND_FENTRY(poll, ZEND_FN(mysqli_poll), arginfo_mysqli_poll, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
 #endif
-	PHP_FALIAS(prepare, mysqli_prepare, arginfo_class_mysqli_query)
+	PHP_FALIAS(prepare, mysqli_prepare, arginfo_class_mysqli_prepare)
 	PHP_FALIAS(query, mysqli_query, arginfo_class_mysqli_query)
 	PHP_FALIAS(real_connect, mysqli_real_connect, arginfo_class_mysqli_real_connect)
 	PHP_FALIAS(real_escape_string, mysqli_real_escape_string, arginfo_class_mysqli_real_escape_string)
@@ -559,7 +583,7 @@ const zend_function_entry mysqli_link_methods[] = {
 	PHP_FALIAS(reap_async_query, mysqli_reap_async_query, arginfo_mysqli_no_params)
 #endif
 	PHP_FALIAS(escape_string, mysqli_real_escape_string, arginfo_class_mysqli_real_escape_string)
-	PHP_FALIAS(real_query, mysqli_real_query, arginfo_class_mysqli_query)
+	PHP_FALIAS(real_query, mysqli_real_query, arginfo_class_mysqli_real_query)
 	PHP_FALIAS(release_savepoint, mysqli_release_savepoint, arginfo_class_mysqli_release_savepoint)
 	PHP_FALIAS(rollback, mysqli_rollback, arginfo_class_mysqli_rollback)
 	PHP_FALIAS(savepoint, mysqli_savepoint, arginfo_class_mysqli_savepoint)
@@ -628,7 +652,7 @@ const zend_function_entry mysqli_stmt_methods[] = {
 	PHP_FALIAS(send_long_data, mysqli_stmt_send_long_data, arginfo_class_mysqli_stmt_send_long_data)
 	PHP_FALIAS(free_result, mysqli_stmt_free_result, arginfo_mysqli_no_params)
 	PHP_FALIAS(reset, mysqli_stmt_reset, arginfo_mysqli_no_params)
-	PHP_FALIAS(prepare, mysqli_stmt_prepare, arginfo_class_mysqli_query)
+	PHP_FALIAS(prepare, mysqli_stmt_prepare, arginfo_class_mysqli_prepare)
 	PHP_FALIAS(store_result, mysqli_stmt_store_result, arginfo_mysqli_no_params)
 #if defined(MYSQLI_USE_MYSQLND)
 	PHP_FALIAS(get_result, mysqli_stmt_get_result, arginfo_mysqli_no_params)
@@ -0,0 +1,25 @@
+--TEST--
+Bug #74547 mysqli::change_user() doesn't accept null as $database argument w/strict_types
+--SKIPIF--
+<?php
+  require_once('skipif.inc');
+  require_once('skipifconnectfailure.inc');
+?>
+--FILE--
+<?php
+	declare(strict_types=1);
+
+	require_once("connect.inc");
+
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+		printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+			$host, $user, $db, $port, $socket);
+
+	var_dump(mysqli_change_user($link, $user, $passwd, NULL));
+
+	mysqli_close($link);
+?>
+===DONE===
+--EXPECTF--
+bool(true)
+===DONE===
@@ -0,0 +1,25 @@
+--TEST--
+Bug #74595 (ReflectionMethod::getParameters returns incorrect number of parameters)
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+?>
+--FILE--
+<?php
+$class = new ReflectionClass('mysqli');
+$method = $class->getMethod('query');
+var_dump($method->getParameters());
+?>
+--EXPECTF--
+array(2) {
+  [0]=>
+  object(ReflectionParameter)#%d (1) {
+    ["name"]=>
+    string(5) "query"
+  }
+  [1]=>
+  object(ReflectionParameter)#%d (1) {
+    ["name"]=>
+    string(10) "resultmode"
+  }
+}
@@ -732,7 +732,7 @@ isInternal: yes
 isUserDefined: no
 returnsReference: no
 Modifiers: 256
-Number of Parameters: 1
+Number of Parameters: 2
 Number of Required Parameters: 1

 Inspecting parameter 'query' of method 'query'
@@ -742,6 +742,13 @@ isPassedByReference: no
 isOptional: no
 isDefaultValueAvailable: no

+Inspecting parameter 'resultmode' of method 'query'
+isArray: no
+allowsNull: no
+isPassedByReference: no
+isOptional: yes
+isDefaultValueAvailable: no
+
 Inspecting method 'real_connect'
 isFinal: no
 isAbstract: no
@@ -0,0 +1,29 @@
+--TEST--
+Bug #74432, BC issue on undocumented connect string
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
+--FILE--
+<?php
+	/* This behavior is undocumented, but might be in use. Until there's no officially
+		supported alternative, ensure changes doesn't cause BC breach. Otherwise,
+		the test should be removed once the undocumented behavior changes. */
+
+	require_once("connect.inc");
+
+	$handle = mysqli_connect("$host:$port", $user, $passwd);
+
+	var_dump($handle);
+
+	if ($handle) {
+		mysqli_close($handle);
+	}
+?>
+--EXPECTF--
+object(mysqli)#%d (%d) {
+%A
+}
+
@@ -1712,7 +1712,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
 				return accelerator_orig_compile_file(file_handle, type);
 			}
 			persistent_script = zend_accel_hash_str_find(&ZCSG(hash), key, key_length);
+		} else if (UNEXPECTED(is_stream_path(file_handle->filename) && !is_cacheable_stream_path(file_handle->filename))) {
+			return accelerator_orig_compile_file(file_handle, type);
 		}
+
 		if (!persistent_script) {
 			/* try to find cached script by full real path */
 			zend_accel_hash_entry *bucket;
@@ -0,0 +1,55 @@
+--TEST--
+Bug #74596 (SIGSEGV with opcache.revalidate_path enabled)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.validate_timestamps=0
+opcache.file_cache_only=0
+opcache.revalidate_path=1
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+
+file_put_contents(__DIR__ . "/bug74596_1.php", <<<CODE
+<?php
+class A {
+	public function __construct() {
+		\$a = true;
+		if (\$a) {
+			echo 1 + 2;
+		} else {
+			echo 2 + 3;
+		}
+	}
+}
+?>
+CODE
+);
+
+file_put_contents(__DIR__ . "/bug74596_2.php", "ok\n");
+
+class ufilter extends php_user_filter
+{
+	function filter($in, $out, &$consumed, $closing)
+	{
+		include_once __DIR__ . "/bug74596_1.php";
+		while ($bucket = stream_bucket_make_writeable($in)) {
+			stream_bucket_append($out, $bucket);
+		}
+		return PSFS_PASS_ON;
+	}
+}
+
+stream_filter_register("ufilter", "ufilter");
+
+include "php://filter/read=ufilter/resource=" . __DIR__ . "/bug74596_2.php";
+?>
+--CLEAN--
+<?php
+unlink(__DIR__ . "/bug74596_1.php");
+unlink(__DIR__ . "/bug74596_2.php");
+?>
+--EXPECT--
+ok
@@ -2941,6 +2941,7 @@ PHP_FUNCTION(openssl_pkcs12_read)

 	if (d2i_PKCS12_bio(bio_in, &p12) && PKCS12_parse(p12, pass, &pkey, &cert, &ca)) {
 		BIO * bio_out;
+		int cert_num;

 		zval_dtor(zout);
 		array_init(zout);
@@ -2971,10 +2972,11 @@ PHP_FUNCTION(openssl_pkcs12_read)
 			BIO_free(bio_out);
 		}

-		if (ca && sk_X509_num(ca)) {
+		cert_num = sk_X509_num(ca);
+		if (ca && cert_num) {
 			array_init(&zextracerts);

-			for (i = 0; i < sk_X509_num(ca); i++) {
+			for (i = 0; i < cert_num; i++) {
 				zval zextracert;
 				X509* aCA = sk_X509_pop(ca);
 				if (!aCA) break;
@@ -6214,9 +6216,7 @@ static int php_openssl_validate_iv(char **piv, size_t *piv_len, size_t iv_requir

 	if (mode->is_aead) {
 		if (EVP_CIPHER_CTX_ctrl(cipher_ctx, mode->aead_ivlen_flag, *piv_len, NULL) != 1) {
-			php_error_docref(NULL, E_WARNING,
-					"Setting of IV length for AEAD mode failed, the expected length is %zd bytes",
-					iv_required_len);
+			php_error_docref(NULL, E_WARNING, "Setting of IV length for AEAD mode failed");
 			return FAILURE;
 		}
 		return SUCCESS;
@@ -10,7 +10,7 @@ if (OPENSSL_VERSION_NUMBER < 0x009070af) die("skip");
 $configargs = array(
        "req_extensions" => "v3_req",
        "x509_extensions" => "usr_cert",
-		"config" => __DIR__."/openssl.cnf",
+		"config" => __DIR__. DIRECTORY_SEPARATOR . "openssl.cnf",
 );

 $dn = array(
@@ -19,7 +19,7 @@ $csr_info = array(
 $private = openssl_pkey_new($config);
 while (openssl_error_string()) {}
 $csr_res = openssl_csr_new($csr_info, $private,
-	['config' => __DIR__."/openssl.cnf"]);
+	['config' => __DIR__. DIRECTORY_SEPARATOR . "openssl.cnf"]);
 if (!$csr_res) {
 	while ($e = openssl_error_string()) { $err = $e; }
 	die("Failed; last error: $err");
@@ -7,11 +7,12 @@ if (!extension_loaded("openssl")) die("skip openssl not loaded");
 --FILE--
 <?php
 $passwords = ["abc\x00defghijkl", "abcdefghikjl"];
+$conf = ['config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'];

 foreach($passwords as $password) {
-	$key = openssl_pkey_new();
+	$key = openssl_pkey_new($conf);

-	if (openssl_pkey_export($key, $privatePEM, $password) === false) {
+	if (openssl_pkey_export($key, $privatePEM, $password, $conf) === false) {
 		echo "Failed to encrypt.\n";
 	} else {
 		echo "Encrypted!\n";
@@ -0,0 +1,24 @@
+--TEST--
+Bug #74022 PHP Fast CGI crashes when reading from a pfx file with valid password, multiple extra certs
+--SKIPIF--
+<?php
+if (!extension_loaded("openssl")) die("skip");
+?>
+--FILE--
+<?php
+function test($p12_contents, $password) {
+	openssl_pkcs12_read($p12_contents, $cert_data, $password);
+	openssl_error_string();
+	var_dump(count($cert_data['extracerts']));
+}
+
+$p12_base64 = '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 truncated
+
+$p12 = base64_decode($p12_base64);
+
+test($p12, 'qwerty');
+?>
+===DONE===
+--EXPECTF--
+int(2)
+===DONE===
@@ -1,3 +1,10 @@
+oid_section             = new_oids
+
+[ new_oids ]
+# Example policies to test their
+tsa_policy1 = 1.2.3.4.1
+tsa_policy2 = 1.2.3.4.5.6
+
 [ req ]
 default_bits		= 1024
 default_keyfile 	= privkey.pem
@@ -35,7 +35,7 @@ var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA,
 TEST 0
 bool(true)

-Warning: openssl_decrypt(): Setting of IV length for AEAD mode failed, the expected length is 12 bytes in %s on line %d
+Warning: openssl_decrypt(): Setting of IV length for AEAD mode failed in %s on line %d
 bool(false)
 bool(false)
 bool(false)
@@ -45,7 +45,7 @@ bool(true)
 TEST 5
 bool(true)

-Warning: openssl_decrypt(): Setting of IV length for AEAD mode failed, the expected length is 12 bytes in %s on line %d
+Warning: openssl_decrypt(): Setting of IV length for AEAD mode failed in %s on line %d
 bool(false)
 bool(false)
 bool(false)
@@ -33,7 +33,7 @@ TEST 0
 bool(true)
 bool(true)

-Warning: openssl_encrypt(): Setting of IV length for AEAD mode failed, the expected length is 12 bytes in %s on line %d
+Warning: openssl_encrypt(): Setting of IV length for AEAD mode failed in %s on line %d
 bool(false)
 string(8) "p/lvgA=="
 int(1024)
@@ -50,7 +50,7 @@ TEST 5
 bool(true)
 bool(true)

-Warning: openssl_encrypt(): Setting of IV length for AEAD mode failed, the expected length is 12 bytes in %s on line %d
+Warning: openssl_encrypt(): Setting of IV length for AEAD mode failed in %s on line %d
 bool(false)

 Warning: openssl_encrypt(): Retrieving verification tag failed in %s on line %d
@@ -3,6 +3,7 @@ sni_server
 --SKIPIF--
 <?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
+if (OPENSSL_VERSION_NUMBER >= 0x10100000) die("skip OpenSSL < v1.1.0 required");
 --FILE--
 <?php
 $serverCode = <<<'CODE'
@@ -573,7 +573,18 @@ PHP_METHOD(Phar, webPhar)
 	}

 	/* retrieve requested file within phar */
-	if (!(SG(request_info).request_method && SG(request_info).request_uri && (!strcmp(SG(request_info).request_method, "GET") || !strcmp(SG(request_info).request_method, "POST")))) {
+	if (!(SG(request_info).request_method
+          && SG(request_info).request_uri
+          && (!strcmp(SG(request_info).request_method, "GET")
+           || !strcmp(SG(request_info).request_method, "POST")
+           || !strcmp(SG(request_info).request_method, "DELETE")
+           || !strcmp(SG(request_info).request_method, "HEAD")
+           || !strcmp(SG(request_info).request_method, "OPTIONS")
+           || !strcmp(SG(request_info).request_method, "PATCH")
+           || !strcmp(SG(request_info).request_method, "PUT")
+          )
+         )
+      ) {
 		return;
 	}

@@ -214,7 +214,7 @@ PHP_MINFO_FUNCTION(readline)
   Reads a line */
 PHP_FUNCTION(readline)
 {
-	char *prompt = "";
+	char *prompt = NULL;
 	size_t prompt_len;
 	char *result;

@@ -11,6 +11,7 @@ $functions = [
    function(): bool {},
    function(): array {},
    function(): callable {},
+    function(): iterable {},
    function(): StdClass {}
 ];

@@ -28,4 +29,5 @@ string(6) "string"
 string(4) "bool"
 string(5) "array"
 string(8) "callable"
+string(8) "iterable"
 string(8) "StdClass"
@@ -2440,6 +2440,10 @@ ZEND_BEGIN_ARG_INFO(arginfo_session_class_updateTimestamp, 0)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_session_start, 0, 0, 0)
+	ZEND_ARG_INFO(0, options) /* array */
+ZEND_END_ARG_INFO()
 /* }}} */

 /* {{{ session_functions[]
@@ -2453,7 +2457,7 @@ static const zend_function_entry session_functions[] = {
 	PHP_FE(session_regenerate_id,     arginfo_session_regenerate_id)
 	PHP_FE(session_decode,            arginfo_session_decode)
 	PHP_FE(session_encode,            arginfo_session_void)
-	PHP_FE(session_start,             arginfo_session_void)
+	PHP_FE(session_start,             arginfo_session_start)
 	PHP_FE(session_destroy,           arginfo_session_void)
 	PHP_FE(session_unset,             arginfo_session_void)
 	PHP_FE(session_gc,                arginfo_session_void)
@@ -9,6 +9,7 @@ session.name=sid
 session.save_path=/tmp
 session.gc_probability=1
 session.gc_divisor=1
+session.save_handler=files
 --FILE--
 <?php
 error_reporting(E_ALL);
@@ -3,6 +3,7 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -3,6 +3,7 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -3,6 +3,7 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -3,6 +3,7 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -3,6 +3,7 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -3,6 +3,7 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -4,6 +4,7 @@ Bug #72940 - SID always defined
 error_reporting=-1
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -4,6 +4,9 @@ Bug #73100 (session_destroy null dereference in ps_files_path_create)
 <?php
 if (!extension_loaded('session')) die('skip session extension not available');
 ?>
+--INI--
+session.save_path=
+session.save_handler=files
 --FILE--
 <?php
 ob_start();
@@ -0,0 +1,18 @@
+--TEST--
+Bug #74541 Wrong reflection on session_start()
+--SKIPIF--
+<?php
+include('skipif.inc');
+if (!extension_loaded('reflection')) die("skip");
+?>
+--FILE--
+<?php
+$r = new ReflectionFunction('session_start');
+var_dump($r->getNumberOfParameters());
+var_dump($r->getNumberOfRequiredParameters());
+?>
+===DONE===
+--EXPECT--
+int(1)
+int(0)
+===DONE===
@@ -16,6 +16,7 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
 session.upload_progress.min_freq=0.000000001
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -16,6 +16,7 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
 session.upload_progress.min_freq=0.000000001
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -15,6 +15,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -15,6 +15,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -16,6 +16,7 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
 session.upload_progress.min_freq=0.000000001
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -15,6 +15,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -15,6 +15,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -15,6 +15,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --GET--
@@ -15,6 +15,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -16,6 +16,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -15,6 +15,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
@@ -14,6 +14,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --GET--
@@ -15,6 +15,7 @@ session.upload_progress.cleanup=0
 session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --POST_RAW--
@@ -5,6 +5,7 @@ Test session_abort() function : basic functionality
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --FILE--
 <?php

@@ -3,6 +3,7 @@ Test session_module_name() function : variation
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -3,6 +3,7 @@ Test session_name() function : error functionality
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -3,6 +3,7 @@ Test session_name() function : variation
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -5,6 +5,7 @@ Test session_reset() function : basic functionality
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --FILE--
 <?php

@@ -4,6 +4,7 @@ Test session_save_path() function : error functionality
 session.gc_probability=0
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -4,6 +4,7 @@ Test session_save_path() function : variation
 session.gc_probability=0
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -4,6 +4,7 @@ Test session_set_save_handler() function : basic functionality
 session.save_path=
 session.name=PHPSESSID
 session.gc_probability=0
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -2,8 +2,8 @@
 Test session_set_save_handler() : basic class wrapping existing handler
 --INI--
 session.use_strict_mode=1
-session.save_handler=files
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -3,6 +3,7 @@ Test session_set_save_handler() function : using closures as callbacks
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -3,6 +3,7 @@ Test session_set_save_handler() function : error functionality
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -8,6 +8,7 @@ session.gc_divisor=1
 session.gc_maxlifetime=0
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --FILE--
 <?php

@@ -7,6 +7,7 @@ session.gc_divisor=1
 session.gc_maxlifetime=0
 session.save_path=
 session.name=PHPSESSID
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -6,6 +6,7 @@ session.lazy_write=1
 session.save_path=
 session.name=PHPSESSID
 session.gc_probability=0
+session.save_handler=files
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -495,7 +495,7 @@ static int spl_fixedarray_object_has_dimension(zval *object, zval *offset, int c

 	intern = Z_SPLFIXEDARRAY_P(object);

-	if (intern->fptr_offset_get) {
+	if (intern->fptr_offset_has) {
 		zval rv;
 		SEPARATE_ARG_IF_REF(offset);
 		zend_call_method_with_1_params(object, intern->std.ce, &intern->fptr_offset_has, "offsetExists", &rv, offset);
@@ -0,0 +1,22 @@
+--TEST--
+Overriding SplFixedArray::offsetGet() only
+--FILE--
+<?php
+
+class MyArray extends SplFixedArray {
+    public function offsetGet($key) {
+        return "prefix_" . parent::offsetGet($key);
+    }
+}
+
+$arr = new MyArray(1);
+var_dump(isset($arr[0]));
+$arr[0] = "abc";
+var_dump(isset($arr[0]));
+var_dump($arr[0]);
+
+?>
+--EXPECT--
+bool(false)
+bool(true)
+string(10) "prefix_abc"
@@ -1,4 +1,4 @@
--TEST--n
+--TEST--
 Bug #14580 (key() not binary safe)
 --FILE--
 <?php
@@ -0,0 +1,49 @@
+--TEST--
+Bug #74589 __DIR__ wrong for unicode character, UTF-8
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN' && PHP_OS != 'Linux') {
+    die('skip Linux or Windows only');
+}
+?>
+--INI--
+internal_encoding=utf-8
+--FILE--
+<?php
+/*
+#vim: set fileencoding=utf-8
+#vim: set encoding=utf-8
+*/
+
+$item = "bug74589_新建文件夹"; // utf-8 string
+$dir = dirname(__FILE__) . DIRECTORY_SEPARATOR . $item;
+$test_file = $dir . DIRECTORY_SEPARATOR . "test.php";
+
+mkdir($dir);
+
+file_put_contents($test_file,
+"<?php
+	var_dump(__DIR__);
+	var_dump(__FILE__);
+	var_dump(__DIR__ === dirname(__FILE__));");
+
+$php = getenv('TEST_PHP_EXECUTABLE');
+
+echo shell_exec("$php -n $test_file");
+
+?>
+===DONE===
+--EXPECTF--	
+string(%d) "%sbug74589_新建文件夹"
+string(%d) "%sbug74589_新建文件夹%etest.php"
+bool(true)
+===DONE===
+--CLEAN--
+<?php
+	$item = "bug74589_新建文件夹"; // utf-8 string
+	$dir = dirname(__FILE__) . DIRECTORY_SEPARATOR . $item;
+	$test_file = $dir . DIRECTORY_SEPARATOR . "test.php";
+	unlink($test_file);
+	rmdir($dir);
+?>
+
@@ -0,0 +1,32 @@
+--TEST--
+Bug #74429 Remote socket URI with unique persistence identifier broken
+--FILE--
+<?php
+
+/* This behavior is undocumented, but might be in use. Until there's no officially
+	supported alternative, ensure changes doesn't cause BC breach. Otherwise,
+	the test should be removed once the undocumented behavior changes. */
+
+for ($i=0; $i<100; $i++) {
+  $port = rand(10000, 65000);
+  /* Setup socket server */
+  $server = @stream_socket_server("tcp://127.0.0.1:$port");
+  if ($server) {
+    break;
+  }
+}
+
+$client0 = stream_socket_client("tcp://127.0.0.1:$port/client0");
+$client1 = stream_socket_client("tcp://127.0.0.1:$port/client1");
+
+var_dump($client0, $client1);
+
+fclose($server);
+fclose($client0);
+fclose($client1);
+
+?>
+--EXPECTF--
+resource(%d) of type (stream)
+resource(%d) of type (stream)
+
@@ -1260,7 +1260,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_XML, 0, 0, 1)
 	ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()

-ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_expand, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_expand, 0, 0, 0)
+	ZEND_ARG_INFO(0, basenode)
 ZEND_END_ARG_INFO()
 /* }}} */

@@ -0,0 +1,15 @@
+--TEST--
+XMLReader: Bug #74457 Wrong reflection on XMLReader::expand
+--SKIPIF--
+<?php if (!extension_loaded("xmlreader")) die("skip xmlreader extension not available"); ?>
+--FILE--
+<?php
+$rm = new ReflectionMethod(XMLReader::class, 'expand');
+var_dump($rm->getNumberOfParameters());
+var_dump($rm->getNumberOfRequiredParameters());
+?>
+===DONE===
+--EXPECT--
+int(1)
+int(0)
+===DONE===
@@ -76,7 +76,9 @@ static int is_impersonate = 0;
 # include <netdb.h>
 # include <signal.h>

-# if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
+# if defined(HAVE_POLL_H) && defined(HAVE_POLL)
+#  include <poll.h>
+# elif defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
 #  include <sys/poll.h>
 # endif
 # if defined(HAVE_SYS_SELECT_H)
@@ -1430,7 +1432,7 @@ int fcgi_accept_request(fcgi_request *req)
 				break;
 #else
 				if (req->fd >= 0) {
-#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
+#if defined(HAVE_POLL)
 					struct pollfd fds;
 					int ret;

@@ -51,7 +51,9 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#if HAVE_SYS_POLL_H
+#if HAVE_POLL_H
+#include <poll.h>
+#elif HAVE_SYS_POLL_H
 #include <sys/poll.h>
 #endif

@@ -280,7 +280,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t
 				size_t key_len;

 				/* PATH sections */
-				if (!strncasecmp(Z_STRVAL_P(arg1), "PATH", sizeof("PATH") - 1)) {
+				if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) {
 					key = Z_STRVAL_P(arg1);
 					key = key + sizeof("PATH") - 1;
 					key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1;
@@ -291,7 +291,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t
 					TRANSLATE_SLASHES_LOWER(key);

 				/* HOST sections */
-				} else if (!strncasecmp(Z_STRVAL_P(arg1), "HOST", sizeof("HOST") - 1)) {
+				} else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) {
 					key = Z_STRVAL_P(arg1);
 					key = key + sizeof("HOST") - 1;
 					key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1;
@@ -122,8 +122,12 @@ typedef int php_socket_t;
 /* uncomment this to debug poll(2) emulation on systems that have poll(2) */
 /* #define PHP_USE_POLL_2_EMULATION 1 */

-#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
-# include <poll.h>
+#if defined(HAVE_POLL)
+# if defined(HAVE_POLL_H)
+#  include <poll.h>
+# elif defined(HAVE_SYS_POLL_H)
+#  include <sys/poll.h>
+# endif
 typedef struct pollfd php_pollfd;
 #else
 typedef struct _php_pollfd {
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 1
-#define PHP_RELEASE_VERSION 5
+#define PHP_RELEASE_VERSION 6
 #define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "7.1.5"
-#define PHP_VERSION_ID 70105
+#define PHP_VERSION "7.1.6"
+#define PHP_VERSION_ID 70106
@@ -0,0 +1,38 @@
+--TEST--
+Bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)
+--SKIPIF--
+<?php
+if (!getenv("TEST_PHP_EXECUTABLE")) die("skip TEST_PHP_EXECUTABLE not set");
+if (substr(PHP_OS, 0, 3) == "WIN") die("skip non windows test");
+?>
+--FILE--
+<?php
+$php = getenv("TEST_PHP_EXECUTABLE");
+$ini_file = __DIR__ . "/bug74600.ini";
+file_put_contents($ini_file, <<<INI
+[PHP]\n;\rs=\000\000=\n;\r[PATH\000]\000\376 =\n
+INI
+);
+$desc = array(
+	0 => array("pipe", "r"),
+	1 => array("pipe", "w"),
+	2 => array("pipe", "w"),
+);
+$pipes = array();
+$proc = proc_open("$php -c $ini_file -r 'echo \"okey\";'", $desc, $pipes);
+if (!$proc) {
+	exit(1);
+}
+var_dump(stream_get_contents($pipes[1]));
+var_dump(stream_get_contents($pipes[2]));
+
+proc_terminate($proc);
+proc_close($proc);
+?>
+--CLEAN--
+<?php
+unlink(__DIR__ . "/bug74600.ini");
+?>
+--EXPECTF--
+string(4) "okey"
+string(0) ""
@@ -373,7 +373,7 @@ pm.max_spare_servers = 3
 ; Limits the extensions of the main script FPM will allow to parse. This can
 ; prevent configuration mistakes on the web server side. You should only limit
 ; FPM to .php extensions to prevent malicious users to use other extensions to
-; exectute php code.
+; execute php code.
 ; Note: set an empty value to allow all extensions.
 ; Default Value: .php
 ;security.limit_extensions = .php .php3 .php4 .php5 .php7
@@ -1,16 +1,16 @@
 bz2-1.0.6
 cclient-2007f
-freetype-2.6.2
+freetype-2.7.0
 icu-57.1
 jpeglib-9b
-libcurl-7.51.0
-libiconv-1.14
+libcurl-7.54.0
+libiconv-1.15
 libmcrypt-2.5.8
-libmpir-2.7.2
-libpng-1.6.21
-libpq-9.5.3
+libmpir-3.0.0
+libpng-1.6.29
+libpq-9.6.2
 libssh2-1.8.0
-libtidy-20090406
+libtidy-5.4.0
 libxslt-1.1.29
 libxml-2.9.4
-openssl-1.0.2j
+openssl-1.0.2k
@@ -244,7 +244,9 @@ __forceinline static int php_win32_ioutil_access(const char *path, mode_t mode)
 	PHP_WIN32_IOUTIL_CHECK_PATH_W(pathw, -1, 1)

 	ret = _waccess(pathw, mode);
-	_get_errno(&err);
+	if (0 > ret) {
+		_get_errno(&err);
+	}
 	PHP_WIN32_IOUTIL_CLEANUP_W()

 	if (0 > ret) {
@@ -277,7 +279,9 @@ __forceinline static int php_win32_ioutil_open(const char *path, int flags, ...)
 	}

 	ret = php_win32_ioutil_open_w(pathw, flags, mode);
-	err = GetLastError();
+	if (0 > ret) {
+		err = GetLastError();
+	}
 	PHP_WIN32_IOUTIL_CLEANUP_W()

 	if (0 > ret) {
@@ -366,11 +370,13 @@ __forceinline static FILE *php_win32_ioutil_fopen(const char *patha, const char
 	}

 	ret = _wfopen(pathw, modew);
-	_get_errno(&err);
+	if (!ret) {
+		_get_errno(&err);
+	}
 	free(pathw);
 	free(modew);

-	if (0 > ret) {
+	if (!ret) {
 		_set_errno(err);
 	}
 	return ret;
@@ -403,7 +409,9 @@ __forceinline static int php_win32_ioutil_rename(const char *oldnamea, const cha
 	}

 	ret = php_win32_ioutil_rename_w(oldnamew, newnamew);
-	err = GetLastError();
+	if (0 > ret) {
+		err = GetLastError();
+	}

 	free(oldnamew);
 	free(newnamew);
@@ -427,7 +435,9 @@ __forceinline static int php_win32_ioutil_chdir(const char *patha)
 	}

 	ret = php_win32_ioutil_chdir_w(pathw);
-	err = GetLastError();
+	if (0 > ret) {
+		err = GetLastError();
+	}

 	free(pathw);

@@ -493,7 +503,9 @@ __forceinline static int php_win32_ioutil_chmod(const char *patha, int mode)
 	PHP_WIN32_IOUTIL_CHECK_PATH_W(pathw, -1, 1)

 	ret = _wchmod(pathw, mode);
-	_get_errno(&err);
+	if (0 > ret) {
+		_get_errno(&err);
+	}

 	free(pathw);

@@ -535,7 +535,7 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char
 		efree(tempMailTo);
 	}
 	else if (headers) {
-		if (pos1 = strstr(headers_lc, "bcc:")) {
+		if ((pos1 = strstr(headers_lc, "bcc:")) && (pos1 == headers_lc || *(pos1-1) == '\n')) {
 			/* Real offset is memaddress from the original headers + difference of
 			 * string found in the lowercase headrs + 4 characters to jump over
 			 * the bcc: */
Author	SHA1	Message	Date
Joe Watkins	5b34dc2d52	set versions	2017-06-07 09:05:10 +01:00
Joe Watkins	01990286f6	set versions for 7.1.6RC1	2017-05-23 22:01:56 +01:00
Anatol Belski	056cb8c256	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: time to move next	2017-05-23 12:33:23 +02:00
Anatol Belski	fff1cab367	time to move next	2017-05-23 12:31:03 +02:00
Anatol Belski	65bf0364b6	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: move to the next sdk version for AppVeyor	2017-05-20 13:51:18 +02:00
Anatol Belski	c4ae856912	move to the next sdk version for AppVeyor	2017-05-20 13:48:35 +02:00
Xinchen Hui	11b4f105bf	Merge branch '74595-reflection-parameters' of https://github.com/andrewnester/php-src into PHP-7.1 * '74595-reflection-parameters' of https://github.com/andrewnester/php-src: Fixed #74595 - ReflectionMethod::getParameters returns incorrect number of parameters	2017-05-19 23:59:43 +08:00
Xinchen Hui	08293a960b	Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 * 'PHP-7.1' of git.php.net:/php-src: follow up fix on bug #74022 Fixed bug #74606 (Segfault within try/catch/finally nesting in Generators)	2017-05-19 23:56:31 +08:00
Xinchen Hui	459c382df5	Update news	2017-05-19 23:56:10 +08:00
Anatol Belski	26f217bf40	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: follow up fix on bug #74022	2017-05-18 12:07:09 +02:00
Anatol Belski	464c1639ae	follow up fix on bug #74022	2017-05-18 12:03:13 +02:00
Bob Weinand	649494c0ee	Fixed bug #74606 (Segfault within try/catch/finally nesting in Generators) Thanks to Nikita for pointing out the error source.	2017-05-17 19:58:51 +02:00
Xinchen Hui	78b10dd9d6	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Added cleanup	2017-05-17 23:25:17 +08:00
Xinchen Hui	0954ea8d6d	Added cleanup	2017-05-17 23:24:58 +08:00
Xinchen Hui	f38487a0e0	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Added test for bug #74600	2017-05-17 23:21:38 +08:00
Xinchen Hui	ef09bc0645	Added test for bug #74600	2017-05-17 23:21:18 +08:00
Xinchen Hui	d3e3bc611a	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Added test for bug #74596	2017-05-17 22:43:03 +08:00
Xinchen Hui	e347b2ded6	Added test for bug #74596	2017-05-17 22:42:18 +08:00
Anatol Belski	02e9e59beb	improve error handling	2017-05-17 13:35:42 +02:00
Anatol Belski	6e3d24bcf4	fix wrong error check	2017-05-17 12:50:41 +02:00
Anatol Belski	b73a73da25	fix test	2017-05-16 15:09:02 +02:00
Anatol Belski	71f8c4dcfd	add test for bug #74589	2017-05-16 14:25:27 +02:00
Xinchen Hui	c667bb94fa	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)	2017-05-16 19:32:59 +08:00
Xinchen Hui	8a1713e39c	Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 * 'PHP-7.0' of git.php.net:/php-src: variation of icu libraries causes failure	2017-05-16 19:32:33 +08:00
Xinchen Hui	9f49ebb5ba	Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)	2017-05-16 19:32:13 +08:00
Anatol Belski	7d418430fd	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: variation of icu libraries causes failure	2017-05-16 12:47:24 +02:00
Steve Walk	d74fbfb38f	variation of icu libraries causes failure	2017-05-16 12:46:27 +02:00
Xinchen Hui	7f051ac583	Update NEWs	2017-05-16 13:23:12 +08:00
Xinchen Hui	e04b91e6e2	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled)	2017-05-16 13:22:43 +08:00
Xinchen Hui	89dd7fb328	Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled) Yeah, no test script is provided.. I got some troubles to make a one	2017-05-16 13:22:08 +08:00
Anatol Belski	8ec91086ee	Revert "fixing run-tests.php for variables_order="GPCS"" This reverts commit `c1d5718697`. The commit seems to be inappropriate as it contains parts from master, which have nothing to do with the variables order issue. Obviously patch applied to wrong branch or alike.	2017-05-15 20:34:11 +02:00
Anatol Belski	b067bda4cd	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: switch to Postgres 9.6 for appveyor	2017-05-15 17:48:29 +02:00
Anatol Belski	777929b1ae	switch to Postgres 9.6 for appveyor	2017-05-15 17:47:41 +02:00
Anatol Belski	42e5df141c	[ci skip] update NEWS	2017-05-15 17:39:31 +02:00
Anatol Belski	ae3f975c5d	Fixed bug #74589 __DIR__ wrong for unicode character	2017-05-15 16:35:22 +02:00
andrewnester	2e5a747b59	Fixed #74595 - ReflectionMethod::getParameters returns incorrect number of parameters	2017-05-15 17:07:00 +03:00
Matt Ficken	c1d5718697	fixing run-tests.php for variables_order="GPCS"	2017-05-15 02:21:55 -07:00
Anatol Belski	8cbfc882d2	[ci skip] update NEWS	2017-05-14 01:59:46 +02:00
Anatol Belski	cfe577fb86	revert workaround for bug #74489 as it's fixed in the dependency lib	2017-05-14 01:47:40 +02:00
Sara Golemon	90bd4be3f9	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Remove typo from test header	2017-05-10 16:50:37 -07:00
Sara Golemon	b8e0351978	Remove typo from test header	2017-05-10 16:50:19 -07:00
Xinchen Hui	05c90e5994	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed tests when using cumstom php.ini(session.save_handler) Fix Bug #74541 Wrong reflection on session_start()	2017-05-09 11:14:40 +08:00
Xinchen Hui	1b22e9dc2e	Fixed tests when using cumstom php.ini(session.save_handler)	2017-05-09 11:13:41 +08:00
Xinchen Hui	d40a852919	Merge branch 'fix_74541' of https://github.com/villfa/php-src into PHP-7.0 * 'fix_74541' of https://github.com/villfa/php-src: Fix Bug #74541 Wrong reflection on session_start()	2017-05-09 11:04:39 +08:00
Xinchen Hui	15dbe775d1	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fix typo: exectute => execute	2017-05-09 11:01:52 +08:00
Xinchen Hui	99549ce79c	Merge branch 'patch-1' of https://github.com/ifdattic/php-src into PHP-7.0 * 'patch-1' of https://github.com/ifdattic/php-src: Fix typo: exectute => execute	2017-05-09 11:01:33 +08:00
Fabien Villepinte	b39c70b4a7	Fix Bug #74541 Wrong reflection on session_start()	2017-05-08 22:42:09 +02:00
Anatol Belski	72073228ca	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: sync bin sdk version	2017-05-08 19:39:56 +02:00
Anatol Belski	1a06fae543	sync bin sdk version	2017-05-08 19:38:48 +02:00
Anatol Belski	83033f0b32	[ci skip] update libs_versions.txt	2017-05-08 13:11:12 +02:00
Anatol Belski	bdd66e1492	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: [ci skip] update libs versions file	2017-05-08 13:10:48 +02:00
Anatol Belski	ca870dfee7	[ci skip] update libs versions file	2017-05-08 13:10:13 +02:00
Andrew Marcinkevičius	abad134681	Fix typo: exectute => execute	2017-05-08 13:59:05 +03:00
Xinchen Hui	2d30bc96a1	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed another potential dangling pointer	2017-05-08 11:36:29 +08:00
Xinchen Hui	b966a8b5fa	Fixed another potential dangling pointer	2017-05-08 11:36:07 +08:00
Xinchen Hui	62c1edf535	Update NEWS	2017-05-08 11:32:42 +08:00
Xinchen Hui	2c070847e7	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())	2017-05-08 11:32:27 +08:00
Xinchen Hui	87d56a3d07	Fixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())	2017-05-08 11:32:08 +08:00
Anatol Belski	5dafb523fd	[ci skip] update NEWS	2017-05-07 13:05:47 +02:00
Anatol Belski	6658b437ae	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: [ci skip] update NEWS	2017-05-07 13:05:10 +02:00
Anatol Belski	5c957b502e	[ci skip] update NEWS	2017-05-07 13:04:21 +02:00
Anatol Belski	378f785515	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed bug #74547 mysqli::change_user() doesn't accept null as $database argument w/strict_types	2017-05-06 15:10:16 +02:00
Anatol Belski	561f1afe6e	Fixed bug #74547 mysqli::change_user() doesn't accept null as $database argument w/strict_types	2017-05-06 15:06:34 +02:00
Anatol Belski	4b3a11b329	[ci skip] update NEWS	2017-05-02 14:54:42 +02:00
Anatol Belski	476b7f1667	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: [ci skip] update NEWS	2017-05-02 14:54:17 +02:00
Anatol Belski	622dc2a611	[ci skip] update NEWS	2017-05-02 14:53:32 +02:00
Anatol Belski	64adba3b3f	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method	2017-05-02 14:46:15 +02:00
Christian Weiske	c0c0871911	Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method phar: Support DELETE, HEAD and PUT HTTP methods in Phar::webPhar Up to now only GET and POST requests could be handled with Phar::webPhar(), which is insufficient for today's REST APIs. This patch expands the list of supported HTTP methods.	2017-05-02 14:44:47 +02:00
Anatol Belski	7431d6dda6	[ci skip] update NEWS	2017-05-02 12:39:10 +02:00
Anatol Belski	f97607027a	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: [ci skip] update NEWS	2017-05-02 12:38:40 +02:00
Anatol Belski	36c53036e7	[ci skip] update NEWS	2017-05-02 12:38:04 +02:00
Anatol Belski	3d9563b8b2	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed bug #74510 win32/sendmail.c anchors CC header but not BCC	2017-05-02 12:32:40 +02:00
Anatol Belski	20a608d9da	Fixed bug #74510 win32/sendmail.c anchors CC header but not BCC	2017-05-02 12:31:00 +02:00
Joe Watkins	6bd30e8f1a	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fix bug #74457 Wrong reflection on XMLReader::expand	2017-05-02 06:25:21 +01:00
Fabien Villepinte	4c0e50c88a	Fix bug #74457 Wrong reflection on XMLReader::expand	2017-05-02 06:24:46 +01:00
Joe Watkins	2735318c7b	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fix bug #74468 wrong reflection on Collator::sortWithSortKeys	2017-05-02 06:21:54 +01:00
Fabien Villepinte	f50df1d0e3	Fix bug #74468 wrong reflection on Collator::sortWithSortKeys	2017-05-02 06:20:40 +01:00
Anatol Belski	023cbdb2ca	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Tests to ensure BC with undocumented behavior used in hacks	2017-05-01 18:06:09 +02:00
Anatol Belski	a581e64199	Tests to ensure BC with undocumented behavior used in hacks Should become obsolete, once behaviors change.	2017-05-01 18:01:05 +02:00
Nikita Popov	e3f411c9f7	Merge branch 'PHP-7.0' into PHP-7.1	2017-05-01 12:15:41 +02:00
Nikita Popov	1967950dc3	Fix typo in SplFixedArray has_dimension implementation	2017-05-01 12:15:26 +02:00
Jakub Zelenka	9622a3be43	Merge branch 'PHP-7.0' into PHP-7.1	2017-04-30 20:27:39 +01:00
Michael Heimpold	d9dfac90bf	Fix compiler warnings when compiled against musl libc musl libc is complaining when <sys/poll.h> is used instead of <poll.h> so change this. This issue was reported for OpenWrt/LEDE where musl libc is the standard C library instead of e.g. glibc, see the following link for the original PR: https://github.com/openwrt/packages/pull/4263 Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> Signed-off-by: Michael Heimpold <mhei@heimpold.de> -- v3: refined checks/fallback paths as suggested by @bukka v2: rebased to resolve merge conflict in main/php_network.h v1: initial PR	2017-04-30 20:24:56 +01:00
Jakub Zelenka	6028fe511e	Fix bug #73808 (iv length warning too restrictive for aes-128-ccm)	2017-04-30 19:46:27 +01:00
Andrea Faulds	9891b9ede2	Test ReflectionType support of iterable	2017-04-29 16:12:46 +01:00
Jakub Zelenka	c436fe2426	Merge branch 'PHP-7.0' into PHP-7.1	2017-04-27 15:45:31 +01:00
Jakub Zelenka	a0b9554f94	Fix possible memory leak in openssl_encrypt and openssl_decrypt	2017-04-27 15:44:26 +01:00
Jakub Zelenka	d83d5f4198	Merge branch 'PHP-7.0' into PHP-7.1	2017-04-27 15:11:52 +01:00
Jakub Zelenka	7b392c7154	Prefer using DIRECTORY_SEPARATOR in OpenSSL config path	2017-04-27 15:10:55 +01:00
Jakub Zelenka	e7166ea9be	Add oid_section to the testing openssl.cnf It tests repeated OID addition	2017-04-27 15:09:58 +01:00
Anatol Belski	9a07e9e1f8	[ci skip] update NEWS	2017-04-27 11:43:13 +02:00
Anatol Belski	38a65d5ef9	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: [ci skip] update NEWS	2017-04-27 11:39:14 +02:00
Anatol Belski	e67096dbbb	[ci skip] update NEWS	2017-04-27 11:35:00 +02:00
Anatol Belski	392bcba58d	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Revert "Detect invalid port in xp_socket parse ip address" Revert "Follow up patch regarding bug #74216, see bug #74429"	2017-04-27 11:11:41 +02:00
Anatol Belski	09ef61e3ca	Revert "Detect invalid port in xp_socket parse ip address" This reverts commit `bab0b99f37`.	2017-04-27 02:49:12 +02:00
Anatol Belski	bf3e2dce7b	Revert "Follow up patch regarding bug #74216 , see bug #74429 " This reverts commit `cda7dcf4ca`.	2017-04-27 02:49:01 +02:00
Anatol Belski	66dbeb81ba	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: sync bin sdk version	2017-04-26 17:05:56 +02:00
Anatol Belski	36301bd615	sync bin sdk version	2017-04-26 17:04:29 +02:00
Jakub Zelenka	a1e74a9e0e	Merge branch 'PHP-7.0' into PHP-7.1	2017-04-26 15:00:49 +01:00
Jakub Zelenka	c0203c0ceb	Do not add already added object to the internal OpenSSL table This fixes OpenSSL 1.1 where adding object with OID that has been already added causes an error - preventing of duplication.	2017-04-26 14:59:15 +01:00
Remi Collet	3f6d9fe9cc	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: rely on bundle config, instead of system one	2017-04-26 14:41:54 +02:00
Remi Collet	f639b64dca	rely on bundle config, instead of system one	2017-04-26 14:41:40 +02:00
Remi Collet	7962185ded	Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: skip the test on OpenSSL < 1.1 for now	2017-04-26 14:39:14 +02:00
Anatol Belski	8cfaea656c	skip the test on OpenSSL < 1.1 for now	2017-04-26 14:39:03 +02:00
Joe Watkins	91a0d48675	bump version after release	2017-04-25 16:49:20 +01:00