diff --git a/ext/mbstring/php_onig_compat.h b/ext/mbstring/php_onig_compat.h
index c97ba0c5cb67..5a1fa8eeaaf1 100644
--- a/ext/mbstring/php_onig_compat.h
+++ b/ext/mbstring/php_onig_compat.h
@@ -5,4 +5,10 @@
 #define regex_t                     php_mb_regex_t
 #define re_registers                php_mb_re_registers
 
+/* Required for some distros that conditionally override PV_.
+ * As we're in C99 this header is always available. */
+#ifndef HAVE_STDARG_H
+# define HAVE_STDARG_H
+#endif
+
 #endif /* _PHP_ONIG_COMPAT_H */
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 23e74606e996..471b2d622d98 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2835,12 +2835,12 @@ PHP_METHOD(SoapClient, __setCookie)
 	zval *cookies = Z_CLIENT_COOKIES_P(ZEND_THIS);
 	SEPARATE_ARRAY(cookies);
 	if (val == NULL) {
-		zend_hash_del(Z_ARRVAL_P(cookies), name);
+		zend_symtable_del(Z_ARRVAL_P(cookies), name);
 	} else {
 		zval zcookie;
 		array_init(&zcookie);
 		add_index_str(&zcookie, 0, zend_string_copy(val));
-		zend_hash_update(Z_ARRVAL_P(cookies), name, &zcookie);
+		zend_symtable_update(Z_ARRVAL_P(cookies), name, &zcookie);
 	}
 }
 /* }}} */
diff --git a/ext/soap/tests/soap_set_cookie.phpt b/ext/soap/tests/soap_set_cookie.phpt
new file mode 100644
index 000000000000..a23aa18bb4b7
--- /dev/null
+++ b/ext/soap/tests/soap_set_cookie.phpt
@@ -0,0 +1,22 @@
+--TEST--
+SoapClient::__setCookie with numeric keys
+--EXTENSIONS--
+soap
+--FILE--
+<?php
+$client = new SoapClient(null, array('uri' => 'mo:http://www.w3.org/', 'location' => 'http://example.com'));
+$client->__setCookie("123", "456");
+var_dump($client->__getCookies());
+$client->__setCookie("123", NULL);
+var_dump($client->__getCookies());
+?>
+--EXPECT--
+array(1) {
+  [123]=>
+  array(1) {
+    [0]=>
+    string(3) "456"
+  }
+}
+array(0) {
+}