cvs: ZendEngine2 / zend_API.c
| From: | Antony Dovgal | Date: | Tue, 18 Apr 2006 17:10:30 +0000 |
| Subject: | cvs: ZendEngine2 / zend_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4818@lists.php.net to get a copy of this message | ||
tony2001 Tue Apr 18 17:10:30 2006 UTC
Modified files:
/ZendEngine2 zend_API.c
Log:
binary strings exist only in unicode mode
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_API.c?r1=1.357&r2=1.358&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.357 ZendEngine2/zend_API.c:1.358
--- ZendEngine2/zend_API.c:1.357 Mon Mar 27 02:52:06 2006
+++ ZendEngine2/zend_API.c Tue Apr 18 17:10:30 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.357 2006/03/27 02:52:06 andrei Exp $ */
+/* $Id: zend_API.c,v 1.358 2006/04/18 17:10:30 tony2001 Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -208,7 +208,11 @@
return "double";
case IS_STRING:
- return "binary string";
+ if (UG(unicode)) {
+ return "binary string";
+ } else {
+ return "string";
+ }
case IS_ARRAY:
return "array";
@@ -410,7 +414,11 @@
*p = Z_STRVAL_PP(arg);
break;
} else {
- return "binary string";
+ if (UG(unicode)) {
+ return "binary string";
+ } else {
+ return "string";
+ }
}
}
}
@@ -418,7 +426,11 @@
case IS_ARRAY:
case IS_RESOURCE:
default:
- return "binary string";
+ if (UG(unicode)) {
+ return "binary string";
+ } else {
+ return "string";
+ }
}
}
break;