Re: [PHP4BETA] cvs: /php4/ext/ftp php_ftp.c php_ftp.h

hi, haven't read the code yet - but will the new ftp stuff support both active & passive ftp?? tc On Thu, 23 Sep 1999, Andrew Skalski wrote: > askalski Thu Sep 23 13:54:27 1999 EDT > > Modified files: > /php4/ext/ftp php_ftp.c php_ftp.h > Log: > fixed php3 code problem > > > Index: php4/ext/ftp/php_ftp.c > diff -u php4/ext/ftp/php_ftp.c:1.4 php4/ext/ftp/php_ftp.c:1.5 > --- php4/ext/ftp/php_ftp.c:1.4 Wed Sep 22 12:07:41 1999 > +++ php4/ext/ftp/php_ftp.c Thu Sep 23 13:54:26 1999 > @@ -28,7 +28,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: php_ftp.c,v 1.4 1999/09/22 16:07:41 askalski Exp $ */ > +/* $Id: php_ftp.c,v 1.5 1999/09/23 17:54:26 askalski Exp $ */ > > #include "php.h" > > @@ -69,7 +69,7 @@ > #ifdef ZEND_VERSION > PHP_MINIT(ftp), > #else > - PHP_MINIT_FUNCTION, > + php3_minit_ftp, > #endif > NULL, > NULL, > @@ -83,10 +83,10 @@ > ftp_close(ftp); > } > > -#ifdef ZEND_VERSION > -PHP_MINIT_FUNCTION(ftp) > +#ifndef ZEND_VERSION > +int php3_minit_ftp(INIT_FUNC_ARGS) > #else > -int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS) > +PHP_MINIT_FUNCTION(ftp) > #endif > { > le_ftpbuf = register_list_destructors(ftp_destructor_ftpbuf, NULL); > Index: php4/ext/ftp/php_ftp.h > diff -u php4/ext/ftp/php_ftp.h:1.3 php4/ext/ftp/php_ftp.h:1.4 > --- php4/ext/ftp/php_ftp.h:1.3 Wed Sep 22 12:07:41 1999 > +++ php4/ext/ftp/php_ftp.h Thu Sep 23 13:54:26 1999 > @@ -28,7 +28,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: php_ftp.h,v 1.3 1999/09/22 16:07:41 askalski Exp $ */ > +/* $Id: php_ftp.h,v 1.4 1999/09/23 17:54:26 askalski Exp $ */ > > #ifndef _INCLUDED_FTP_H > #define _INCLUDED_FTP_H > @@ -46,7 +46,7 @@ > #ifdef ZEND_VERSION > PHP_MINIT_FUNCTION(ftp); > #else > -int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS); > +int php3_minit_ftp(INIT_FUNC_ARGS); > #endif > > PHP_FUNCTION(ftp_connect); > > > > -- > PHP 4 Beta > > Thies C. Arntzen "One Big-Mac, Small Fries and a Coke!" Digital Collections Phone +49 40 235350 Fax +49 40 23535180 Hammerbrookstr. 93 20097 Hamburg / Germany