[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/file.c branches/PHP_5_4/ext/standard/file.c trunk/ext/standard/file.c

[Felipe Pena]

felipe                                   Sun, 19 Jun 2011 14:50:44 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=312285

Log:
- Opss, restore old behavior

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/file.c
    U   php/php-src/branches/PHP_5_4/ext/standard/file.c
    U   php/php-src/trunk/ext/standard/file.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/file.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/file.c    2011-06-19 14:27:33 UTC 
(rev 312284)
+++ php/php-src/branches/PHP_5_3/ext/standard/file.c    2011-06-19 14:50:44 UTC 
(rev 312285)
@@ -1499,15 +1499,15 @@
        long arg1 = 0;
        int oldumask;

-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) == 
FAILURE) {
-               RETURN_FALSE;
-       }
-
        oldumask = umask(077);

        if (BG(umask) == -1) {
                BG(umask) = oldumask;
        }
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) == 
FAILURE) {
+               RETURN_FALSE;
+       }

        if (ZEND_NUM_ARGS() == 0) {
                umask(oldumask);

Modified: php/php-src/branches/PHP_5_4/ext/standard/file.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/file.c    2011-06-19 14:27:33 UTC 
(rev 312284)
+++ php/php-src/branches/PHP_5_4/ext/standard/file.c    2011-06-19 14:50:44 UTC 
(rev 312285)
@@ -1414,15 +1414,15 @@
        long arg1 = 0;
        int oldumask;

-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) == 
FAILURE) {
-               RETURN_FALSE;
-       }
-
        oldumask = umask(077);

        if (BG(umask) == -1) {
                BG(umask) = oldumask;
        }
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) == 
FAILURE) {
+               RETURN_FALSE;
+       }

        if (ZEND_NUM_ARGS() == 0) {
                umask(oldumask);

Modified: php/php-src/trunk/ext/standard/file.c
===================================================================
--- php/php-src/trunk/ext/standard/file.c       2011-06-19 14:27:33 UTC (rev 
312284)
+++ php/php-src/trunk/ext/standard/file.c       2011-06-19 14:50:44 UTC (rev 
312285)
@@ -1414,15 +1414,15 @@
        long arg1 = 0;
        int oldumask;

-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) == 
FAILURE) {
-               RETURN_FALSE;
-       }
-
        oldumask = umask(077);

        if (BG(umask) == -1) {
                BG(umask) = oldumask;
        }
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) == 
FAILURE) {
+               RETURN_FALSE;
+       }

        if (ZEND_NUM_ARGS() == 0) {
                umask(oldumask);


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