More work on Unicode support in PCRE. When UG(unicode) is on, all

strings passed to PCRE have to be IS_UNICODE or IS_STRING in UTF-8
encoding. Failure to do so will result in unpredictable results.

1 files changed, 3 insertions, 3 deletions

diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h
index 466c29d0b1..dadccb4983 100644
--- a/ext/pcre/php_pcre.h
+++ b/ext/pcre/php_pcre.h
@@ -58,13 +58,13 @@ typedef struct {
 #endif
 	int compile_options;
 	int refcount;
-	zend_bool from_unicode;
+	zend_bool unicode_mode;
 } pcre_cache_entry;
 
-PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int regex_len, zend_bool regex_is_utf8 TSRMLS_DC);
+PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int regex_len TSRMLS_DC);
 
 PHPAPI void  php_pcre_match_impl(  pcre_cache_entry *pce, char *subject, int subject_len, zval *return_value,
-	zval *subpats, int global, int use_flags, long flags, long start_offset, zend_bool is_utf8  TSRMLS_DC);
+	zval *subpats, int global, int use_flags, long flags, long start_offset TSRMLS_DC);
 
 PHPAPI char *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, int subject_len, zval *return_value, 
 	int is_callable_replace, int *result_len, int limit, int *replace_count TSRMLS_DC);