Merge branch 'PHP-5.6'

laruence · laruence · commit 8f5676f73e57 · 2015-02-27T12:03:04.000+08:00
diff --git a/main/main.c b/main/main.c
@@ -1301,12 +1301,11 @@ PHPAPI char *php_get_current_user(void)
 			efree(pwbuf);
 			return "";
 		}
-		pwd = &_pw;
-
 		if (retpwptr == NULL) {
 			efree(pwbuf);
 			return "";
 		}
+		pwd = &_pw;
 #else
 		if ((pwd=getpwuid(pstat->st_uid))==NULL) {
 			return "";

Original file line number	Diff line number	Diff line change
`@@ -1301,12 +1301,11 @@ PHPAPI char *php_get_current_user(void)`
`1301`	`1301`	`efree(pwbuf);`
`1302`	`1302`	`return "";`
`1303`	`1303`	`}`
`1304`		`- pwd = &_pw;`
`1305`		`-`
`1306`	`1304`	`if (retpwptr == NULL) {`
`1307`	`1305`	`efree(pwbuf);`
`1308`	`1306`	`return "";`
`1309`	`1307`	`}`
	`1308`	`+ pwd = &_pw;`
`1310`	`1309`	`#else`
`1311`	`1310`	`if ((pwd=getpwuid(pstat->st_uid))==NULL) {`
`1312`	`1311`	`return "";`