cvs: ZendEngine2 / zend_API.c
| From: | Andi Gutmans | Date: | Mon, 01 Dec 2003 11:50:58 +0000 |
| Subject: | cvs: ZendEngine2 / zend_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2037@lists.php.net to get a copy of this message | ||
andi Mon Dec 1 06:50:58 2003 EDT
Modified files:
/ZendEngine2 zend_API.c
Log:
- Revert auto-conversion in parameter API
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.227 ZendEngine2/zend_API.c:1.228
--- ZendEngine2/zend_API.c:1.227 Fri Nov 28 09:42:25 2003
+++ ZendEngine2/zend_API.c Mon Dec 1 06:50:57 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.227 2003/11/28 14:42:25 iliaa Exp $ */
+/* $Id: zend_API.c,v 1.228 2003/12/01 11:50:57 andi Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -315,17 +315,10 @@
*p = Z_STRVAL_PP(arg);
*pl = Z_STRLEN_PP(arg);
break;
-
- case IS_OBJECT: {
- if (Z_OBJ_HANDLER_PP(arg, cast_object) && Z_OBJ_HANDLER_PP(arg, cast_object)(*arg,
*arg, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
- *pl = Z_STRLEN_PP(arg);
- *p = Z_STRVAL_PP(arg);
- break;
- }
- }
case IS_ARRAY:
case IS_RESOURCE:
+ case IS_OBJECT:
default:
return "string";
}