diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:48:08 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:48:08 -0800 |
| commit | 50703c900f3b75af2e2973dfd53c05f69cddec91 (patch) | |
| tree | f30b752f49b9245d9b02f5e7f5d19700570cb06f /main/streams/plain_wrapper.c | |
| parent | 87d8e9208c4af72303c5f5353f98f9e04e038047 (diff) | |
| parent | c5526291cedcb6b5c48d6f13cc7481f8eea9761a (diff) | |
| download | php-git-50703c900f3b75af2e2973dfd53c05f69cddec91.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix group name handling
Conflicts:
main/streams/plain_wrapper.c
Diffstat (limited to 'main/streams/plain_wrapper.c')
| -rw-r--r-- | main/streams/plain_wrapper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 5e328fbdca..7f4a1901e1 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -1341,7 +1341,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) != SUCCESS) { php_error_docref1(NULL, url, E_WARNING, "Unable to find gid for %s", (char *)value); return 0; |