X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=f6cd59ffe624278ddc42ceae916ef54584286396;hp=dd3a4daf43a99420bbc80383a65dc940362912a6;hb=dec77e7f26b565cbd399c6a73357e3abbcf1e423;hpb=e103c61ca14d22e9507379810e980075c8323ca3

diff --git a/php_http_api.h b/php_http_api.h
index dd3a4da..f6cd59f 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -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$ */
@@ -147,9 +144,10 @@ static inline zval *_convert_to_type(int type, zval *z)
 	}
 	return z;
 }
-#define convert_to_type_ex(t, z) _convert_to_type_ex((t), (z))
-static inline zval *_convert_to_type_ex(int type, zval *z)
+#define convert_to_type_ex(t, z, p) _convert_to_type_ex((t), (z), (p))
+static inline zval *_convert_to_type_ex(int type, zval *z, zval **p)
 {
+	*p = z;
 	if (Z_TYPE_P(z) != type) {
 		switch (type)
 		{
@@ -162,6 +160,11 @@ static inline zval *_convert_to_type_ex(int type, zval *z)
 			case IS_OBJECT:	convert_to_object_ex(&z);	break;
 		}
 	}
+	if (*p == z) {
+		*p = NULL;
+	} else {
+		*p = z;
+	}
 	return z;
 }