date:20091213

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS Zend/zend_compile.c

2009-12-13 Thread Felipe Pena

felipe   Sun, 13 Dec 2009 15:18:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292078

Log:
- Fixed bug #50464 (declare encoding doesn't work with)
# The bug (BC) only happens in this branch.

Bug: http://bugs.php.net/50464 (Open) declare encoding doesn't work with 
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/Zend/zend_compile.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 14:48:04 UTC (rev 292077)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 15:18:58 UTC (rev 292078)
@@ -33,6 +33,7 @@
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)

+- Fixed bug #50464 (declare encoding doesn't work with). (Felipe)
 - Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes
   seg fault). (davbrown4 at yahoo dot com, Felipe)
 - Fixed bug #50351 (performance regression handling objects, ten times slower

Modified: php/php-src/branches/PHP_5_3/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_compile.c2009-12-13 14:48:04 UTC 
(rev 292077)
+++ php/php-src/branches/PHP_5_3/Zend/zend_compile.c2009-12-13 15:18:58 UTC 
(rev 292078)
@@ -4664,7 +4664,7 @@
--num;
}

-   if (num  0 || CG(encoding_declared)) {
+   if (num  0) {
zend_error(E_COMPILE_ERROR, Encoding 
declaration pragma must be the very first statement in the script);
}
}

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

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

2009-12-13 Thread Ilia Alshanetsky

iliaaSun, 13 Dec 2009 15:44:22 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292079

Log:
Fixed bug #50451 (http wrapper breaks on 2048 char long headers)

# Improvement on the fix for bug #49851

Bugs: http://bugs.php.net/50451 (Assigned) http wrapper breaks on 2048 char 
long headers
  http://bugs.php.net/49851 (Closed) http wrapper breaks on 1024 char long 
headers
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
U   php/php-src/trunk/ext/standard/http_fopen_wrapper.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 15:18:58 UTC (rev 292078)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 15:44:22 UTC (rev 292079)
@@ -98,7 +98,7 @@
 - Fixed bug #49866 (Making reference on string offsets crashes PHP). (Dmitry)
 - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
   sjoerd at php dot net)
