Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix group name handling
This commit is contained in:
Stanislav Malyshev 2015-01-31 23:47:25 -08:00
commit c5526291ce

View File

@ -1331,7 +1331,7 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url
break;
case PHP_STREAM_META_GROUP:
case PHP_STREAM_META_GROUP_NAME:
if(option == PHP_STREAM_META_OWNER_NAME) {
if(option == PHP_STREAM_META_GROUP_NAME) {
if(php_get_gid_by_name((char *)value, &gid TSRMLS_CC) != SUCCESS) {
php_error_docref1(NULL TSRMLS_CC, url, E_WARNING, "Unable to find gid for %s", (char *)value);
return 0;