fixed ZTS build and added language check.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 9d9a5cf3b4f5634289b40d73bd68e52b585a7f81..665e72b308593443533ec299402eccb9de1e70c3 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1145,7 +1145,7 @@ SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler)
 #define IS_SJIS1(c) ((((c)>=0x81 && (c)<=0x9f) || ((c)>=0xe0 && (c)<=0xf5)) ? 1 : 0)
 #define IS_SJIS2(c) ((((c)>=0x40 && (c)<=0x7e) || ((c)>=0x80 && (c)<=0xfc)) ? 1 : 0)
 
-char *mbstr_strrchr(const char *s, char c){
+char *mbstr_strrchr(const char *s, char c TSRMLS_DC){
        unsigned char *p = (unsigned char *)s, *last = NULL;
        while(*p++) {
                if (*p == c) {
@@ -1154,7 +1154,8 @@ char *mbstr_strrchr(const char *s, char c){
                if (*p == '\0'){
                        break;
                }
-               if (IS_SJIS1(*p) && IS_SJIS2(*(p+1))) {
+               if (MBSTRG(current_language) == mbfl_no_language_japanese 
+                       && IS_SJIS1(*p) && IS_SJIS2(*(p+1))) {
                        p++;
                }
        }

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 708f6def8820508c21afb885f8a72fb771656945..6925980275b49e78090b3aec51ee72383959fd6a 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -117,7 +117,7 @@ PHP_FUNCTION(mb_ereg_search_setpos);
 int php_mbregex_name2mbctype(const char *pname);
 #endif
 
-char *mbstr_strrchr(const char *s, char c);
+char *mbstr_strrchr(const char *s, char c TSRMLS_DC);
 
 ZEND_BEGIN_MODULE_GLOBALS(mbstring)
        int language;