tony2001                                 Sat, 04 Dec 2010 21:54:20 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=305968

Log:
make sure the stream context is present before looking for any options
and fix segfault

Changed paths:
    U   php/php-src/trunk/ext/openssl/xp_ssl.c

Modified: php/php-src/trunk/ext/openssl/xp_ssl.c
===================================================================
--- php/php-src/trunk/ext/openssl/xp_ssl.c      2010-12-04 21:34:46 UTC (rev 
305967)
+++ php/php-src/trunk/ext/openssl/xp_ssl.c      2010-12-04 21:54:20 UTC (rev 
305968)
@@ -373,7 +373,7 @@
        {
                zval **val;

-               if (SUCCESS == php_stream_context_get_option(
+               if (stream->context && SUCCESS == php_stream_context_get_option(
                                        stream->context, "ssl", "no_ticket", 
&val) &&
                                zval_is_true(*val)) {
                        SSL_CTX_set_options(sslsock->ctx, SSL_OP_NO_TICKET);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to