[BACK]Return to php_ftp.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / ftp

Diff for /embedaddon/php/ext/ftp/php_ftp.c between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2013/10/14 08:02:19 version 1.1.1.5, 2014/06/15 20:03:48
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2013 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 963  PHP_FUNCTION(ftp_nb_get) Line 963  PHP_FUNCTION(ftp_nb_get)
   
         if ((ret = ftp_nb_get(ftp, outstream, remote, xtype, resumepos TSRMLS_CC)) == PHP_FTP_FAILED) {          if ((ret = ftp_nb_get(ftp, outstream, remote, xtype, resumepos TSRMLS_CC)) == PHP_FTP_FAILED) {
                 php_stream_close(outstream);                  php_stream_close(outstream);
                   ftp->stream = NULL;
                 VCWD_UNLINK(local);                  VCWD_UNLINK(local);
                 php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf);                  php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf);
                 RETURN_LONG(PHP_FTP_FAILED);                  RETURN_LONG(PHP_FTP_FAILED);
         }          }
   
        php_stream_close(outstream);        if (ret == PHP_FTP_FINISHED){
                 php_stream_close(outstream);
                 ftp->stream = NULL;
         }
   
         RETURN_LONG(ret);          RETURN_LONG(ret);
 }  }
Line 1001  PHP_FUNCTION(ftp_nb_continue) Line 1005  PHP_FUNCTION(ftp_nb_continue)
   
         if (ret != PHP_FTP_MOREDATA && ftp->closestream) {          if (ret != PHP_FTP_MOREDATA && ftp->closestream) {
                 php_stream_close(ftp->stream);                  php_stream_close(ftp->stream);
                   ftp->stream = NULL;
         }          }
   
         if (ret == PHP_FTP_FAILED) {          if (ret == PHP_FTP_FAILED) {
Line 1212  PHP_FUNCTION(ftp_nb_put) Line 1217  PHP_FUNCTION(ftp_nb_put)
   
         if (ret != PHP_FTP_MOREDATA) {          if (ret != PHP_FTP_MOREDATA) {
                 php_stream_close(instream);                  php_stream_close(instream);
                   ftp->stream = NULL;
         }          }
   
         if (ret == PHP_FTP_FAILED) {          if (ret == PHP_FTP_FAILED) {
Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>