From: Antony Dovgal <tony2001@php.net>
Date: Tue, 18 Apr 2006 17:10:30 +0000 (+0000)
Subject: binary strings exist only in unicode mode
X-Git-Tag: RELEASE_1_3~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a264a5aca34aa818789672fcc8bf34b45eb0142a;p=php

binary strings exist only in unicode mode
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 8b2889d6b4..0ac85dbae9 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -208,7 +208,11 @@ ZEND_API char *zend_zval_type_name(zval *arg)
 			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 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
 								*p = Z_STRVAL_PP(arg);
 								break;
 							} else {
-								return "binary string";
+								if (UG(unicode)) {
+									return "binary string";
+								} else {
+									return "string";
+								}
 							}
 						}
 					}
@@ -418,7 +426,11 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
 					case IS_ARRAY:
 					case IS_RESOURCE:
 					default:
-						return "binary string";
+						if (UG(unicode)) {
+							return "binary string";
+						} else {
+							return "string";
+						}
 				}
 			}
 			break;