- relicense with a BSD style license

[m6w6/ext-http] / http_message_object.c

diff --git a/http_message_object.c b/http_message_object.c
index 561b3508aa54003e5ad8441e8d87c2a082cb6212..336d2504a8b14ad7c4d01cbca8cd72c06e5122f3 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -374,13 +371,15 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                break;
 
                case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
-                       if (msg->parent) {
-                               zval tmp;
-                               tmp.value.obj = obj->parent;
-                               zend_objects_store_del_ref(&tmp TSRMLS_CC);
+                       if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), http_message_object_ce TSRMLS_CC)) {
+                               if (msg->parent) {
+                                       zval tmp;
+                                       tmp.value.obj = obj->parent;
+                                       Z_OBJ_DELREF(tmp);
+                               }
+                               Z_OBJ_ADDREF_P(value);
+                               obj->parent = value->value.obj;
                        }
-                       zend_objects_store_add_ref(value TSRMLS_CC);
-                       obj->parent = value->value.obj;
                break;
 
                case HTTP_MSG_PROPHASH_REQUEST_METHOD: