Merge branch 'PHP-5.5' into PHP-5.6

laruence · laruence · commit 578903578c71 · 2015-02-27T12:03:00.000+08:00
diff --git a/main/main.c b/main/main.c
@@ -1316,12 +1316,11 @@ PHPAPI char *php_get_current_user(TSRMLS_D)
 			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
`@@ -1316,12 +1316,11 @@ PHPAPI char *php_get_current_user(TSRMLS_D)`
`1316`	`1316`	`efree(pwbuf);`
`1317`	`1317`	`return "";`
`1318`	`1318`	`}`
`1319`		`- pwd = &_pw;`
`1320`		`-`
`1321`	`1319`	`if (retpwptr == NULL) {`
`1322`	`1320`	`efree(pwbuf);`
`1323`	`1321`	`return "";`
`1324`	`1322`	`}`
	`1323`	`+ pwd = &_pw;`
`1325`	`1324`	`#else`
`1326`	`1325`	`if ((pwd=getpwuid(pstat->st_uid))==NULL) {`
`1327`	`1326`	`return "";`