← Back to branch summary

~clint-fewbar/ubuntu/natty/php5/merge-5.3.3-3

« back to all changes in this revision

Viewing changes to ext/posix/posix.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-01-26 14:09:58 UTC
  • mfrom: (1.1.16 upstream) (0.3.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100126140958-sos69zwa00q2nt19
Tags: 5.2.12.dfsg.1-2ubuntu1
https://launchpad.net/bugs/323731
* Merge from debian testing.  Remaining changes:
  - debian/control, debian/rules: Disable a few build dependencies and
    accompanying binary packages which we do not want to support in main:
    + firebird2-dev/php5-interbase (we have a seperate php-interbase source)
    + libc-client/php5-imap (we have a seperate php-imap source)
    + libmcrypt-dev/php5-mcrypt (seperate php-mcrypt source)
    + readline support again, now that the libedit issue is fixed.
  - debian/control: Add build dependency: libedit-dev (>= 2.9.cvs.20050518-1)
    CLI readline support.
  - debian/rules:
    + Correctly mangle PHP5_* macros for lpia
  - debian/control:
    + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731).
  - debian/control: Move php5-suhoshin to Suggests.
  - debian/rules: Fix broken symlink for pear.
  - main/php_version.h: updated with Ubuntu version info
  - debian/patches/series: Re-enable the 033-we_WANT_libtool.patch patch
  - debian/rules, debian/source_php5.py: Install apport hook. 
* Dropped patches: CVE-2009-3557.patch and CVE-2009-3558.patch, no longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/posix/posix.c
16
16
   +----------------------------------------------------------------------+
17
17
 */
18
18
 
19
 
/* $Id: posix.c 286880 2009-08-06 11:11:15Z jani $ */
 
19
/* $Id: posix.c 288943 2009-09-29 14:02:50Z rasmus $ */
20
20
 
21
21
#ifdef HAVE_CONFIG_H
22
22
#include "config.h"
152
152
static PHP_MINFO_FUNCTION(posix)
153
153
{
154
154
        php_info_print_table_start();
155
 
        php_info_print_table_row(2, "Revision", "$Revision: 286880 $");
 
155
        php_info_print_table_row(2, "Revision", "$Revision: 288943 $");
156
156
        php_info_print_table_end();
157
157
}
158
158
/* }}} */
679
679
                RETURN_FALSE;
680
680
        }
681
681
 
682
 
        if (PG(safe_mode) && (!php_checkuid(path, NULL, CHECKUID_ALLOW_ONLY_DIR))) {
 
682
        if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) ||
 
683
                        (PG(safe_mode) && (!php_checkuid(path, NULL, CHECKUID_ALLOW_ONLY_DIR)))) {
683
684
                RETURN_FALSE;
684
685
        }
685
686