moriyoshi                                Sun, 06 Mar 2011 07:06:55 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=308951

Log:
Fix ZTS build.

Changed paths:
    U   php/php-src/trunk/ext/mbstring/mbstring.c
    U   php/php-src/trunk/main/rfc1867.c

Modified: php/php-src/trunk/ext/mbstring/mbstring.c
===================================================================
--- php/php-src/trunk/ext/mbstring/mbstring.c   2011-03-06 07:00:30 UTC (rev 
308950)
+++ php/php-src/trunk/ext/mbstring/mbstring.c   2011-03-06 07:06:55 UTC (rev 
308951)
@@ -1132,14 +1132,14 @@
                char quote = *str;

                str++;
-               return php_mb_rfc1867_substring_conf(encoding, str, 
strlen(str), quote);
+               return php_mb_rfc1867_substring_conf(encoding, str, 
strlen(str), quote TSRMLS_CC);
        } else {
                char *strend = str;

                while (*strend && !isspace(*(unsigned char *)strend)) {
                        ++strend;
                }
-               return php_mb_rfc1867_substring_conf(encoding, str, strend - 
str, 0);
+               return php_mb_rfc1867_substring_conf(encoding, str, strend - 
str, 0 TSRMLS_CC);
        }
 }
 /* }}} */
@@ -1154,8 +1154,8 @@
         * the full path of the file on the user's filesystem, which means that 
unless
         * the user does basename() they get a bogus file name. Until IE's user 
base drops
         * to nill or problem is fixed this code must remain enabled for all 
systems. */
-       s = php_mb_safe_strrchr_ex(filename, '\\', filename_len, (const 
mbfl_encoding *)encoding TSRMLS_CC);
-       if ((tmp = php_mb_safe_strrchr_ex(filename, '/', filename_len, (const 
mbfl_encoding *)encoding TSRMLS_CC)) > s) {
+       s = php_mb_safe_strrchr_ex(filename, '\\', filename_len, (const 
mbfl_encoding *)encoding);
+       if ((tmp = php_mb_safe_strrchr_ex(filename, '/', filename_len, (const 
mbfl_encoding *)encoding)) > s) {
                s = tmp;
        }
        if (s) {

Modified: php/php-src/trunk/main/rfc1867.c
===================================================================
--- php/php-src/trunk/main/rfc1867.c    2011-03-06 07:00:30 UTC (rev 308950)
+++ php/php-src/trunk/main/rfc1867.c    2011-03-06 07:06:55 UTC (rev 308951)
@@ -743,7 +743,7 @@
        }

        /* Initialize the buffer */
-       if (!(mbuff = multipart_buffer_new(boundary, boundary_len))) {
+       if (!(mbuff = multipart_buffer_new(boundary, boundary_len TSRMLS_CC))) {
                sapi_module.sapi_error(E_WARNING, "Unable to initialize the 
input buffer");
                return;
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to