-- Fixed bug #49851 (http wrapper breaks on 1024 char long headers). (Ilia)
+- Fixed bug #49851, #50451 (http wrapper breaks on 1024 char long headers). 
(Ilia)
 - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
   (Ilia, wmeler at wp-sa dot pl)
 - Fixed bug #49719 (ReflectionClass::hasProperty returns true for a private

Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c  
2009-12-13 15:18:58 UTC (rev 292078)
+++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c  
2009-12-13 15:44:22 UTC (rev 292079)
@@ -610,8 +610,11 @@
size_t http_header_line_length;
if (php_stream_get_line(stream, http_header_line, 
HTTP_HEADER_BLOCK_SIZE, http_header_line_length)  *http_header_line != '\n' 
 *http_header_line != '\r') {
char *e = http_header_line + http_header_line_length - 
1;
-   if (*e != '\n') { /* partial header */
-   php_stream_get_line(stream, http_header_line, 
HTTP_HEADER_BLOCK_SIZE, http_header_line_length);
+   if (*e != '\n') {
+   do { /* partial header */
+   php_stream_get_line(stream, 
http_header_line, HTTP_HEADER_BLOCK_SIZE, http_header_line_length);
+   e = http_header_line + 
http_header_line_length - 1;
+   } while (*e != '\n');
continue;
}
while (*e == '\n' || *e == '\r') {

Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-12-13 15:18:58 UTC 
(rev 292078)
+++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-12-13 15:44:22 UTC 
(rev 292079)
@@ -653,9 +653,11 @@
size_t http_header_line_length;
if (php_stream_get_line(stream, ZSTR(http_header_line), 
HTTP_HEADER_BLOCK_SIZE, http_header_line_length)  *http_header_line != '\n' 
 *http_header_line != '\r') {
char *e = http_header_line + http_header_line_length - 
1;
-   if (*e != '\n') { /* partial header */
-   php_stream_get_line(stream, 
ZSTR(http_header_line), HTTP_HEADER_BLOCK_SIZE, http_header_line_length);
-   continue;
+   if (*e != '\n') {
+   do { /* partial header */
+   php_stream_get_line(stream, 
ZSTR(http_header_line), HTTP_HEADER_BLOCK_SIZE, http_header_line_length);
+   e = http_header_line + 
http_header_line_length - 1;
+   } while (*e != '\n');
}
while (*e == '\n' || *e == '\r') {
e--;

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/readline/tests/readline_add_history_001.phpt branches/PHP_5_2/ext/readline/tests/readline_callback_handler_install_001.phpt branches/PHP_5_2/ext/readl

2009-12-13 Thread Felipe Pena

felipe   Sun, 13 Dec 2009 16:53:24 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292080

Log:
- Fixed tests for when running using libedit

Changed paths:
U   
php/php-src/branches/PHP_5_2/ext/readline/tests/readline_add_history_001.phpt
U   
php/php-src/branches/PHP_5_2/ext/readline/tests/readline_callback_handler_install_001.phpt
U   
php/php-src/branches/PHP_5_2/ext/readline/tests/readline_callback_handler_remove_001.phpt
U   
php/php-src/branches/PHP_5_2/ext/readline/tests/readline_list_history_001.phpt
U   
php/php-src/branches/PHP_5_2/ext/readline/tests/readline_read_history_001.phpt
U   
php/php-src/branches/PHP_5_2/ext/readline/tests/readline_write_history_001.phpt
U   
php/php-src/branches/PHP_5_3/ext/readline/tests/readline_add_history_001.phpt
U   
php/php-src/branches/PHP_5_3/ext/readline/tests/readline_callback_handler_install_001.phpt
U   
php/php-src/branches/PHP_5_3/ext/readline/tests/readline_callback_handler_remove_001.phpt
U   
php/php-src/branches/PHP_5_3/ext/readline/tests/readline_list_history_001.phpt
U   
php/php-src/branches/PHP_5_3/ext/readline/tests/readline_read_history_001.phpt
U   
php/php-src/branches/PHP_5_3/ext/readline/tests/readline_write_history_001.phpt
U   php/php-src/trunk/ext/readline/tests/readline_add_history_001.phpt
U   
php/php-src/trunk/ext/readline/tests/readline_callback_handler_install_001.phpt
U   
php/php-src/trunk/ext/readline/tests/readline_callback_handler_remove_001.phpt
U   php/php-src/trunk/ext/readline/tests/readline_list_history_001.phpt
U   php/php-src/trunk/ext/readline/tests/readline_read_history_001.phpt
U   php/php-src/trunk/ext/readline/tests/readline_write_history_001.phpt

Modified: php/php-src/branches/PHP_5_2/ext/readline/tests/readline_add_history_001.phpt
===
--- php/php-src/branches/PHP_5_2/ext/readline/tests/readline_add_history_001.phpt	2009-12-13 15:44:22 UTC (rev 292079)
+++ php/php-src/branches/PHP_5_2/ext/readline/tests/readline_add_history_001.phpt	2009-12-13 16:53:24 UTC (rev 292080)
@@ -1,7 +1,7 @@
 --TEST--
 readline_add_history(): Basic test
 --SKIPIF--
-?php if (!extension_loaded(readline)) die(skip); ?
+?php if (!extension_loaded(readline) || !function_exists('readline_list_history')) die(skip); ?
 --FILE--
 ?php


Modified: php/php-src/branches/PHP_5_2/ext/readline/tests/readline_callback_handler_install_001.phpt
===
--- php/php-src/branches/PHP_5_2/ext/readline/tests/readline_callback_handler_install_001.phpt	2009-12-13 15:44:22 UTC (rev 292079)
+++ php/php-src/branches/PHP_5_2/ext/readline/tests/readline_callback_handler_install_001.phpt	2009-12-13 16:53:24 UTC (rev 292080)
@@ -1,7 +1,7 @@
 --TEST--
 readline_callback_handler_install(): Basic test
 --SKIPIF--
-?php if (!extension_loaded(readline)) die(skip); ?
+?php if (!extension_loaded(readline) || !function_exists('readline_callback_handler_install')) die(skip); ?
 --FILE--
 ?php


Modified: php/php-src/branches/PHP_5_2/ext/readline/tests/readline_callback_handler_remove_001.phpt
===
--- php/php-src/branches/PHP_5_2/ext/readline/tests/readline_callback_handler_remove_001.phpt	2009-12-13 15:44:22 UTC (rev 292079)
+++ php/php-src/branches/PHP_5_2/ext/readline/tests/readline_callback_handler_remove_001.phpt	2009-12-13 16:53:24 UTC (rev 292080)
@@ -1,7 +1,7 @@
 --TEST--
 readline_callback_handler_remove(): Basic test
 --SKIPIF--
-?php if (!extension_loaded(readline)) die(skip); ?
+?php if (!extension_loaded(readline) || !function_exists('readline_callback_handler_remove')) die(skip); ?
 --FILE--
 ?php


Modified: php/php-src/branches/PHP_5_2/ext/readline/tests/readline_list_history_001.phpt
===
--- php/php-src/branches/PHP_5_2/ext/readline/tests/readline_list_history_001.phpt	2009-12-13 15:44:22 UTC (rev 292079)
+++ php/php-src/branches/PHP_5_2/ext/readline/tests/readline_list_history_001.phpt	2009-12-13 16:53:24 UTC (rev 292080)
@@ -1,7 +1,7 @@
 --TEST--
 readline_list_history(): Basic test
 --SKIPIF--
-?php if (!extension_loaded(readline)) die(skip); ?
+?php if (!extension_loaded(readline) || !function_exists('readline_list_history')) die(skip); ?
 --FILE--
 ?php


Modified: php/php-src/branches/PHP_5_2/ext/readline/tests/readline_read_history_001.phpt
===
--- php/php-src/branches/PHP_5_2/ext/readline/tests/readline_read_history_001.phpt	2009-12-13 15:44:22 UTC (rev 292079)
+++ php/php-src/branches/PHP_5_2/ext/readline/tests/readline_read_history_001.phpt	2009-12-13 16:53:24 UTC (rev 292080)
@@ -1,7 +1,7 @@
 --TEST--
 readline_read_history(): Basic test
 --SKIPIF--
-?php if (!extension_loaded(readline)) die(skip); ?
+?php if

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/php_cl

2009-12-13 Thread Felipe Pena

felipe   Sun, 13 Dec 2009 17:06:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292081

Log:
- Fixed bug #50209 (Compiling with libedit cannot find readline.h)
  (patch by tcallawa at redhat dot com)

Bug: http://bugs.php.net/50209 (No Feedback) Compiling with libedit cannot find 
readline.h
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/readline/config.m4
U   php/php-src/branches/PHP_5_2/ext/readline/readline.c
U   php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
U   php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/readline/config.m4
U   php/php-src/branches/PHP_5_3/ext/readline/readline.c
U   php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
U   php/php-src/branches/PHP_5_3/sapi/cli/php_cli_readline.c
U   php/php-src/trunk/ext/readline/config.m4
U   php/php-src/trunk/ext/readline/readline.c
U   php/php-src/trunk/sapi/cli/php_cli.c
U   php/php-src/trunk/sapi/cli/php_cli_readline.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-13 17:06:47 UTC (rev 292081)
@@ -17,6 +17,8 @@
 - Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN).
   (Ilia, Pierrick)
 - Fixed bug #50266 (conflicting types for llabs). (Jani)
+- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
+  (tcallawa at redhat dot com)
 - Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to
   non-existent file). (Dmitry)
 - Fixed bug #50162 (Memory leak when fetching timestamp column from Oracle

Modified: php/php-src/branches/PHP_5_2/ext/readline/config.m4
===
--- php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-12-13 16:53:24 UTC 
(rev 292080)
+++ php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-12-13 17:06:47 UTC 
(rev 292081)
@@ -65,7 +65,7 @@
 elif test $PHP_LIBEDIT != no; then

   for i in $PHP_LIBEDIT /usr/local /usr; do
-test -f $i/include/readline/readline.h  LIBEDIT_DIR=$i  break
+test -f $i/include/editline/readline.h  LIBEDIT_DIR=$i  break
   done

   if test -z $LIBEDIT_DIR; then

Modified: php/php-src/branches/PHP_5_2/ext/readline/readline.c
===
--- php/php-src/branches/PHP_5_2/ext/readline/readline.c2009-12-13 
16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/ext/readline/readline.c2009-12-13 
17:06:47 UTC (rev 292081)
@@ -33,8 +33,10 @@
 #define rl_completion_matches completion_matches
 #endif

+#ifdef HAVE_LIBEDIT
+#include editline/readline.h
+#else
 #include readline/readline.h
-#ifndef HAVE_LIBEDIT
 #include readline/history.h
 #endif


Modified: php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
===
--- php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-12-13 16:53:24 UTC 
(rev 292080)
+++ php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-12-13 17:06:47 UTC 
(rev 292081)
@@ -76,8 +76,11 @@
 #endif

 #if (HAVE_LIBREADLINE || HAVE_LIBEDIT)  !defined(COMPILE_DL_READLINE)
+
+#if HAVE_LIBEDIT
+#include editline/readline.h
+#else
 #include readline/readline.h
-#if !HAVE_LIBEDIT
 #include readline/history.h
 #endif
 #include php_cli_readline.h

Modified: php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c
===
--- php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c2009-12-13 
16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c2009-12-13 
17:06:47 UTC (rev 292081)
@@ -49,8 +49,10 @@
 #include unixlib/local.h
 #endif

+#if HAVE_LIBEDIT
+#include editline/readline.h
+#else
 #include readline/readline.h
-#if !HAVE_LIBEDIT
 #include readline/history.h
 #endif


Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 17:06:47 UTC (rev 292081)
@@ -62,6 +62,8 @@
   (Pierrick)
 - Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT).
   (Ilia, shigeru_kitazaki at cybozu dot co dot jp)
+- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
+  (tcallawa at redhat dot com)
 - Fixed bug #50207 (segmentation fault when concatenating very large strings on
   64bit linux). (Ilia)
 - Fixed bug #50195 (pg_copy_to() fails when table name contains schema. (Ilia)

Modified: php/php-src/branches/PHP_5_3/ext/readline/config.m4
===
---

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

2009-12-13 Thread Felipe Pena

felipe   Sun, 13 Dec 2009 17:13:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292082

Log:
- Opss, wrong place

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-13 17:06:47 UTC (rev 292081)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-13 17:13:58 UTC (rev 292082)
@@ -3,6 +3,8 @@
 ?? Dec 2009, PHP 5.2.12RC5
 - Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes
   seg fault). (davbrown4 at yahoo dot com, Felipe)
+- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
+  (tcallawa at redhat dot com)

 10 Dec 2009, PHP 5.2.12RC4
 - Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a
@@ -17,8 +19,6 @@
 - Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN).
   (Ilia, Pierrick)
 - Fixed bug #50266 (conflicting types for llabs). (Jani)
-- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
-  (tcallawa at redhat dot com)
 - Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to
   non-existent file). (Dmitry)
 - Fixed bug #50162 (Memory leak when fetching timestamp column from Oracle

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/ph

2009-12-13 Thread Jani Taskinen


Are you absolutely sure you didn't break this now on some systems?
It worked fine last time I tested with libedit without any patches..

--Jani


13.12.2009 19:06, Felipe Pena wrote:

felipe   Sun, 13 Dec 2009 17:06:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292081

Log:
- Fixed bug #50209 (Compiling with libedit cannot find readline.h)
   (patch by tcallawa at redhat dot com)

Bug: http://bugs.php.net/50209 (No Feedback) Compiling with libedit cannot find 
readline.h

Changed paths:
 U   php/php-src/branches/PHP_5_2/NEWS
 U   php/php-src/branches/PHP_5_2/ext/readline/config.m4
 U   php/php-src/branches/PHP_5_2/ext/readline/readline.c
 U   php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
 U   php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c
 U   php/php-src/branches/PHP_5_3/NEWS
 U   php/php-src/branches/PHP_5_3/ext/readline/config.m4
 U   php/php-src/branches/PHP_5_3/ext/readline/readline.c
 U   php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
 U   php/php-src/branches/PHP_5_3/sapi/cli/php_cli_readline.c
 U   php/php-src/trunk/ext/readline/config.m4
 U   php/php-src/trunk/ext/readline/readline.c
 U   php/php-src/trunk/sapi/cli/php_cli.c
 U   php/php-src/trunk/sapi/cli/php_cli_readline.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-13 17:06:47 UTC (rev 292081)
