[PHP-CVS] cvs: php-src /ext/session mod_files.c session.c

[Sebastian Bergmann]

sebastian               Fri Jan  5 14:53:31 2007 UTC

  Modified files:              
    /php-src/ext/session        mod_files.c session.c 
  Log:
  Fix ZTS issues.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.109&r2=1.110&diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.109 
php-src/ext/session/mod_files.c:1.110
--- php-src/ext/session/mod_files.c:1.109       Fri Jan  5 02:07:59 2007
+++ php-src/ext/session/mod_files.c     Fri Jan  5 14:53:30 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mod_files.c,v 1.109 2007/01/05 02:07:59 pollita Exp $ */
+/* $Id: mod_files.c,v 1.110 2007/01/05 14:53:30 sebastian Exp $ */
 
 #include "php.h"
 
@@ -94,7 +94,7 @@
        return ret;
 }
 
-static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, 
const char *key)
+static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, 
const char *key TSRMLS_DC)
 {
        size_t key_len;
        const char *p;
@@ -180,7 +180,7 @@
                        PS(invalid_session_id) = 1;
                        return;
                }
-               if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
+               if (!ps_files_path_create(buf, sizeof(buf), data, key 
TSRMLS_CC)) {
                        return;
                }
 
@@ -430,7 +430,7 @@
        char buf[MAXPATHLEN];
        PS_FILES_DATA;
 
-       if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
+       if (!ps_files_path_create(buf, sizeof(buf), data, key TSRMLS_CC)) {
                return FAILURE;
        }
 
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.464&r2=1.465&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.464 php-src/ext/session/session.c:1.465
--- php-src/ext/session/session.c:1.464 Fri Jan  5 03:57:57 2007
+++ php-src/ext/session/session.c       Fri Jan  5 14:53:30 2007
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: session.c,v 1.464 2007/01/05 03:57:57 pollita Exp $ */
+/* $Id: session.c,v 1.465 2007/01/05 14:53:30 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1546,7 +1546,7 @@
                        int id_len;
                        UErrorCode status = U_ZERO_ERROR;
 
-                       
zend_unicode_to_string_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &id, 
&id_len, name.u, name_len, &status TSRMLS_CC);
+                       
zend_unicode_to_string_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &id, 
&id_len, name.u, name_len, &status);
 
                        if (U_SUCCESS(status) && id) {
                                PS(id) = id;

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