pollita Mon Oct 2 01:11:05 2006 UTC
Modified files:
/php-src/ext/standard php_string.h string.c
Log:
ZTS fix
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_string.h?r1=1.101&r2=1.102&diff_format=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.101
php-src/ext/standard/php_string.h:1.102
--- php-src/ext/standard/php_string.h:1.101 Wed Aug 30 18:40:26 2006
+++ php-src/ext/standard/php_string.h Mon Oct 2 01:11:04 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_string.h,v 1.101 2006/08/30 18:40:26 iliaa Exp $ */
+/* $Id: php_string.h,v 1.102 2006/10/02 01:11:04 pollita Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -133,7 +133,7 @@
PHPAPI void php_basename(char *s, int len, char *suffix, int sufflen, char
**p_ret, int *p_len TSRMLS_DC);
PHPAPI int php_u_dirname(UChar *str, int len);
PHPAPI int php_dirname(char *str, int len);
-PHPAPI UChar *php_u_stristr(UChar *s, UChar *t, int s_len, int t_len);
+PHPAPI UChar *php_u_stristr(UChar *s, UChar *t, int s_len, int t_len
TSRMLS_DC);
PHPAPI char *php_stristr(char *s, char *t, size_t s_len, size_t t_len);
PHPAPI int php_u_strspn(UChar *s1, UChar *s2, UChar *s1_end, UChar *s2_end);
PHPAPI size_t php_strspn(char *s1, char *s2, char *s1_end, char *s2_end);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.594&r2=1.595&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.594 php-src/ext/standard/string.c:1.595
--- php-src/ext/standard/string.c:1.594 Fri Sep 29 21:00:07 2006
+++ php-src/ext/standard/string.c Mon Oct 2 01:11:04 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.594 2006/09/29 21:00:07 andrei Exp $ */
+/* $Id: string.c,v 1.595 2006/10/02 01:11:04 pollita Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2156,7 +2156,7 @@
/* {{{ php_u_stristr
Unicode version of case insensitve strstr */
-PHPAPI UChar *php_u_stristr(UChar *str, UChar *pat, int str_len, int pat_len)
+PHPAPI UChar *php_u_stristr(UChar *str, UChar *pat, int str_len, int pat_len
TSRMLS_DC)
{
UChar *str_fold, *pat_fold;
int str_fold_len, pat_fold_len;
@@ -2192,7 +2192,7 @@
}
#if 0
-PHPAPI UChar *php_u_stristr(UChar *s, UChar *t, int s_len, int t_len)
+PHPAPI UChar *php_u_stristr(UChar *s, UChar *t, int s_len, int t_len TSRMLS_DC)
{
int32_t i,j, last;
UChar32 ch1, ch2;
@@ -2394,7 +2394,7 @@
if (Z_TYPE_PP(haystack) == IS_UNICODE) {
found = php_u_stristr(Z_USTRVAL_PP(haystack), target.u,
-
Z_USTRLEN_PP(haystack), needle_len);
+
Z_USTRLEN_PP(haystack), needle_len TSRMLS_CC);
} else {
haystack_copy = estrndup(Z_STRVAL_PP(haystack),
Z_STRLEN_PP(haystack));
found = php_stristr(Z_STRVAL_PP(haystack), target.s,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
