- ssl options were only setable rather than modifiable through setOptions
authorMichael Wallner <mike@php.net>
Wed, 27 Jul 2005 19:59:38 +0000 (19:59 +0000)
committerMichael Wallner <mike@php.net>
Wed, 27 Jul 2005 19:59:38 +0000 (19:59 +0000)
http_request_object.c

index 761e9ca4fda6bc9c280118dfaf2e508ef848d0b0..158a334bd378d5b0bf1f132bc85b507d08cc125d 100644 (file)
@@ -658,7 +658,13 @@ PHP_METHOD(HttpRequest, setOptions)
                                        array_merge(*opt, *cookies);
                                        continue;
                                }
-                       } else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) {
+                       } else if (!strcmp(key, "ssl")) {
+                               zval **ssl;
+                               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl)) {
+                                       array_merge(*opt, *ssl);
+                                       continue;
+                               }
+                       }else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) {
                                if (Z_TYPE_PP(opt) != IS_STRING) {
                                        convert_to_string_ex(opt);
                                }