From: Michael Wallner <mike@php.net>
Date: Wed, 27 Jul 2005 16:38:07 +0000 (+0000)
Subject: - fix option setting
X-Git-Tag: RELEASE_0_11_0~15
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=2190567a9216095798e0268f9d61eb5ec920790e;p=m6w6%2Fext-http

- fix option setting
---

diff --git a/http_request_object.c b/http_request_object.c
index bca9bcb..761e9ca 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -650,30 +650,33 @@ PHP_METHOD(HttpRequest, setOptions)
 				zval **headers;
 				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "headers", sizeof("headers"), (void **) &headers)) {
 					array_merge(*opt, *headers);
+					continue;
 				}
 			} else if (!strcmp(key, "cookies")) {
 				zval **cookies;
 				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
 					array_merge(*opt, *cookies);
+					continue;
 				}
 			} else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) {
 				if (Z_TYPE_PP(opt) != IS_STRING) {
 					convert_to_string_ex(opt);
 				}
 				UPD_PROP(obj, string, url, Z_STRVAL_PP(opt));
+				continue;
 			} else if (!strcmp(key, "method")) {
 				if (Z_TYPE_PP(opt) != IS_LONG) {
 					convert_to_long_ex(opt);
 				}
 				UPD_PROP(obj, long, method, Z_LVAL_PP(opt));
-			} else {
-				if (!strcmp(key, "ondebug")) {
-					SET_PROP(obj, dbg_user_cb, *opt);
-				}
-				zval_add_ref(opt);
-				add_assoc_zval(old_opts, key, *opt);
+				continue;
+			} else if (!strcmp(key, "ondebug")) {
+				SET_PROP(obj, dbg_user_cb, *opt);
 			}
 
+			zval_add_ref(opt);
+			add_assoc_zval(old_opts, key, *opt);
+
 			/* reset */
 			key = NULL;
 		}