[PHP-CVS] cvs: php4(PHP_4_3) /ext/ftp php_ftp.c

2003-04-02 Thread Ilia Alshanetsky 
iliaa   Wed Apr  2 19:55:45 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/ftp   php_ftp.c 
  Log:
  Fixed bug #23004 (When ftp_close() is called, sent QUIT to the ftp server)
  
  
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.74.2.6 php4/ext/ftp/php_ftp.c:1.74.2.7
--- php4/ext/ftp/php_ftp.c:1.74.2.6 Mon Mar 10 10:57:07 2003
+++ php4/ext/ftp/php_ftp.c  Wed Apr  2 19:55:45 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_ftp.c,v 1.74.2.6 2003/03/10 15:57:07 ddhill Exp $ */
+/* $Id: php_ftp.c,v 1.74.2.7 2003/04/03 00:55:45 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1076,6 +1076,8 @@
}
 
ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf);
+
+   ftp_quit(ftp);
 
RETURN_BOOL(zend_list_delete(Z_LVAL_P(z_ftp)) == SUCCESS);
 }



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/ftp php_ftp.c /ext/sockets sockets.c

2003-03-10 Thread David Hill 
ddhill  Mon Mar 10 10:57:08 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/ftp   php_ftp.c 
/php4/ext/sockets   sockets.c 
  Log:
  fixing missed int to long with zend_parse_parameters
  
  
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.74.2.5 php4/ext/ftp/php_ftp.c:1.74.2.6
--- php4/ext/ftp/php_ftp.c:1.74.2.5 Fri Mar  7 08:42:13 2003
+++ php4/ext/ftp/php_ftp.c  Mon Mar 10 10:57:07 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_ftp.c,v 1.74.2.5 2003/03/07 13:42:13 ddhill Exp $ */
+/* $Id: php_ftp.c,v 1.74.2.6 2003/03/10 15:57:07 ddhill Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -897,7 +897,7 @@
ftptype_t   xtype;
char*remote, *local;
int remote_len, local_len, ret;
-   int mode, startpos=0;
+   longmode, startpos=0;
php_stream * instream;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rssl|l, z_ftp, 
remote, remote_len, local, local_len, mode, startpos) == FAILURE) {
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.125.2.4 php4/ext/sockets/sockets.c:1.125.2.5
--- php4/ext/sockets/sockets.c:1.125.2.4Fri Mar  7 08:42:18 2003
+++ php4/ext/sockets/sockets.c  Mon Mar 10 10:57:07 2003
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.125.2.4 2003/03/07 13:42:18 ddhill Exp $ */
+/* $Id: sockets.c,v 1.125.2.5 2003/03/10 15:57:07 ddhill Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1035,7 +1035,7 @@
php_socket  *php_sock;
char*addr;
int addr_len;
-   int port = 0;
+   longport = 0;
longretval = 0;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rs|l, arg1, addr, 
addr_len, port) == FAILURE)



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/ftp php_ftp.c

2002-12-05 Thread Ilia Alshanetsky 
iliaa   Fri Dec  6 01:08:21 2002 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/ftp   php_ftp.c 
  Log:
  MFH
  
  
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.74 php4/ext/ftp/php_ftp.c:1.74.2.1
--- php4/ext/ftp/php_ftp.c:1.74 Thu Oct  3 07:33:05 2002
+++ php4/ext/ftp/php_ftp.c  Fri Dec  6 01:08:21 2002
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_ftp.c,v 1.74 2002/10/03 11:33:05 sesser Exp $ */
+/* $Id: php_ftp.c,v 1.74.2.1 2002/12/06 06:08:21 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -624,6 +624,7 @@
}
 
php_stream_close(outstream);
+   RETURN_TRUE;
 }
 /* }}} */
 



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