[PHP-CVS] cvs: php4 /ext/ftp ftp.c

[Ilia Alshanetsky]

iliaa           Sat Oct 12 21:40:46 2002 EDT

  Modified files:              
    /php4/ext/ftp       ftp.c 
  Log:
  Fixed ZTS build
  Fixed 2 ZTS related warnings
  
  
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.67 php4/ext/ftp/ftp.c:1.68
--- php4/ext/ftp/ftp.c:1.67     Fri Oct  4 18:20:08 2002
+++ php4/ext/ftp/ftp.c  Sat Oct 12 21:40:46 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ftp.c,v 1.67 2002/10/04 22:20:08 sesser Exp $ */
+/* $Id: ftp.c,v 1.68 2002/10/13 01:40:46 iliaa Exp $ */
 
 #include "php.h"
 
@@ -226,6 +226,8 @@
 {
 #if HAVE_OPENSSL_EXT
        SSL_CTX *ctx = NULL;
+       
+       TSRMLS_FETCH();
 #endif
        if (ftp == NULL)
                return 0;
@@ -1346,11 +1348,13 @@
 databuf_t*
 data_accept(databuf_t *data, ftpbuf_t *ftp)
 {
+       php_sockaddr_storage addr;
+       int                     size;
+
 #if HAVE_OPENSSL_EXT
        SSL_CTX         *ctx;
+       TSRMLS_FETCH(); 
 #endif
-       php_sockaddr_storage addr;
-       int                     size;
 
        if (data->fd != -1)
                goto data_accepted;
@@ -1549,7 +1553,6 @@
 {
        databuf_t               *data = NULL;
        char                    arg[11];
-       TSRMLS_FETCH();
 
        if (ftp == NULL)
                goto bail;
@@ -1666,7 +1669,6 @@
 {
        databuf_t               *data = NULL;
        char                    arg[11];
-       TSRMLS_FETCH();
 
        if (ftp == NULL)
                return 0;



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