- Z_ADDREF_P(zvalue);
- if ((header = php_http_message_header(obj->message, name, name_len, 0))) {
+ if ((name_len != lenof("Set-Cookie") && strcmp(name, "Set-Cookie"))
+ && (header = php_http_message_header(obj->message, name, name_len, 1))) {
+ zval *tmp;
+ char *hdr_str;
+ size_t hdr_len = spprintf(&hdr_str, 0, "%s, %s", Z_STRVAL_P(header), Z_STRVAL_P(cpy));
+
+ MAKE_STD_ZVAL(tmp);
+ ZVAL_STRINGL(tmp, hdr_str, hdr_len, 0);
+ zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &tmp, sizeof(void *), NULL);
+ zval_ptr_dtor(&header);
+ zval_ptr_dtor(&cpy);
+ } else if ((header = php_http_message_header(obj->message, name, name_len, 0))) {