Fix ZTS build.

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 8274c7ee2ef689c72ffa0b2d226b0e879bfae4cc..6c7644f2434ddc5d805ba88102b82c8342470924 100644 (file)
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -102,7 +102,7 @@ union ipbox {
 /* {{{ ftp_open
  */
 ftpbuf_t*
-ftp_open(const char *host, short port, long timeout_sec)
+ftp_open(const char *host, short port, long timeout_sec TSRMLS_DC)
 {
        ftpbuf_t                *ftp;
        int                     size;
@@ -119,7 +119,7 @@ ftp_open(const char *host, short port, long timeout_sec)
        tv.tv_sec = timeout_sec;
        tv.tv_usec = 0;
 
-       ftp->fd = php_hostconnect(host, (unsigned short) (port ? port : 21), SOCK_STREAM, &tv);
+       ftp->fd = php_hostconnect(host, (unsigned short) (port ? port : 21), SOCK_STREAM, &tv TSRMLS_CC);
        if (ftp->fd == -1) {
                goto bail;
        }

diff --git a/ext/ftp/ftp.h b/ext/ftp/ftp.h
index a770dfc4e261b8e2d221f3173922fe18288bfaab..40cab76a1e1c59b4df5dcabc87af36d0c3e87cb0 100644 (file)
--- a/ext/ftp/ftp.h
+++ b/ext/ftp/ftp.h
@@ -81,7 +81,7 @@ typedef struct ftpbuf
 /* open a FTP connection, returns ftpbuf (NULL on error)
  * port is the ftp port in network byte order, or 0 for the default
  */
-ftpbuf_t*      ftp_open(const char *host, short port, long timeout_sec);
+ftpbuf_t*      ftp_open(const char *host, short port, long timeout_sec TSRMLS_DC);
 
 /* quits from the ftp session (it still needs to be closed)
  * return true on success, false on error

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index a279ed81fc34d9c5b86ae51ab5600dff7cb0270b..5aeaa9cca5aba4634f6af6a446bfe564418afb65 100644 (file)
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -145,7 +145,7 @@ PHP_FUNCTION(ftp_connect)
        }
 
        /* connect */
-       ftp = ftp_open(host, (short)port, timeout_sec);
+       ftp = ftp_open(host, (short)port, timeout_sec TSRMLS_CC);
        if (ftp == NULL) {
                RETURN_FALSE;
        }

diff --git a/main/network.c b/main/network.c
index 24c9c16e3d31e661c77aa4c8c3b86bbcb7ccdff5..68aa87bbe12cca9adf74b44678783f893bd51a58 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -144,7 +144,7 @@ static void php_network_freeaddresses(struct sockaddr **sal)
 /* {{{ php_network_getaddresses
  * Returns number of addresses, 0 for none/error
  */
-static int php_network_getaddresses(const char *host, struct sockaddr ***sal)
+static int php_network_getaddresses(const char *host, struct sockaddr ***sal TSRMLS_DC)
 {
        struct sockaddr **sap;
        int n;
@@ -372,7 +372,7 @@ PHPAPI int php_connect_nonb_win32(SOCKET sockfd,
  * port, returns the created socket on success, else returns -1.
  * timeout gives timeout in seconds, 0 means blocking mode.
  */
-int php_hostconnect(const char *host, unsigned short port, int socktype, struct timeval *timeout)
+int php_hostconnect(const char *host, unsigned short port, int socktype, struct timeval *timeout TSRMLS_DC)
 {      
        int n, repeatto, s;
        struct sockaddr **sal, **psal;
@@ -382,7 +382,7 @@ int php_hostconnect(const char *host, unsigned short port, int socktype, struct
        int err;
 #endif
        
-       n = php_network_getaddresses(host, &sal);
+       n = php_network_getaddresses(host, &sal TSRMLS_CC);
 
        if (n == 0)
                return -1;
@@ -537,7 +537,7 @@ PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short p
 {
        int socket;
 
-       socket = php_hostconnect(host, port, socktype, timeout);
+       socket = php_hostconnect(host, port, socktype, timeout TSRMLS_CC);
 
        if (socket == -1)
                return NULL;

diff --git a/main/php_network.h b/main/php_network.h
index 56ec549d0b7f2a83925bb8da42b1f382724b1d2f..6602ddd6b42dfc86bdb5d3f33c1568b2af3d89a7 100644 (file)
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -91,7 +91,7 @@ typedef struct {
 #endif
 
 
-int php_hostconnect(const char *host, unsigned short port, int socktype, struct timeval *timeout);
+int php_hostconnect(const char *host, unsigned short port, int socktype, struct timeval *timeout TSRMLS_DC);
 PHPAPI int php_connect_nonb(int sockfd, const struct sockaddr *addr, socklen_t addrlen, struct timeval *timeout);
 
 #ifdef PHP_WIN32