com php-src: fix merge error after b4b4d9697fa43a526466165a3ca89d058296cb04: ext/openssl/xp_ssl .c

Commit: c91ad8233b46e1605b225c782efc3131f158d9be Author: Anatol Belski <ab@php.net> Wed, 29 Jan 2014 22:50:56 +0100 Parents: 79e0c273b8690bca12fc8b82cab3d7a47abb9779 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c91ad8233b46e1605b225c782efc3131f158d9be Log: fix merge error after b4b4d9697fa43a526466165a3ca89d058296cb04 Changed paths: M ext/openssl/xp_ssl.c Diff: diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 61ba027..cc8ea8a 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -923,18 +923,6 @@ static int get_crypto_method(php_stream_context *ctx) { static char * get_url_name(const char *resourcename, size_t resourcenamelen, int is_persistent TSRMLS_DC) { php_url *url; - if (ctx) { - zval **val = NULL; - - if (php_stream_context_get_option(ctx, "ssl", "SNI_enabled", &val) == SUCCESS && !zend_is_true(*val TSRMLS_CC)) { - return NULL; - } - if (php_stream_context_get_option(ctx, "ssl", "SNI_server_name", &val) == SUCCESS) { - convert_to_string_ex(val); - return pestrdup(Z_STRVAL_PP(val), is_persistent); - } - } - if (!resourcename) { return NULL; }