cvs: php4 /ext/ftp ftp.c ftp.h php_ftp.c /main network.c php_network.h

sebastian Sun Aug 25 18:17:56 2002 EDT Modified files: /php4/ext/ftp ftp.c ftp.h php_ftp.c /php4/main network.c php_network.h Log: Fix ZTS build. Index: php4/ext/ftp/ftp.c diff -u php4/ext/ftp/ftp.c:1.59 php4/ext/ftp/ftp.c:1.60 --- php4/ext/ftp/ftp.c:1.59 Sun Aug 25 06:10:23 2002 +++ php4/ext/ftp/ftp.c Sun Aug 25 18:17:55 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ftp.c,v 1.59 2002/08/25 10:10:23 wez Exp $ */ +/* $Id: ftp.c,v 1.60 2002/08/25 22:17:55 sebastian Exp $ */ #include "php.h" @@ -102,7 +102,7 @@ /* {{{ 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 @@ 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; } Index: php4/ext/ftp/ftp.h diff -u php4/ext/ftp/ftp.h:1.26 php4/ext/ftp/ftp.h:1.27 --- php4/ext/ftp/ftp.h:1.26 Fri Jul 26 18:00:25 2002 +++ php4/ext/ftp/ftp.h Sun Aug 25 18:17:55 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ftp.h,v 1.26 2002/07/26 22:00:25 sesser Exp $ */ +/* $Id: ftp.h,v 1.27 2002/08/25 22:17:55 sebastian Exp $ */ #ifndef FTP_H #define FTP_H @@ -81,7 +81,7 @@ /* 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 Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.69 php4/ext/ftp/php_ftp.c:1.70 --- php4/ext/ftp/php_ftp.c:1.69 Sun Aug 25 06:10:23 2002 +++ php4/ext/ftp/php_ftp.c Sun Aug 25 18:17:55 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.69 2002/08/25 10:10:23 wez Exp $ */ +/* $Id: php_ftp.c,v 1.70 2002/08/25 22:17:55 sebastian Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -145,7 +145,7 @@ } /* connect */ - ftp = ftp_open(host, (short)port, timeout_sec); + ftp = ftp_open(host, (short)port, timeout_sec TSRMLS_CC); if (ftp == NULL) { RETURN_FALSE; } Index: php4/main/network.c diff -u php4/main/network.c:1.62 php4/main/network.c:1.63 --- php4/main/network.c:1.62 Sun Aug 25 14:45:02 2002 +++ php4/main/network.c Sun Aug 25 18:17:56 2002 @@ -16,7 +16,7 @@ | Streams work by Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.62 2002/08/25 18:45:02 helly Exp $ */ +/* $Id: network.c,v 1.63 2002/08/25 22:17:56 sebastian Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ #define MAX_CHUNKS_PER_READ 10 @@ -144,7 +144,7 @@ /* {{{ 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 @@ * 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 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 @@ { int socket; - socket = php_hostconnect(host, port, socktype, timeout); + socket = php_hostconnect(host, port, socktype, timeout TSRMLS_CC); if (socket == -1) return NULL; Index: php4/main/php_network.h diff -u php4/main/php_network.h:1.24 php4/main/php_network.h:1.25 --- php4/main/php_network.h:1.24 Mon Aug 19 18:59:10 2002 +++ php4/main/php_network.h Sun Aug 25 18:17:56 2002 @@ -15,7 +15,7 @@ | Author: Stig Venaas <venaas@uninett.no> | +----------------------------------------------------------------------+ */ -/* $Id: php_network.h,v 1.24 2002/08/19 22:59:10 wez Exp $ */ +/* $Id: php_network.h,v 1.25 2002/08/25 22:17:56 sebastian Exp $ */ #ifndef _PHP_NETWORK_H #define _PHP_NETWORK_H @@ -91,7 +91,7 @@ #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