Merge branch 'PHP-5.5' into PHP-5.6

This commit is contained in:
Xinchen Hui 2015-02-27 12:03:00 +08:00
commit 578903578c

View File

@ -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 "";