diff options
| author | Felipe Pena <felipe@php.net> | 2009-11-15 20:30:57 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-11-15 20:30:57 +0000 |
| commit | 5411bb32a8f2da134ce38ec202aeff29d68da20d (patch) | |
| tree | 946ce64ec9706e7839bcd5cbcc989e7b916d9217 /ext/standard/ftp_fopen_wrapper.c | |
| parent | 64f530d182c4b49850fb0b333b6f083acf558a0e (diff) | |
| download | php-git-5411bb32a8f2da134ce38ec202aeff29d68da20d.tar.gz | |
- Fixed bug #49936 (crash with ftp stream in php_stream_context_get_option())
(patch by Pierrick)
Diffstat (limited to 'ext/standard/ftp_fopen_wrapper.c')
| -rw-r--r-- | ext/standard/ftp_fopen_wrapper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index 12ae11f3af..42e1cd272f 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -143,7 +143,7 @@ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, char *path goto connect_errexit; } - php_stream_context_set(stream, context); + php_stream_context_set(stream, context TSRMLS_CC); php_stream_notify_info(context, PHP_STREAM_NOTIFY_CONNECT, NULL, 0); /* Start talking to ftp server */ @@ -550,7 +550,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch goto errexit; } - php_stream_context_set(datastream, context); + php_stream_context_set(datastream, context TSRMLS_CC); php_stream_notify_progress_init(context, 0, file_size); if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream, @@ -715,7 +715,7 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, char *path, cha goto opendir_errexit; } - php_stream_context_set(datastream, context); + php_stream_context_set(datastream, context TSRMLS_CC); if (use_ssl_on_data && (php_stream_xport_crypto_setup(stream, STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 || |