Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  - BFN
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

Author: cjbj

NEWS

@@ -7,6 +7,7 @@ PHP                                                                        NEWS
     (David Soria Parra, Laruence)
   . Fixed bug #65088 (Generated configure script is malformed on OpenBSD).
     (Adam)
+  . Fixed bug #60732 (php_error_docref links to invalid pages). (Jakub Vrana)
 
 - CLI server:
   . Fixed bug #65066 (Cli server not responsive when responding with 422 http

main/main.c

@@ -784,6 +784,9 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
 	/* no docref given but function is known (the default) */
 	if (!docref && is_function) {
 		int doclen;
+		while (*function == '_') {
+			function++;
+		}
 		if (space[0] == '\0') {
 			doclen = spprintf(&docref_buf, 0, "function.%s", function);
 		} else {