diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:47:25 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:47:25 -0800 |
| commit | c5526291cedcb6b5c48d6f13cc7481f8eea9761a (patch) | |
| tree | f39a385ea07e1e448f59bdaf66e6dcdcdc61c1d1 | |
| parent | 55d5811f85d8ef5934a430ef6d3604c942a4b2d3 (diff) | |
| parent | e5e251b02309d046680e9190cfc688fab4e5670e (diff) | |
| download | php-git-c5526291cedcb6b5c48d6f13cc7481f8eea9761a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix group name handling
| -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 cce0ac10e5..8ef061924c 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -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; |