iliaa                                    Mon, 10 Jan 2011 18:19:02 +0000

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

Log:
Fixed bug #53630 (Fixed parameter handling inside readline() function).

Bug: http://bugs.php.net/53630 (Verified) optional prompt argument is treated 
as non-optional
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/readline/readline.c
    U   php/php-src/trunk/ext/readline/readline.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2011-01-10 17:34:26 UTC (rev 307342)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-01-10 18:19:02 UTC (rev 307343)
@@ -76,6 +76,10 @@
 - PHP-FPM SAPI:
   . Fixed bug #53527 (php-fpm --test doesn't set a valuable return value). 
(fat)

+- Readline extension:
+  . Fixed bug #53630 (Fixed parameter handling inside readline() function).
+    (jo at feuersee dot de, Ilia)
+
 - SOAP extension:
   . Fixed possible crash introduced by the NULL poisoning patch.
     (Mateusz Kocielski, Pierre)

Modified: php/php-src/branches/PHP_5_3/ext/readline/readline.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/readline/readline.c        2011-01-10 
17:34:26 UTC (rev 307342)
+++ php/php-src/branches/PHP_5_3/ext/readline/readline.c        2011-01-10 
18:19:02 UTC (rev 307343)
@@ -196,7 +196,7 @@
        int prompt_len;
        char *result;

-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", 
&prompt, &prompt_len)) {
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", 
&prompt, &prompt_len)) {
                RETURN_FALSE;
        }


Modified: php/php-src/trunk/ext/readline/readline.c
===================================================================
--- php/php-src/trunk/ext/readline/readline.c   2011-01-10 17:34:26 UTC (rev 
307342)
+++ php/php-src/trunk/ext/readline/readline.c   2011-01-10 18:19:02 UTC (rev 
307343)
@@ -196,7 +196,7 @@
        int prompt_len;
        char *result;

-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", 
&prompt, &prompt_len)) {
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", 
&prompt, &prompt_len)) {
                RETURN_FALSE;
        }


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

Reply via email to