← Back to branch summary

~ubuntu-branches/ubuntu/lucid/php5/lucid

« back to all changes in this revision

Viewing changes to ext/standard/ftp_fopen_wrapper.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-03-16 09:09:50 UTC
  • mfrom: (1.1.18 upstream) (0.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100316090950-e36m0pzranoixifd
Tags: 5.3.2-1ubuntu1
* Merge from debian unstable: 
  - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
      universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
  - Dropped debian/patches/libedit_is_editline.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/standard/ftp_fopen_wrapper.c
2
2
   +----------------------------------------------------------------------+
3
3
   | PHP Version 5                                                        |
4
4
   +----------------------------------------------------------------------+
5
 
   | Copyright (c) 1997-2009 The PHP Group                                |
 
5
   | Copyright (c) 1997-2010 The PHP Group                                |
6
6
   +----------------------------------------------------------------------+
7
7
   | This source file is subject to version 3.01 of the PHP license,      |
8
8
   | that is bundled with this package in the file LICENSE, and is        |
18
18
   |          Sara Golemon <pollita@php.net>                              |
19
19
   +----------------------------------------------------------------------+
20
20
 */
21
 
/* $Id: ftp_fopen_wrapper.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
21
/* $Id: ftp_fopen_wrapper.c 293036 2010-01-03 09:23:27Z sebastian $ */
22
22
 
23
23
#include "php.h"
24
24
#include "php_globals.h"
834
834
                tm.tm_sec += stamp - mktime(gmt);
835
835
                tm.tm_isdst = gmt->tm_isdst;
836
836
 
837
 
#ifdef NETWARE
838
 
                ssb->sb.st_mtime.tv_sec = mktime(&tm);
839
 
#else
840
837
                ssb->sb.st_mtime = mktime(&tm);
841
 
#endif
842
838
        } else {
843
839
                /* error or unsupported command */
844
840
mdtm_error:
845
 
#ifdef NETWARE
846
 
                ssb->sb.st_mtime.tv_sec = -1;
847
 
#else
848
841
                ssb->sb.st_mtime = -1;
849
 
#endif
850
842
        }
851
843
 
852
844
        ssb->sb.st_ino = 0;                                             /* Unknown values */
853
845
        ssb->sb.st_dev = 0;
854
846
        ssb->sb.st_uid = 0;
855
847
        ssb->sb.st_gid = 0;
856
 
#ifdef NETWARE
857
 
        ssb->sb.st_atime.tv_sec = -1;
858
 
        ssb->sb.st_ctime.tv_sec = -1;
859
 
#else
860
848
        ssb->sb.st_atime = -1;
861
849
        ssb->sb.st_ctime = -1;
862
 
#endif
863
850
 
864
851
        ssb->sb.st_nlink = 1;
865
852
        ssb->sb.st_rdev = -1;