@@ -17,6 +17,8 @@
  - Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN).
(Ilia, Pierrick)
  - Fixed bug #50266 (conflicting types for llabs). (Jani)
+- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
+  (tcallawa at redhat dot com)
  - Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to
non-existent file). (Dmitry)
  - Fixed bug #50162 (Memory leak when fetching timestamp column from Oracle

Modified: php/php-src/branches/PHP_5_2/ext/readline/config.m4
===
--- php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-12-13 16:53:24 UTC 
(rev 292080)
+++ php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-12-13 17:06:47 UTC 
(rev 292081)
@@ -65,7 +65,7 @@
  elif test $PHP_LIBEDIT != no; then

for i in $PHP_LIBEDIT /usr/local /usr; do
-test -f $i/include/readline/readline.h  LIBEDIT_DIR=$i  break
+test -f $i/include/editline/readline.h  LIBEDIT_DIR=$i  break
done

if test -z $LIBEDIT_DIR; then

Modified: php/php-src/branches/PHP_5_2/ext/readline/readline.c
===
--- php/php-src/branches/PHP_5_2/ext/readline/readline.c2009-12-13 
16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/ext/readline/readline.c2009-12-13 
17:06:47 UTC (rev 292081)
@@ -33,8 +33,10 @@
  #define rl_completion_matches completion_matches
  #endif

+#ifdef HAVE_LIBEDIT
+#includeeditline/readline.h
+#else
  #includereadline/readline.h
-#ifndef HAVE_LIBEDIT
  #includereadline/history.h
  #endif


Modified: php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
===
--- php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-12-13 16:53:24 UTC 
(rev 292080)
+++ php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-12-13 17:06:47 UTC 
(rev 292081)
@@ -76,8 +76,11 @@
  #endif

  #if (HAVE_LIBREADLINE || HAVE_LIBEDIT)  !defined(COMPILE_DL_READLINE)
+
+#if HAVE_LIBEDIT
+#includeeditline/readline.h
+#else
  #includereadline/readline.h
-#if !HAVE_LIBEDIT
  #includereadline/history.h
  #endif
  #include php_cli_readline.h

Modified: php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c
===
--- php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c2009-12-13 
16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c2009-12-13 
17:06:47 UTC (rev 292081)
@@ -49,8 +49,10 @@
  #includeunixlib/local.h
  #endif

+#if HAVE_LIBEDIT
+#includeeditline/readline.h
+#else
  #includereadline/readline.h
-#if !HAVE_LIBEDIT
  #includereadline/history.h
  #endif


Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 17:06:47 UTC (rev 292081)
@@ -62,6 +62,8 @@
(Pierrick)
  - Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT).
(Ilia, shigeru_kitazaki at cybozu dot co dot jp)
+- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
+  (tcallawa at redhat dot com)
  - Fixed bug #50207 (segmentation fault when concatenating very large strings 
on
64bit linux). (Ilia)
  - Fixed bug #50195

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS Zend/zend_compile.c

2009-12-13 Thread Jani Taskinen


13.12.2009 17:18, Felipe Pena wrote:

felipe   Sun, 13 Dec 2009 15:18:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292078

Log:
- Fixed bug #50464 (declare encoding doesn't work with)
# The bug (BC) only happens in this branch.

Bug: http://bugs.php.net/50464 (Open) declare encoding doesn't work with

Changed paths:
 U   php/php-src/branches/PHP_5_3/NEWS
 U   php/php-src/branches/PHP_5_3/Zend/zend_compile.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 14:48:04 UTC (rev 292077)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 15:18:58 UTC (rev 292078)
@@ -33,6 +33,7 @@
  - Fixed memory leak in extension loading when an error occurs on Windows.
(Pierre)

+- Fixed bug #50464 (declare encoding doesn't work with). (Felipe)


Work with...what?

--Jani

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

2009-12-13 Thread Felipe Pena

felipe   Sun, 13 Dec 2009 19:53:44 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292083

Log:
- Fixed bug #49174 (crash on queryString set)

Bug: http://bugs.php.net/49174 (Feedback) crash on queryString set
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
U   php/php-src/trunk/ext/pdo/pdo_dbh.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-13 17:13:58 UTC (rev 292082)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-13 19:53:44 UTC (rev 292083)
@@ -5,6 +5,7 @@
   seg fault). (davbrown4 at yahoo dot com, Felipe)
 - Fixed bug #50209 (Compiling with libedit cannot find readline.h).
   (tcallawa at redhat dot com)
+- Fixed bug #49174 (crash on queryString set). (Felipe)

 10 Dec 2009, PHP 5.2.12RC4
 - Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a

Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c  2009-12-13 17:13:58 UTC 
(rev 292082)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c  2009-12-13 19:53:44 UTC 
(rev 292083)
@@ -44,7 +44,7 @@
char *message = NULL;
const char *msg;

