Merge branch 'PHP-7.0' into PHP-7.1

hikari-no-yume · hikari-no-yume · commit 158b06cffb01 · 2017-08-19T20:35:22.000+01:00
diff --git a/NEWS b/NEWS
@@ -8,6 +8,8 @@ PHP                                                                        NEWS
 - CURL:
   . Fixed bug #75093 (OpenSSL support not detected). (Remi)
 
+- Standard:
+  . Fixed bug #75097 (gethostname fails if your host name is 64 chars long). (Andrea)
 
 31 Aug 2017, PHP 7.1.9
 
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
@@ -131,13 +131,13 @@ static zend_string *php_gethostbyname(char *name);
    Get the host name of the current machine */
 PHP_FUNCTION(gethostname)
 {
-	char buf[HOST_NAME_MAX];
+	char buf[HOST_NAME_MAX + 1];
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
-	if (gethostname(buf, sizeof(buf) - 1)) {
+	if (gethostname(buf, sizeof(buf))) {
 		php_error_docref(NULL, E_WARNING, "unable to fetch host [%d]: %s", errno, strerror(errno));
 		RETURN_FALSE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -131,13 +131,13 @@ static zend_string php_gethostbyname(char name);`
`131`	`131`	`Get the host name of the current machine */`
`132`	`132`	`PHP_FUNCTION(gethostname)`
`133`	`133`	`{`
`134`		`- char buf[HOST_NAME_MAX];`
	`134`	`+ char buf[HOST_NAME_MAX + 1];`
`135`	`135`
`136`	`136`	`if (zend_parse_parameters_none() == FAILURE) {`
`137`	`137`	`return;`
`138`	`138`	`}`
`139`	`139`
`140`		`- if (gethostname(buf, sizeof(buf) - 1)) {`
	`140`	`+ if (gethostname(buf, sizeof(buf))) {`
`141`	`141`	`php_error_docref(NULL, E_WARNING, "unable to fetch host [%d]: %s", errno, strerror(errno));`
`142`	`142`	`RETURN_FALSE;`
`143`	`143`	`}`