- add flag parameter to http_build_url(); slightly breaks parameter order

[m6w6/ext-http] / http_message_object.c

diff --git a/http_message_object.c b/http_message_object.c
index 00fb3cededac04f81a91de025fd5d834018fc66e..ae4254a2621810a73074912f3c62d0abde9ff237 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -337,7 +337,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
                case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
                case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE:
                        if (msg->parent) {
-                               RETVAL_OBJVAL(obj->parent);
+                               RETVAL_OBJVAL(obj->parent, 1);
                        } else {
                                RETVAL_NULL();
                        }
@@ -632,7 +632,7 @@ PHP_METHOD(HttpMessage, fromString)
                                }
                        }
                        if (ce) {
-                               ZVAL_OBJVAL(return_value, http_message_object_new_ex(ce, msg, NULL));
+                               RETVAL_OBJVAL(http_message_object_new_ex(ce, msg, NULL), 0);
                        }
                }
        }
@@ -997,7 +997,7 @@ PHP_METHOD(HttpMessage, getParentMessage)
                getObject(http_message_object, obj);
 
                if (obj->message->parent) {
-                       RETVAL_OBJVAL(obj->parent);
+                       RETVAL_OBJVAL(obj->parent, 1);
                } else {
                        RETVAL_NULL();
                }
@@ -1085,7 +1085,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
                                
                                memset(&hurl, 0, sizeof(php_url));
                                hurl.host = host ? Z_STRVAL_P(host) : NULL;
-                               http_build_url(purl, &hurl, NULL, &url, NULL);
+                               http_build_url(HTTP_URL_REPLACE, purl, &hurl, NULL, &url, NULL);
                                php_url_free(purl);
                                add_assoc_string(array, "url", url, 0);
                                
@@ -1260,7 +1260,7 @@ PHP_METHOD(HttpMessage, detach)
        zend_hash_copy(&msg->hdrs, &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
        phpstr_append(&msg->body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message));
        
-       ZVAL_OBJVAL(return_value, http_message_object_new_ex(Z_OBJCE_P(getThis()), msg, NULL));
+       RETVAL_OBJVAL(http_message_object_new_ex(Z_OBJCE_P(getThis()), msg, NULL), 0);
 }
 /* }}} */
 
@@ -1361,8 +1361,7 @@ PHP_METHOD(HttpMessage, next)
                if (itr && itr->parent.handle) {
                        zval *old = obj->iterator;
                        MAKE_STD_ZVAL(obj->iterator);
-                       ZVAL_OBJVAL(obj->iterator, itr->parent);
-                       Z_OBJ_ADDREF_P(obj->iterator);
+                       ZVAL_OBJVAL(obj->iterator, itr->parent, 1);
                        zval_ptr_dtor(&old);
                } else {
                        zval_ptr_dtor(&obj->iterator);