-   if (dbh-error_mode == PDO_ERRMODE_SILENT) {
+   if (dbh  dbh-error_mode == PDO_ERRMODE_SILENT) {
 #if 0
/* BUG: if user is running in silent mode and hits an error at 
the driver level
 * when they use the PDO methods to call up the error 
information, they may
@@ -71,7 +71,7 @@
spprintf(message, 0, SQLSTATE[%s]: %s, *pdo_err, msg);
}

-   if (dbh-error_mode != PDO_ERRMODE_EXCEPTION) {
+   if (dbh  dbh-error_mode != PDO_ERRMODE_EXCEPTION) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, message);
} else {
zval *ex, *info;

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 17:13:58 UTC (rev 292082)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 19:53:44 UTC (rev 292083)
@@ -116,6 +116,7 @@
 - Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd)
 - Fixed bug #49224 (Compile error due to old DNS functions on AIX systems).
   (Scott)
+- Fixed bug #49174 (crash on queryString set). (Felipe)
 - Fixed bug #47848 (importNode doesn't preserve attribute namespaces). (Rob)
 - Fixed bug #45120 (PDOStatement-execute() returns true then false for same
   statement). (Pierrick)

Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c  2009-12-13 17:13:58 UTC 
(rev 292082)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c  2009-12-13 19:53:44 UTC 
(rev 292083)
@@ -44,7 +44,7 @@
char *message = NULL;
const char *msg;

-   if (dbh-error_mode == PDO_ERRMODE_SILENT) {
+   if (dbh  dbh-error_mode == PDO_ERRMODE_SILENT) {
 #if 0
/* BUG: if user is running in silent mode and hits an error at 
the driver level
 * when they use the PDO methods to call up the error 
information, they may
@@ -71,7 +71,7 @@
spprintf(message, 0, SQLSTATE[%s]: %s, *pdo_err, msg);
}

-   if (dbh-error_mode != PDO_ERRMODE_EXCEPTION) {
+   if (dbh  dbh-error_mode != PDO_ERRMODE_EXCEPTION) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, message);
} else {
zval *ex, *info;

Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-12-13 17:13:58 UTC (rev 292082)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-12-13 19:53:44 UTC (rev 292083)
@@ -44,7 +44,7 @@
char *message = NULL;
const char *msg;

-   if (dbh-error_mode == PDO_ERRMODE_SILENT) {
+   if (dbh  dbh-error_mode == PDO_ERRMODE_SILENT) {
 #if 0
/* BUG: if user is running in silent mode and hits an error at 
the driver level
 * when they use the PDO methods to call up the error 
information, they may
@@ -71,7 +71,7 @@
spprintf(message, 0, SQLSTATE[%s]: %s, *pdo_err, msg);
}

-   if (dbh-error_mode != PDO_ERRMODE_EXCEPTION) {
+   if (dbh  dbh-error_mode != PDO_ERRMODE_EXCEPTION) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, message);
} else {
zval *ex, *info;

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/

2009-12-13 Thread Felipe Pena

2009/12/13 Jani Taskinen jani.taski...@sci.fi

 Are you absolutely sure you didn't break this now on some systems?

It worked fine last time I tested with libedit without any patches..


Hmm, we need add a check for editline/ then... It just worked with the patch
here...

Thanks.



 --Jani



 13.12.2009 19:06, Felipe Pena wrote:

 felipe   Sun, 13 Dec 2009 17:06:47 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=292081

 Log:
 - Fixed bug #50209 (Compiling with libedit cannot find readline.h)
   (patch by tcallawa at redhat dot com)

 Bug: http://bugs.php.net/50209 (No Feedback) Compiling with libedit
 cannot find readline.h

 Changed paths:
 U   php/php-src/branches/PHP_5_2/NEWS
 U   php/php-src/branches/PHP_5_2/ext/readline/config.m4
 U   php/php-src/branches/PHP_5_2/ext/readline/readline.c
 U   php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
 U   php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c
 U   php/php-src/branches/PHP_5_3/NEWS
 U   php/php-src/branches/PHP_5_3/ext/readline/config.m4
 U   php/php-src/branches/PHP_5_3/ext/readline/readline.c
 U   php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
 U   php/php-src/branches/PHP_5_3/sapi/cli/php_cli_readline.c
 U   php/php-src/trunk/ext/readline/config.m4
 U   php/php-src/trunk/ext/readline/readline.c
 U   php/php-src/trunk/sapi/cli/php_cli.c
 U   php/php-src/trunk/sapi/cli/php_cli_readline.c

 Modified: php/php-src/branches/PHP_5_2/NEWS
 ===
 --- php/php-src/branches/PHP_5_2/NEWS   2009-12-13 16:53:24 UTC (rev
 292080)
 +++ php/php-src/branches/PHP_5_2/NEWS   2009-12-13 17:06:47 UTC (rev
 292081)
 @@ -17,6 +17,8 @@
  - Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN).
(Ilia, Pierrick)
  - Fixed bug #50266 (conflicting types for llabs). (Jani)
 +- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
 +  (tcallawa at redhat dot com)
  - Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to
non-existent file). (Dmitry)
  - Fixed bug #50162 (Memory leak when fetching timestamp column from
 Oracle

 Modified: php/php-src/branches/PHP_5_2/ext/readline/config.m4
 ===
 --- php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-12-13
 16:53:24 UTC (rev 292080)
 +++ php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-12-13
 17:06:47 UTC (rev 292081)
 @@ -65,7 +65,7 @@
  elif test $PHP_LIBEDIT != no; then

for i in $PHP_LIBEDIT /usr/local /usr; do
 -test -f $i/include/readline/readline.h  LIBEDIT_DIR=$i  break
 +test -f $i/include/editline/readline.h  LIBEDIT_DIR=$i  break
done

if test -z $LIBEDIT_DIR; then

 Modified: php/php-src/branches/PHP_5_2/ext/readline/readline.c
 ===
 --- php/php-src/branches/PHP_5_2/ext/readline/readline.c2009-12-13
 16:53:24 UTC (rev 292080)
 +++ php/php-src/branches/PHP_5_2/ext/readline/readline.c2009-12-13
 17:06:47 UTC (rev 292081)
 @@ -33,8 +33,10 @@
  #define rl_completion_matches completion_matches
  #endif

 +#ifdef HAVE_LIBEDIT
 +#includeeditline/readline.h
 +#else
  #includereadline/readline.h
 -#ifndef HAVE_LIBEDIT
  #includereadline/history.h
  #endif


 Modified: php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
 ===
 --- php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-12-13
 16:53:24 UTC (rev 292080)
 +++ php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-12-13
 17:06:47 UTC (rev 292081)
 @@ -76,8 +76,11 @@
  #endif

  #if (HAVE_LIBREADLINE || HAVE_LIBEDIT)  !defined(COMPILE_DL_READLINE)
 +
 +#if HAVE_LIBEDIT
 +#includeeditline/readline.h
 +#else
  #includereadline/readline.h
 -#if !HAVE_LIBEDIT
  #includereadline/history.h
  #endif
  #include php_cli_readline.h

 Modified: php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c
 ===
 --- php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c2009-12-13
 16:53:24 UTC (rev 292080)
 +++ php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c2009-12-13
 17:06:47 UTC (rev 292081)
 @@ -49,8 +49,10 @@
  #includeunixlib/local.h
  #endif

 +#if HAVE_LIBEDIT
 +#includeeditline/readline.h
 +#else
  #includereadline/readline.h
 -#if !HAVE_LIBEDIT
  #includereadline/history.h
  #endif


 Modified: php/php-src/branches/PHP_5_3/NEWS
 ===
 --- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 16:53:24 UTC (rev
 292080)
 +++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 17:06:47 UTC (rev
 292081)
 @@ -62,6 +62,8 @@
(Pierrick)
  - Fixed bug #50212 (crash by ldap_get_option() with
 LDAP_OPT_NETWORK_TIMEOUT).
(Ilia, shigeru_kitazaki at cybozu dot co dot jp)
 +- Fixed bug #50209

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

2009-12-13 Thread Felipe Pena

felipe   Sun, 13 Dec 2009 20:04:44 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292084

Log:
- Completing the phrase

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 19:53:44 UTC (rev 292083)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 20:04:44 UTC (rev 292084)
@@ -33,7 +33,8 @@
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)

-- Fixed bug #50464 (declare encoding doesn't work with). (Felipe)
+- Fixed bug #50464 (declare encoding doesn't work within an included file).
+  (Felipe)
 - Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes
   seg fault). (davbrown4 at yahoo dot com, Felipe)
 - Fixed bug #50351 (performance regression handling objects, ten times slower

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

2009-12-13 Thread Jani Taskinen


13.12.2009 21:53, Felipe Pena wrote:

felipe   Sun, 13 Dec 2009 19:53:44 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292083

Log:
- Fixed bug #49174 (crash on queryString set)

Bug: http://bugs.php.net/49174 (Feedback) crash on queryString set

Changed paths:
 U   php/php-src/branches/PHP_5_2/NEWS
 U   php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
 U   php/php-src/branches/PHP_5_3/NEWS
 U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
 U   php/php-src/trunk/ext/pdo/pdo_dbh.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-13 17:13:58 UTC (rev 292082)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-13 19:53:44 UTC (rev 292083)
@@ -5,6 +5,7 @@
seg fault). (davbrown4 at yahoo dot com, Felipe)
  - Fixed bug #50209 (Compiling with libedit cannot find readline.h).
(tcallawa at redhat dot com)
+- Fixed bug #49174 (crash on queryString set). (Felipe)


You should put a bit more descriptive NEWS entries. This says nothing before 
reading the whole bug report. At least say it happens with something related to 
PDO..


--Jani

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/

2009-12-13 Thread Jani Taskinen


13.12.2009 21:58, Felipe Pena wrote:

2009/12/13 Jani Taskinenjani.taski...@sci.fi

Are you absolutely sure you didn't break this now on some systems?
It worked fine last time I tested with libedit without any patches..


Hmm, we need add a check for editline/ then... It just worked with the patch
here...


I'll run some tests tomorrow at work. Just leave it for now. :)

--Jani

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

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS

2009-12-13 Thread Felipe Pena

felipe   Sun, 13 Dec 2009 20:51:15 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292085

Log:
- Improved the bug#49174 entry summary

Bug: http://bugs.php.net/49174 (Closed) crash when extending PDOStatement and 
trying to set queryString property
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-13 20:04:44 UTC (rev 292084)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-13 20:51:15 UTC (rev 292085)
@@ -5,7 +5,8 @@
   seg fault). (davbrown4 at yahoo dot com, Felipe)
 - Fixed bug #50209 (Compiling with libedit cannot find readline.h).
   (tcallawa at redhat dot com)
-- Fixed bug #49174 (crash on queryString set). (Felipe)
+- Fixed bug #49174 (crash when extending PDOStatement and trying to set
+  queryString property). (Felipe)

 10 Dec 2009, PHP 5.2.12RC4
 - Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 20:04:44 UTC (rev 292084)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 20:51:15 UTC (rev 292085)
@@ -117,7 +117,8 @@
 - Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd)
 - Fixed bug #49224 (Compile error due to old DNS functions on AIX systems).
   (Scott)
-- Fixed bug #49174 (crash on queryString set). (Felipe)
+- Fixed bug #49174 (crash when extending PDOStatement and trying to set
+  queryString property). (Felipe)
 - Fixed bug #47848 (importNode doesn't preserve attribute namespaces). (Rob)
 - Fixed bug #45120 (PDOStatement-execute() returns true then false for same
   statement). (Pierrick)

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo/pdo_stmt.c branches/PHP_5_3/ext/pdo/tests/bug_50458.phpt trunk/ext/pdo/pdo_stmt.c trunk/ext/pdo/tests/bug_50458.phpt

2009-12-13 Thread Pierrick Charron

pierrick Mon, 14 Dec 2009 03:44:33 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292107

Log:
- Fixed bug #50458 (PDO::FETCH_FUNC fails with Closures)

Bug: http://bugs.php.net/50458 (Open) PDO::FETCH_FUNC fails with Closures
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c
A   php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_50458.phpt
U   php/php-src/trunk/ext/pdo/pdo_stmt.c
A   php/php-src/trunk/ext/pdo/tests/bug_50458.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2009-12-14 03:39:18 UTC (rev 292106)
+++ php/php-src/branches/PHP_5_3/NEWS	2009-12-14 03:44:33 UTC (rev 292107)
@@ -35,6 +35,7 @@

 - Fixed bug #50464 (declare encoding doesn't work within an included file).
   (Felipe)
+- Fixed bug #50458 (PDO::FETCH_FUNC fails with Closures). (Felipe, Pierrick)
 - Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes
   seg fault). (davbrown4 at yahoo dot com, Felipe)
 - Fixed bug #50351 (performance regression handling objects, ten times slower

Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c	2009-12-14 03:39:18 UTC (rev 292106)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c	2009-12-14 03:44:33 UTC (rev 292107)
@@ -784,95 +784,20 @@

 static int make_callable_ex(pdo_stmt_t *stmt, zval *callable, zend_fcall_info * fci, zend_fcall_info_cache * fcc, int num_args TSRMLS_DC) /* {{{ */
 {
-	zval *object = NULL, **method = NULL;
-	char *fname = NULL, *cname;
-	zend_class_entry * ce = NULL, **pce;
-	zend_function *function_handler;
-
-	if (Z_TYPE_P(callable) == IS_ARRAY) {
-		if (Z_ARRVAL_P(callable)-nNumOfElements  2) {
-			pdo_raise_impl_error(stmt-dbh, stmt, HY000, user-supplied function must be a valid callback TSRMLS_CC);
-			return 0;
-		}
-		object = *(zval**)Z_ARRVAL_P(callable)-pListHead-pData;
-		method = (zval**)Z_ARRVAL_P(callable)-pListHead-pListNext-pData;
+	char *is_callable_error = NULL;

-		if (Z_TYPE_P(object) == IS_STRING) { /* static call */
-			if (zend_lookup_class(Z_STRVAL_P(object), Z_STRLEN_P(object), pce TSRMLS_CC) == FAILURE) {
-pdo_raise_impl_error(stmt-dbh, stmt, HY000, user-supplied class does not exist TSRMLS_CC);
-return 0;
-			} else {
-ce = *pce;
-			}
-			object = NULL;
-		} else if (Z_TYPE_P(object) == IS_OBJECT) { /* object call */
-			ce = Z_OBJCE_P(object);
+	if (zend_fcall_info_init(callable, 0, fci, fcc, NULL, is_callable_error TSRMLS_CC) == FAILURE) {
+		if (is_callable_error) {
+			pdo_raise_impl_error(stmt-dbh, stmt, HY000, is_callable_error TSRMLS_CC);
+			efree(is_callable_error);
 		} else {
-			pdo_raise_impl_error(stmt-dbh, stmt, HY000, user-supplied function must be a valid callback; bogus object/class name TSRMLS_CC);
-			return 0;
+			pdo_raise_impl_error(stmt-dbh, stmt, HY000, user-supplied function must be a valid callback TSRMLS_CC);
 		}
-
-		if (Z_TYPE_PP(method) != IS_STRING) {
-			pdo_raise_impl_error(stmt-dbh, stmt, HY000, user-supplied function must be a valid callback; bogus method name TSRMLS_CC);
-			return 0;
-		}
-	} else if (Z_TYPE_P(callable) == IS_STRING) {
-		method = callable;
-	}
-
-	if (!method || !zend_is_callable(callable, 0, fname TSRMLS_CC)) {
-		pdo_raise_impl_error(stmt-dbh, stmt, HY000, user-supplied function must be a valid callback TSRMLS_CC);
-		if (fname) {
-			efree(fname);
-		}
 		return 0;
 	}

-	/* ATM we do not support array($obj, CLASS::FUNC) or CLASS_FUNC */
-	cname = fname;
-	if ((fname = strstr(fname, ::)) == NULL) {
-		fname = cname;
-		cname = NULL;
-	} else {
-		*fname = '\0';
-		fname += 2;
-	}
-	if (cname) {
-		if (zend_lookup_class(cname, strlen(cname), pce TSRMLS_CC) == FAILURE) {
-			pdo_raise_impl_error(stmt-dbh, stmt, HY000, user-supplied class does not exist TSRMLS_CC);
-			return 0;
-		} else {
-			if (ce) {
-/* pce must be base of ce or ce itself */
-if (ce != *pce  !instanceof_function(ce, *pce TSRMLS_CC)) {
-	pdo_raise_impl_error(stmt-dbh, stmt, HY000, user-supplied class has bogus lineage TSRMLS_CC);
-	return 0;
-}
-			}
-			ce = *pce;
-		}
-	}
-
-	zend_str_tolower_copy(fname, fname, strlen(fname));
-	fci-function_table = ce ? ce-function_table : EG(function_table);
-	if (zend_hash_find(fci-function_table, fname, strlen(fname)+1, (void **)function_handler) == FAILURE) {
-		pdo_raise_impl_error(stmt-dbh, stmt, HY000, user-supplied function does not exist TSRMLS_CC);
-		return 0;
-	}
-	efree(cname ? cname : fname);
-
-	fci-size = sizeof(zend_fcall_info);
-	fci-function_name = NULL;
-	fci-symbol_table = NULL;
 	fci-param_count = num_args; /* probably less */
 	fci-params = safe_emalloc(sizeof(zval**), num_args, 0);
-	fci-object_ptr = object;
-
-	fcc-initialized = 1;
-

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/gd/gd.c branches/PHP_5_3/ext/gd/gd.c trunk/ext/gd/gd.c

2009-12-13 Thread Pierrick Charron

pierrick Mon, 14 Dec 2009 04:09:18 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292109

Log:
- Fixed bug #50469 (Fixed typo in imagepsencodefont error string).

Bug: http://bugs.php.net/50469 (Open) typo in error string
  
Changed paths:
U   php/php-src/branches/PHP_5_2/ext/gd/gd.c
U   php/php-src/branches/PHP_5_3/ext/gd/gd.c
U   php/php-src/trunk/ext/gd/gd.c

Modified: php/php-src/branches/PHP_5_2/ext/gd/gd.c
===
--- php/php-src/branches/PHP_5_2/ext/gd/gd.c2009-12-14 04:00:29 UTC (rev 
292108)
+++ php/php-src/branches/PHP_5_2/ext/gd/gd.c2009-12-14 04:09:18 UTC (rev 
292109)
@@ -4503,7 +4503,7 @@
T1_DeleteAllSizes(*f_ind);
if (T1_ReencodeFont(*f_ind, enc_vector)) {
T1_DeleteEncoding(enc_vector);
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't reencode 
font);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't re-encode 
font);
RETURN_FALSE;
}


Modified: php/php-src/branches/PHP_5_3/ext/gd/gd.c
===
--- php/php-src/branches/PHP_5_3/ext/gd/gd.c2009-12-14 04:00:29 UTC (rev 
292108)
+++ php/php-src/branches/PHP_5_3/ext/gd/gd.c2009-12-14 04:09:18 UTC (rev 
292109)
@@ -4139,7 +4139,7 @@
T1_DeleteAllSizes(*f_ind);
if (T1_ReencodeFont(*f_ind, enc_vector)) {
T1_DeleteEncoding(enc_vector);
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't reencode 
font);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't re-encode 
font);
RETURN_FALSE;
}


Modified: php/php-src/trunk/ext/gd/gd.c
===
--- php/php-src/trunk/ext/gd/gd.c   2009-12-14 04:00:29 UTC (rev 292108)
+++ php/php-src/trunk/ext/gd/gd.c   2009-12-14 04:09:18 UTC (rev 292109)
@@ -3844,7 +3844,7 @@
T1_DeleteAllSizes(*f_ind);
if (T1_ReencodeFont(*f_ind, enc_vector)) {
T1_DeleteEncoding(enc_vector);
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't reencode 
font);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't re-encode 
font);
RETURN_FALSE;
}


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

