Merge branch 'PHP-7.2' into PHP-7.3

cmb69 · cmb69 · commit f0ccd9ffc6d9 · 2019-04-17T17:24:15.000+02:00
* PHP-7.2:
  Fix #77911: Wrong warning for session.sid_bits_per_character
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 7.3.6
 
+- Session:
+  . Fixed bug #77911 (Wrong warning for session.sid_bits_per_character). (cmb)
+
 02 May 2019, PHP 7.3.5
 
 - Core:
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -750,7 +750,7 @@ static PHP_INI_MH(OnUpdateSidBits) /* {{{ */
 		return SUCCESS;
 	}
 
-	php_error_docref(NULL, E_WARNING, "session.configuration 'session.sid_bits' must be between 4 and 6.");
+	php_error_docref(NULL, E_WARNING, "session.configuration 'session.sid_bits_per_character' must be between 4 and 6.");
 	return FAILURE;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ static PHP_INI_MH(OnUpdateSidBits) /* {{{ */`
`750`	`750`	`return SUCCESS;`
`751`	`751`	`}`
`752`	`752`
`753`		`- php_error_docref(NULL, E_WARNING, "session.configuration 'session.sid_bits' must be between 4 and 6.");`
	`753`	`+ php_error_docref(NULL, E_WARNING, "session.configuration 'session.sid_bits_per_character' must be between 4 and 6.");`
`754`	`754`	`return FAILURE;`
`755`	`755`	`}`
`756`	`756`	`/* }}} */`