summaryrefslogtreecommitdiff
path: root/main/php_streams.h
diff options
context:
space:
mode:
authorGustavo André dos Santos Lopes <cataphract@php.net>2012-03-08 12:30:59 +0000
committerGustavo André dos Santos Lopes <cataphract@php.net>2012-03-08 12:30:59 +0000
commitf413b3726c4ccc10338466938a49bd59d28f8664 (patch)
tree2f9cd70fea5ead87c004d726539c317edd69cc46 /main/php_streams.h
parentb7c9f8ae8a6c42988a63c778e060e4ce34a3ef91 (diff)
downloadphp-git-f413b3726c4ccc10338466938a49bd59d28f8664.tar.gz
- Fixed bug #61253: Wrappers opened with errors concurrency problem
#NOTE: There is a very small possibility that this will further break #extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the #only one and it may leak memory after this. I say "further break" because #extensions that do that are already broken (will segfault) under ZTS, which is #why this patch is necessary. #There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
Diffstat (limited to 'main/php_streams.h')
-rwxr-xr-xmain/php_streams.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_streams.h b/main/php_streams.h
index dd669a6f48..83b18c008b 100755
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -162,8 +162,8 @@ struct _php_stream_wrapper {
int is_url; /* so that PG(allow_url_fopen) can be respected */
/* support for wrappers to return (multiple) error messages to the stream opener */
- int err_count;
- char **err_stack;
+ int err_count; /* unused */
+ char **err_stack; /* unusued */
};
#define PHP_STREAM_FLAG_NO_SEEK 1