*** empty log message ***

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 83c8afec7958387fc68d8f3c0f90610a17a4e01a..4b103bb4633e61944aabfb87f8320bb0bb80d602 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2949,6 +2949,8 @@ ZEND_API zend_uchar zend_get_unified_string_type(int num_args TSRMLS_DC, ...)
                        if (best_type == IS_STRING) {
                                best_type = IS_UNICODE;
                        }
+               } else if (type == IS_STRING) {
+                       best_type = IS_STRING;
                }
        }
        va_end(ap);

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index c09020e68eac72b3a8ef0735720267987de2008d..44937c7152cf91f753a726a4b30543c883ffc52c 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -671,7 +671,7 @@ END_EXTERN_C()
 #define ZVAL_TEXT(z, t, duplicate)                                     \
                do {                                                                            \
                        if (UG(unicode)) {                                              \
-                               ZVAL_UNICODE(z, t, duplicate);          \
+                               ZVAL_UNICODE(z, (UChar*)t, duplicate);          \
                        } else {                                                                \
                                ZVAL_STRING(z, t, duplicate);           \
                        }                                                                               \

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index f6bcf1f875d6645baa1db3f8ebee855506a3fdb2..9a0604228f184ccb10766c8b7f196ef71caee933 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -265,7 +265,7 @@ ZEND_API int zend_check_property_access(zend_object *zobj, zend_uchar utype, voi
                if (!(property_info->flags & ZEND_ACC_PRIVATE)) {
                        /* we we're looking for a private prop but found a non private one of the same name */
                        return FAILURE;
-               } else if (!UG(unicode) && strcmp(prop_info_name+1, property_info->name+1)) {
+               } else if (!UG(unicode) && strcmp((char*)prop_info_name+1, property_info->name+1)) {
                        /* we we're looking for a private prop but found a private one of the same name but another class */
                        return FAILURE;
                } else if (UG(unicode) && u_strcmp(((UChar*)prop_info_name)+1, ((UChar*)property_info->name)+1)) {