[PHP-CVS] svn: /php/php-src/trunk/tests/basic/ 027.phpt

2009-12-13 Thread Jani Taskinen

jani Mon, 14 Dec 2009 05:52:49 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292110

Log:
- Fix test

Changed paths:
U   php/php-src/trunk/tests/basic/027.phpt

Modified: php/php-src/trunk/tests/basic/027.phpt
===
--- php/php-src/trunk/tests/basic/027.phpt  2009-12-14 04:09:18 UTC (rev 
292109)
+++ php/php-src/trunk/tests/basic/027.phpt  2009-12-14 05:52:49 UTC (rev 
292110)
@@ -30,4 +30,4 @@
 }
   }
 }
-unicode(106) Input variable nesting level exceeded 10. To increase the limit 
change max_input_nesting_level in php.ini.
+unicode(114) main(): Input variable nesting level exceeded 10. To increase 
the limit change max_input_nesting_level in php.ini.

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS Zend/zend_compile.c

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/readline/tests/readline_add_history_001.phpt branches/PHP_5_2/ext/readline/tests/readline_callback_handler_install_001.phpt branches/PHP_5_2/ext/readl

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/php_cl

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/ph

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS Zend/zend_compile.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo/pdo_stmt.c branches/PHP_5_3/ext/pdo/tests/bug_50458.phpt trunk/ext/pdo/pdo_stmt.c trunk/ext/pdo/tests/bug_50458.phpt

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/gd/gd.c branches/PHP_5_3/ext/gd/gd.c trunk/ext/gd/gd.c

[PHP-CVS] svn: /php/php-src/trunk/tests/basic/ 027.phpt

16 matches

Site Navigation

Mail list logo

Footer information