date:20100211

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/date/php_date.c ext/date/tests/bug49585.phpt tests/security/open_basedir_parse_ini_file.phpt

2010-02-11 Thread Pierre Joye

pajoye   Thu, 11 Feb 2010 11:02:53 +

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

Log:
- Fixed bug #49585 (date_format buffer not long enough for 4 digit years).

Bug: http://bugs.php.net/49585 (Closed) date_format buffer not long enough for 
4 digit years
  
Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   php/php-src/branches/PHP_5_3_2/NEWS
U   php/php-src/branches/PHP_5_3_2/ext/date/php_date.c
A + php/php-src/branches/PHP_5_3_2/ext/date/tests/bug49585.phpt
(from php/php-src/branches/PHP_5_3/ext/date/tests/bug49585.phpt:r294855)
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294814,294816,294825,294849
/php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294814,294816,294825,294849,294855
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS	2010-02-11 10:22:04 UTC (rev 294877)
+++ php/php-src/branches/PHP_5_3_2/NEWS	2010-02-11 11:02:53 UTC (rev 294878)
@@ -19,6 +19,8 @@

 - Fixed bug #50940 Custom content-length set incorrectly in Apache sapis.
   (Brian France, Rasmus)
+- Fixed bug #50930 (Wrong date by php_date.c patch with ancient gcc/glibc
+  versions). (Derick)
 - Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).
   (Ilia)
 - Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
@@ -49,6 +51,8 @@
 - Fixed bug #50632 (filter_input() does not return default value if the
   variable does not exist). (Ilia)
 - Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick)
+- Fixed bug #49585 (date_format buffer not long enough for 4 digit years).
+  (Derick, Adam)
 - Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.)
 - Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
 - Fixed bug #48190 (Content-type parameter boundary is not case-insensitive

Modified: php/php-src/branches/PHP_5_3_2/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_3_2/ext/date/php_date.c	2010-02-11 10:22:04 UTC (rev 294877)
+++ php/php-src/branches/PHP_5_3_2/ext/date/php_date.c	2010-02-11 11:02:53 UTC (rev 294878)
@@ -1126,7 +1126,7 @@
 			case 'Z': length = slprintf(buffer, 32, %d, localtime ? offset-offset : 0); break;

 			/* full date/time */
-			case 'c': length = slprintf(buffer, 32, %04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d,
+			case 'c': length = slprintf(buffer, 96, %04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d,
 			(int) t-y, (int) t-m, (int) t-d,
 			(int) t-h, (int) t-i, (int) t-s,
 			localtime ? ((offset-offset  0) ? '-' : '+') : '+',

Copied: php/php-src/branches/PHP_5_3_2/ext/date/tests/bug49585.phpt (from rev 294855,

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/date/config0.m4 ext/date/lib/parse_date.c ext/date/lib/parse_date.re ext/date/php_date.c ext/date/tests/bug45866.phpt ext/date/tests/bug46268.phpt e

2010-02-11 Thread Pierre Joye

pajoye   Thu, 11 Feb 2010 11:11:47 +

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

Log:
- merge fix for: #45866,#50930, revert fix for #50392, Fixed a bug with the 'r' 
formatting function, added or fixed tests for #45866 and #46268

Bugs: http://bugs.php.net/45866 (Closed) decimal values fed to 
DateTime-modify() causes long execution times
  http://bugs.php.net/50930 (Closed) wrong date by php_date.c patch with 
ancient gcc/glibc versions
  http://bugs.php.net/50392 (Open) date_create_from_format enforces 6 
digits for 'u' format character
  http://bugs.php.net/46268 (Closed) When call DateTime#setTime, it seems 
to be called the last modify method too
  
Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   php/php-src/branches/PHP_5_3_2/ext/date/config0.m4
U   php/php-src/branches/PHP_5_3_2/ext/date/lib/parse_date.c
U   php/php-src/branches/PHP_5_3_2/ext/date/lib/parse_date.re
U   php/php-src/branches/PHP_5_3_2/ext/date/php_date.c
A + php/php-src/branches/PHP_5_3_2/ext/date/tests/bug45866.phpt
(from php/php-src/branches/PHP_5_3/ext/date/tests/bug45866.phpt:r294854)
U   php/php-src/branches/PHP_5_3_2/ext/date/tests/bug46268.phpt
U   php/php-src/branches/PHP_5_3_2/ext/date/tests/oo_002.phpt
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294814,294816,294825,294849,294855
/php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/ext/date/config0.m4
===
--- php/php-src/branches/PHP_5_3_2/ext/date/config0.m4	2010-02-11 11:08:44 UTC (rev 294879)
+++ php/php-src/branches/PHP_5_3_2/ext/date/config0.m4	2010-02-11 11:11:47 UTC (rev 294880)
@@ -16,8 +16,6 @@

 PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h])

-AC_CHECK_FUNCS([llabs])
-
 cat  $ext_builddir/lib/timelib_config.h EOF
 #ifdef PHP_WIN32
 # include config.w32.h

Modified: php/php-src/branches/PHP_5_3_2/ext/date/lib/parse_date.c
===
--- php/php-src/branches/PHP_5_3_2/ext/date/lib/parse_date.c	2010-02-11 11:08:44 UTC (rev 294879)
+++ php/php-src/branches/PHP_5_3_2/ext/date/lib/parse_date.c	2010-02-11 11:11:47 UTC (rev 294880)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Jan  7 07:52:26 2010 */
+/* Generated by re2c 0.13.5 on Wed Feb 10 15:19:23 2010 */
 #line 1 ext/date/lib/parse_date.re
 /*
+--+
@@ -24157,8 +24157,8 @@

 	TIMELIB_CHECK_NUMBER;
 	tptr = ptr;
-	if ((f = timelib_get_nr((char **) ptr, 6)) == TIMELIB_UNSET || (ptr - tptr)  1) {
-		add_pbf_error(s, At least a single digit millisecond could not be found, string, begin);

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

2010-02-11 Thread Ilia Alshanetsky

iliaaThu, 11 Feb 2010 12:32:21 +

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

Log:
Fixed safe_mode validation inside tempnam() when the directory path does not 
end with a /).

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/standard/file.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/file.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-02-11 11:18:34 UTC (rev 294881)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-02-11 12:32:21 UTC (rev 294882)
@@ -1,7 +1,9 @@
 PHPNEWS
 |||
-?? Feb 2010, PHP 5.2.13
+11 Feb 2010, PHP 5.2.13RC2
 - Downgrade bundled PCRE to version 7.9. (Ilia)
+- Fixed safe_mode validation inside tempnam() when the directory path does
+  not end with a /). (Martin Jansen)
 - Fixed a possible open_basedir/safe_mode bypass in session extension
   identified by Grzegorz Stachowiak. (Ilia)


Modified: php/php-src/branches/PHP_5_2/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/file.c2010-02-11 11:18:34 UTC 
(rev 294881)
+++ php/php-src/branches/PHP_5_2/ext/standard/file.c2010-02-11 12:32:21 UTC 
(rev 294882)
@@ -828,7 +828,7 @@
convert_to_string_ex(arg1);
convert_to_string_ex(arg2);

-   if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(arg1), NULL, 
CHECKUID_ALLOW_ONLY_DIR))) {
+   if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(arg1), NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
}


Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-02-11 11:18:34 UTC (rev 294881)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-02-11 12:32:21 UTC (rev 294882)
@@ -15,6 +15,8 @@
 - Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)

+- Fixed safe_mode validation inside tempnam() when the directory path does
+  not end with a /). (Martin Jansen)
 - Fixed a possible open_basedir/safe_mode bypass in session extension
   identified by Grzegorz Stachowiak. (Ilia)
 - Fixed possible crash when a error/warning is raised during php startup.

Modified: php/php-src/branches/PHP_5_3/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/file.c2010-02-11 11:18:34 UTC 
(rev 294881)
+++ php/php-src/branches/PHP_5_3/ext/standard/file.c2010-02-11 12:32:21 UTC 
(rev 294882)
@@ -836,7 +836,7 @@
return;
}

-   if (PG(safe_mode) (!php_checkuid(dir, NULL, 
CHECKUID_ALLOW_ONLY_DIR))) {
+   if (PG(safe_mode) (!php_checkuid(dir, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
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/branches/PHP_5_2/ configure.in main/php_version.h

2010-02-11 Thread Ilia Alshanetsky

iliaaThu, 11 Feb 2010 12:33:17 +

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

Log:
5.2.13RC2

Changed paths:
U   php/php-src/branches/PHP_5_2/configure.in
U   php/php-src/branches/PHP_5_2/main/php_version.h

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2010-02-11 12:32:21 UTC (rev 
294882)
+++ php/php-src/branches/PHP_5_2/configure.in   2010-02-11 12:33:17 UTC (rev 
294883)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=13
-PHP_EXTRA_VERSION=RC1-dev
+PHP_EXTRA_VERSION=RC2
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`


Modified: php/php-src/branches/PHP_5_2/main/php_version.h
===
--- php/php-src/branches/PHP_5_2/main/php_version.h 2010-02-11 12:32:21 UTC 
(rev 294882)
+++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-02-11 12:33:17 UTC 
(rev 294883)
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 13
-#define PHP_EXTRA_VERSION RC1-dev
-#define PHP_VERSION 5.2.13RC1-dev
+#define PHP_EXTRA_VERSION RC2
+#define PHP_VERSION 5.2.13RC2
 #define PHP_VERSION_ID 50213

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

[PHP-CVS] svn: /php/php-src/tags/

2010-02-11 Thread Ilia Alshanetsky

iliaaThu, 11 Feb 2010 12:35:05 +

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

Log:
5.2.13RC2

Changed paths:
A + php/php-src/tags/php_5_2_13RC2/
(from php/php-src/branches/PHP_5_2/:r294883)


Property changes on: php/php-src/tags/php_5_2_13RC2
___
Added: svn:ignore
   + Makefile.objects
Makefile.fragments
Makefile
acconfig.h
aclocal.m4
autom4te.cache
bsd_converted
buildmk.stamp
buildconf.stamp
config.h.in
config.cache
config.log
config.status
config_vars.mk
configuration-parser.c
configuration-parser.h
configuration-parser.output
configuration-scanner.c
configure
conftest
conftest.c
generated_lists
meta_cc
meta_ccld
mkinstalldirs
missing
install-sh
internal_functions.c
libtool
shlibtool
php
php5.spec
stamp-h
test.php3
*.lo
*.la
libs
modules
php-*.tar.gz
want_dependencies
deps
config.nice
php_version.h
*.plg
*.opt
*.ncb
Release
Release_inline
Debug
Release_TS
Release_TSDbg
Release_TS_inline
Debug_TS
results.txt
libs
_libs
include
autom4te.cache
FBCIndex
FBCLockFolder
debug.log
confdefs.h
configure.js
config.nice.bat
ZendEngine1
php_test_results_*.txt
*.gcda
*.gcno
lcov_data
lcov_html
php_lcov.info
tmp-php.ini

Added: svn:mergeinfo
   + /php/php-src/branches/PHP_5_3:284120,288260,288273
/php/php-src/trunk:284726

-- 
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 configure.in main/php_version.h

2010-02-11 Thread Ilia Alshanetsky

iliaaThu, 11 Feb 2010 12:35:44 +

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

Log:
Back to dev

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/configure.in
U   php/php-src/branches/PHP_5_2/main/php_version.h

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-02-11 12:35:05 UTC (rev 294884)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-02-11 12:35:44 UTC (rev 294885)
@@ -1,5 +1,7 @@
 PHPNEWS
 |||
+?? Feb 2010, PHP 5.2.13
+
 11 Feb 2010, PHP 5.2.13RC2
 - Downgrade bundled PCRE to version 7.9. (Ilia)
 - Fixed safe_mode validation inside tempnam() when the directory path does

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2010-02-11 12:35:05 UTC (rev 
294884)
+++ php/php-src/branches/PHP_5_2/configure.in   2010-02-11 12:35:44 UTC (rev 
294885)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=13
-PHP_EXTRA_VERSION=RC2
+PHP_EXTRA_VERSION=RC3-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`


Modified: php/php-src/branches/PHP_5_2/main/php_version.h
===
--- php/php-src/branches/PHP_5_2/main/php_version.h 2010-02-11 12:35:05 UTC 
(rev 294884)
+++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-02-11 12:35:44 UTC 
(rev 294885)
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 13
-#define PHP_EXTRA_VERSION RC2
-#define PHP_VERSION 5.2.13RC2
+#define PHP_EXTRA_VERSION RC3-dev
+#define PHP_VERSION 5.2.13RC3-dev
 #define PHP_VERSION_ID 50213

-- 
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_2/ NEWS ext/mysql/php_mysql.c tests/security/open_basedir_parse_ini_file.phpt

2010-02-11 Thread Johannes Schlüter

johannes Thu, 11 Feb 2010 17:14:44 +

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

Log:
merge r294762: Fix bug#50416
PROCEDURE db.myproc can't return a result set in the given context (andrey)

Bug: http://bugs.php.net/50416 (Closed) PROCEDURE db.myproc can't return a 
result set in the given context
  
Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   php/php-src/branches/PHP_5_3_2/NEWS
U   php/php-src/branches/PHP_5_3_2/ext/mysql/php_mysql.c
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726
   + 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-02-11 16:45:01 UTC (rev 294890)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-11 17:14:44 UTC (rev 294891)
@@ -51,6 +51,8 @@
 - Fixed bug #50632 (filter_input() does not return default value if the
   variable does not exist). (Ilia)
 - Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick)
+- Fixed bug #50416 (PROCEDURE db.myproc can't return a result set in the given
+  context). (Andrey)
 - Fixed bug #49585 (date_format buffer not long enough for 4 digit years).
   (Derick, Adam)
 - Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.)

Modified: php/php-src/branches/PHP_5_3_2/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_3_2/ext/mysql/php_mysql.c2010-02-11 
16:45:01 UTC (rev 294890)
+++ php/php-src/branches/PHP_5_3_2/ext/mysql/php_mysql.c2010-02-11 
17:14:44 UTC (rev 294891)
@@ -668,6 +668,9 @@
client_flags ^= CLIENT_LOCAL_FILES;
}

+#ifdef CLIENT_MULTI_RESULTS
+   client_flags |= CLIENT_MULTI_RESULTS; /* compatibility with 
5.2, see bug#50416 */
+#endif
 #ifdef CLIENT_MULTI_STATEMENTS
client_flags = ~CLIENT_MULTI_STATEMENTS;   /* don't allow 
multi_queries via connect parameter */
 #endif


Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
   -

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/spl/spl_dllist.h ext/spl/spl_fixedarray.h ext/spl/spl_heap.h main/php_getopt.h tests/security/open_basedir_parse_ini_file.phpt

2010-02-11 Thread Johannes Schlüter

johannes Thu, 11 Feb 2010 17:24:43 +

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

Log:
Merg extern declarations:

r293721: Add extern declarations for fixing the build with some compilers 
(johannes)
r293730: A few more extern declarations (johannes)

Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   php/php-src/branches/PHP_5_3_2/ext/spl/spl_dllist.h
U   php/php-src/branches/PHP_5_3_2/ext/spl/spl_fixedarray.h
U   php/php-src/branches/PHP_5_3_2/ext/spl/spl_heap.h
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U   php/php-src/branches/PHP_5_3_2/main/php_getopt.h
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/ext/spl/spl_dllist.h
===
--- php/php-src/branches/PHP_5_3_2/ext/spl/spl_dllist.h	2010-02-11 17:14:44 UTC (rev 294891)
+++ php/php-src/branches/PHP_5_3_2/ext/spl/spl_dllist.h	2010-02-11 17:24:43 UTC (rev 294892)
@@ -24,9 +24,9 @@
 #include php.h
 #include php_spl.h

-PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList;
-PHPAPI zend_class_entry *spl_ce_SplQueue;
-PHPAPI zend_class_entry *spl_ce_SplStack;
+extern PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList;
+extern PHPAPI zend_class_entry *spl_ce_SplQueue;
+extern PHPAPI zend_class_entry *spl_ce_SplStack;

 PHP_MINIT_FUNCTION(spl_dllist);


Modified: php/php-src/branches/PHP_5_3_2/ext/spl/spl_fixedarray.h
===
--- php/php-src/branches/PHP_5_3_2/ext/spl/spl_fixedarray.h	2010-02-11 17:14:44 UTC (rev 294891)
+++ php/php-src/branches/PHP_5_3_2/ext/spl/spl_fixedarray.h	2010-02-11 17:24:43 UTC (rev 294892)
@@ -22,7 +22,7 @@
 #ifndef SPL_FIXEDARRAY_H
 #define SPL_FIXEDARRAY_H

-PHPAPI zend_class_entry *spl_ce_SplFixedArray;
+extern PHPAPI zend_class_entry *spl_ce_SplFixedArray;

 PHP_MINIT_FUNCTION(spl_fixedarray);


Modified: php/php-src/branches/PHP_5_3_2/ext/spl/spl_heap.h
===
--- php/php-src/branches/PHP_5_3_2/ext/spl/spl_heap.h	2010-02-11 17:14:44 UTC (rev 294891)
+++ php/php-src/branches/PHP_5_3_2/ext/spl/spl_heap.h	2010-02-11 17:24:43 UTC (rev 294892)
@@ -24,11 +24,11 @@
 #include php.h
 #include php_spl.h

-PHPAPI zend_class_entry *spl_ce_SplHeap;
-PHPAPI zend_class_entry *spl_ce_SplMinHeap;
-PHPAPI zend_class_entry *spl_ce_SplMaxHeap;
+extern PHPAPI zend_class_entry *spl_ce_SplHeap;
+extern PHPAPI zend_class_entry *spl_ce_SplMinHeap;
+extern PHPAPI zend_class_entry *spl_ce_SplMaxHeap;

-PHPAPI zend_class_entry *spl_ce_SplPriorityQueue;
+extern PHPAPI zend_class_entry *spl_ce_SplPriorityQueue;

 PHP_MINIT_FUNCTION(spl_heap);



Property changes on:

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/tidy/tests/bug_50558.phpt ext/tidy/tidy.c tests/security/open_basedir_parse_ini_file.phpt

2010-02-11 Thread Johannes Schlüter

johannes Thu, 11 Feb 2010 17:36:40 +

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

Log:
merge r292620: Fixed bug #50558 (Broken object model when extending tidy)
(pierrick)

Bug: http://bugs.php.net/50558 (Closed) Broken object model when extending tidy
  
Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   php/php-src/branches/PHP_5_3_2/NEWS
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
A + php/php-src/branches/PHP_5_3_2/ext/tidy/tests/bug_50558.phpt
(from 
php/php-src/branches/PHP_5_3/ext/tidy/tests/bug_50558.phpt:r292620)
U   php/php-src/branches/PHP_5_3_2/ext/tidy/tidy.c
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS	2010-02-11 17:24:43 UTC (rev 294892)
+++ php/php-src/branches/PHP_5_3_2/NEWS	2010-02-11 17:36:40 UTC (rev 294893)
@@ -102,6 +102,7 @@
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)

+- Fixed bug #50558 (Broken object model when extending tidy). (Pierrick)
 - Fixed bug #50540 (Crash while running ldap_next_reference test cases).
   (Sriram)
 - Fixed bug #50519 (segfault in garbage collection when using set_error_handler


Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
   +

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/crypt_sha256.c ext/standard/crypt_sha512.c tests/security/open_basedir_parse_ini_file.phpt

2010-02-11 Thread Johannes Schlüter

johannes Thu, 11 Feb 2010 17:53:22 +

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

Log:
merge r293409: Fixes #50496. Drop stdbool.h dependency as it requires _STDC_C99
set on some systems. (dsp)

Bug: http://bugs.php.net/50496 (Closed) Use of stdbool.h is valid only in a 
c99 compilation environment.
  
Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c
U   php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c	2010-02-11 17:36:40 UTC (rev 294893)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c	2010-02-11 17:53:22 UTC (rev 294894)
@@ -10,7 +10,6 @@

 #ifdef PHP_WIN32
 # include win32/php_stdint.h
-# include win32/php_stdbool.h
 # define __alignof__ __alignof
 # define alloca _alloca
 #else
@@ -368,7 +367,7 @@
 	char *s_bytes;
 	/* Default number of rounds.  */
 	size_t rounds = ROUNDS_DEFAULT;
-	bool rounds_custom = false;
+	zend_bool rounds_custom = 0;

 	/* Find beginning of salt string.  The prefix should normally always
 	be present.  Just in case it is not.  */
@@ -384,7 +383,7 @@
 		if (*endp == '$') {
 			salt = endp + 1;
 			rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX));
-			rounds_custom = true;
+			rounds_custom = 1;
 		}
 	}


Modified: php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c	2010-02-11 17:36:40 UTC (rev 294893)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c	2010-02-11 17:53:22 UTC (rev 294894)
@@ -9,7 +9,6 @@
 #include limits.h
 #ifdef PHP_WIN32
 # include win32/php_stdint.h
-# include win32/php_stdbool.h
 # define __alignof__ __alignof
 # define alloca _alloca
 #else
@@ -395,7 +394,7 @@
 	char *s_bytes;
 	/* Default number of rounds.  */
 	size_t rounds = ROUNDS_DEFAULT;
-	bool rounds_custom = false;
+	zend_bool rounds_custom = 0;

 	/* Find beginning of salt string.  The prefix should normally always
 	 be present.  Just in case it is not.  */
@@ -412,7 +411,7 @@
 		if (*endp == '$') {
 			salt = endp + 1;
 			rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX));
-			rounds_custom = true;
+			rounds_custom = 1;
 		}
 	}



Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified:

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/config.m4 tests/security/open_basedir_parse_ini_file.phpt

2010-02-11 Thread Johannes Schlüter

johannes Thu, 11 Feb 2010 18:00:21 +

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

Log:
merge 294866: Spelling typo in new check message (sixd)

Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   php/php-src/branches/PHP_5_3_2/ext/standard/config.m4
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,29!
 4849,294854-294855
/php/php-src/trunk:284726
   + 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,29!
 4849,294854-294855,294866
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/ext/standard/config.m4
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/config.m4   2010-02-11 
17:53:22 UTC (rev 294894)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/config.m4   2010-02-11 
18:00:21 UTC (rev 294895)
@@ -265,7 +265,7 @@
 ac_cv_attribute_aligned=no
   ])])
   if test $ac_cv_attribute_aligned = yes; then
-AC_DEFINE([HAVE_ATTRIBUTE_ALIGNED], 1, [Wheter the compiler supports 
__attribute__ ((__aligned__))])
+AC_DEFINE([HAVE_ATTRIBUTE_ALIGNED], 1, [whether the compiler supports 
__attribute__ ((__aligned__))])
   fi




Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292620,292635,292716,292719,292765,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293409,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
   +

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/standard/file.c tests/security/open_basedir_parse_ini_file.phpt

2010-02-11 Thread Johannes Schlüter

johannes Thu, 11 Feb 2010 18:03:57 +

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

Log:
Merge 294882: Fixed safe_mode validation inside tempnam() when the directory
path does not end (iliaa)

Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   php/php-src/branches/PHP_5_3_2/NEWS
U   php/php-src/branches/PHP_5_3_2/ext/standard/file.c
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,29!
 4849,294854-294855,294866
/php/php-src/trunk:284726
   + 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,29!
 4849,294854-294855,294866,294882
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-02-11 18:00:21 UTC (rev 294895)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-11 18:03:57 UTC (rev 294896)
@@ -9,6 +9,8 @@
   (Ilia)
 - Added stream_resolve_include_path(). (Mikko)

+- Fixed safe_mode validation inside tempnam() when the directory path does
+  not end with a /). (Martin Jansen)
 - Fixed a possible open_basedir/safe_mode bypass in session extension
   identified by Grzegorz Stachowiak. (Ilia)
 - Fixed possible crash when a error/warning is raised during php startup.

Modified: php/php-src/branches/PHP_5_3_2/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/file.c  2010-02-11 18:00:21 UTC 
(rev 294895)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/file.c  2010-02-11 18:03:57 UTC 
(rev 294896)
@@ -836,7 +836,7 @@
return;
}

-   if (PG(safe_mode) (!php_checkuid(dir, NULL, 
CHECKUID_ALLOW_ONLY_DIR))) {
+   if (PG(safe_mode) (!php_checkuid(dir, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
}



Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
   -

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

2010-02-11 Thread Johannes Schlüter

johannes Thu, 11 Feb 2010 19:51:28 +

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

Log:
merge NEWS entries missing here

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

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-02-11 18:03:57 UTC (rev 294896)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-11 19:51:28 UTC (rev 294897)
@@ -4,6 +4,9 @@
 - Upgraded bundled sqlite to version 3.6.22. (Ilia)
 - Upgraded bundled libmagic to version 5.03. (Mikko)

+- Improved LCG entropy. (Rasmus, Samy Kamkar)
+
+- Added libpng 1.4.0 support. (Pierre)
 - Added support for DISABLE_AUTHENTICATOR for imap_open. (Pierre)
 - Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
   (Ilia)
@@ -19,7 +22,9 @@
   links or invalid paths. (Pierre)
 - Fixed error output to stderr on Windows. (Pierre)

-- Fixed bug #50940 Custom content-length set incorrectly in Apache sapis.
+- Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files).
+  (Jani)
+- Fixed bug #50940 (Custom content-length set incorrectly in Apache SAPIs).
   (Brian France, Rasmus)
 - Fixed bug #50930 (Wrong date by php_date.c patch with ancient gcc/glibc
   versions). (Derick)
@@ -55,15 +60,23 @@
 - Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick)
 - Fixed bug #50416 (PROCEDURE db.myproc can't return a result set in the given
   context). (Andrey)
+- Fixed bug #49600 (imageTTFText text shifted right). (Takeshi Abe)
 - Fixed bug #49585 (date_format buffer not long enough for 4 digit years).
   (Derick, Adam)
 - Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.)
+- Fixed bug #49463 (setAttributeNS fails setting default namespace). (Rob)
+- Fixed bug #48811 (Directives in PATH section do not get applied to
+  subdirectories). (Patch by: ct at swin dot edu dot au)
 - Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
 - Fixed bug #48190 (Content-type parameter boundary is not case-insensitive
   in HTTP uploads). (Ilia)
 - Fixed bug #47409 (extract() problem with array containing word this).
   (Ilia, chrisstocktonaz at gmail dot com)
+- Fixed bug #47281 ($php_errormsg is limited in size of characters)
+  (Oracle Corp.)
 - Fixed bug #44827 (define() allows :: in constant names). (Ilia)
+- Fixed bug #44098 (imap_utf8() returns only capital letters).
+  (steffen at dislabs dot de, Pierre)

 22 Dec 2009, PHP 5.3.2 RC 1
 - Upgraded bundled sqlite to version 3.6.21. (Ilia)

-- 
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_2/ NEWS

2010-02-11 Thread Pierre Joye

pajoye   Thu, 11 Feb 2010 21:12:11 +

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

Log:
- missing entries

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

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-02-11 20:08:31 UTC (rev 294898)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-11 21:12:11 UTC (rev 294899)
@@ -21,6 +21,10 @@
 - Fixed possible bad behavior of rename on windows when used with symbolic
   links or invalid paths. (Pierre)
 - Fixed error output to stderr on Windows. (Pierre)
+- Fixed memory leaks in is_writable/readable/etc on Windows. (Pierre)
+- Fixed memory leaks in the ACL function on Windows. (Pierre)
+- Fixed memory leak in the realpath cache on Windows. (Pierre)
+- Fixed memory leak in zip_close. (Pierre)

 - Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files).
   (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_3/ NEWS Zend/zend_API.c Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h ext/standard/tests/general_functions/bug49847.phpt ext/standard/var_un

2010-02-11 Thread Pierre Joye

pajoye   Thu, 11 Feb 2010 21:17:13 +

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

Log:
- those are in 5.3.2 now, merge to 5.3.2 section is coming

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/Zend/zend_API.c
U   php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.c
U   php/php-src/branches/PHP_5_3/Zend/zend_language_scanner_defs.h
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug49847.phpt
U   php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-02-11 21:12:11 UTC (rev 294899)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-02-11 21:17:13 UTC (rev 294900)
@@ -2,84 +2,10 @@
 |||
 ?? ??? 20??, PHP 5.3.3
 - Upgraded bundled PCRE to version 8.01. (Ilia)
-- Upgraded bundled sqlite to version 3.6.22. (Ilia)
-- Upgraded bundled libmagic to version 5.03. (Mikko)

-- Improved LCG entropy. (Rasmus, Samy Kamkar)
-
-- Added libpng 1.4.0 support. (Pierre)
-- Added support for DISABLE_AUTHENTICATOR for imap_open. (Pierre)
-- Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
-  (Ilia)
-- Added stream_resolve_include_path(). (Mikko)
 - Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)

-- Fixed safe_mode validation inside tempnam() when the directory path does
-  not end with a /). (Martin Jansen)
-- Fixed a possible open_basedir/safe_mode bypass in session extension
-  identified by Grzegorz Stachowiak. (Ilia)
-- Fixed possible crash when a error/warning is raised during php startup.
-  (Pierre)
-- Fixed possible bad behavior of rename on windows when used with symbolic
-  links or invalid paths. (Pierre)
-- Fixed error output to stderr on Windows. (Pierre)
-
-- Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files).
-  (Jani)
-- Fixed bug #50940 (Custom content-length set incorrectly in Apache SAPIs).
-  (Brian France, Rasmus)
-- Fixed bug #50930 (Wrong date by php_date.c patch with ancient gcc/glibc
-  versions). (Derick)
-- Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).
-  (Ilia)
-- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
-  (Ilia, hanno at hboeck dot de)
-- Fixed bug #50847 (strip_tags() removes all tags greater then 1023 bytes
-  long). (Ilia)
-- Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored).
-  (Ilia)
-- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
-  authentication). (Jani)
-- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams).
-  (vnegrier at optilian dot com, Ilia)
-- Fixed bug #50761 (system.multiCall crashes in xmlrpc extension).
-  (hiroaki dot kawai at gmail dot com, Ilia)
-- Fixed bug #50756 (CURLOPT_FTP_SKIP_PASV_IP does not exist). (Sriram)
-- Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia)
-- Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0).
-  (Joey, Ilia)
-- Fixed bug #50723 (Bug in garbage collector causes crash). (Dmitry)
-- Fixed bug #50690 (putenv does not set ENV when the value is only one char).
-  (Pierre)
-- Fixed bug #50680 (strtotime() does not support eighth ordinal number). (Ilia)
-- Fixed bug #50661 (DOMDocument::loadXML does not allow UTF-16). (Rob)
-- Fixed bug #50657 (copy() with an empty (zero-byte) HTTP source succeeds but
-  returns false). (Ilia)
-- Fixed bug #50636 (MySQLi_Result sets values before calling constructor).
-  (Pierrick)
-- Fixed bug #50632 (filter_input() does not return default value if the
-  variable does not exist). (Ilia)
-- Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick)
-- Fixed bug #50416 (PROCEDURE db.myproc can't return a result set in the given
-  context). (Andrey)
-- Fixed bug #49585 (date_format buffer not long enough for 4 digit years).
-  (Derick, Adam)
-- Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.)
-- Fixed bug #49463 (setAttributeNS fails setting default namespace). (Rob)
-- Fixed bug #48811 (Directives in PATH section do not get applied to
-  sub-directories). (Patch by: ct at swin dot edu dot au)
-- Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
-- Fixed bug #48190 (Content-type parameter boundary is not case-insensitive
-  in HTTP uploads). (Ilia)
-- Fixed bug #47409 (extract() problem with array containing word this).
-  (Ilia, chrisstocktonaz at gmail dot com)
-- Fixed bug #47281 ($php_errormsg is limited in size of characters)
-  (Oracle Corp.)
-- Fixed bug #44827 (define() allows :: in constant names). (Ilia)
-- Fixed bug #44098 (imap_utf8() returns only capital letters).
-  (steffen at dislabs dot de, Pierre)
-
 ?? ???

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli.c branches/PHP_5_3/ext/mysqli/tests/bug50636.phpt trunk/ext/mysqli/mysqli.c trunk/ext/mysqli/tests/bug50636.phpt

2010-02-11 Thread Johannes Schlüter

johannes Thu, 11 Feb 2010 21:42:48 +

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

Log:
revert 293939 Fixed bug #50636 (MySQLi_Result sets values before calling
constructor)

Bug: http://bugs.php.net/50636 (Closed) MySQLi_Result sets values before 
calling constructor
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
D   php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug50636.phpt
U   php/php-src/trunk/ext/mysqli/mysqli.c
D   php/php-src/trunk/ext/mysqli/tests/bug50636.phpt

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c2010-02-11 21:17:13 UTC 
(rev 294900)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c2010-02-11 21:42:48 UTC 
(rev 294901)
@@ -1204,6 +1204,7 @@
zval *retval_ptr;

object_and_properties_init(return_value, ce, NULL);
+   zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 
TSRMLS_CC);

if (ce-constructor) {
fci.size = sizeof(fci);
@@ -1259,8 +1260,6 @@
} else if (ctor_params) {

zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, 
Class %s does not have a constructor hence you cannot use ctor_params, 
ce-name);
}
-
-   zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 
TSRMLS_CC);
}
 }
 /* }}} */

Deleted: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug50636.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug50636.phpt 2010-02-11 
21:17:13 UTC (rev 294900)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug50636.phpt 2010-02-11 
21:42:48 UTC (rev 294901)
@@ -1,35 +0,0 @@
---TEST--
-Bug #50636 (MySQLi_Result sets values before calling constructor)
---SKIPIF--
-?php
-require_once('skipif.inc');
-require_once('skipifconnectfailure.inc');
-?
---FILE--
-?php
-   include (connect.inc);
-
-class Book {
-private $title = 0;
-
-function __construct() {
-$this-title = 'foobar';
-}
-
-function __set($name, $value) {
-$this-{$name}   = $value;
-}
-}
-
-$link = new mysqli($host, $user, $passwd);
-var_dump($link-query('SELECT PHP AS title, Rasmus AS 
author')-fetch_object('Book'));
-echo done!;
-?
---EXPECTF--
-object(Book)#%d (2) {
-  [title:Book:private]=
-  string(3) PHP
-  [author]=
-  string(6) Rasmus
-}
-done!

Modified: php/php-src/trunk/ext/mysqli/mysqli.c
===
--- php/php-src/trunk/ext/mysqli/mysqli.c   2010-02-11 21:17:13 UTC (rev 
294900)
+++ php/php-src/trunk/ext/mysqli/mysqli.c   2010-02-11 21:42:48 UTC (rev 
294901)
@@ -1236,6 +1236,7 @@
zval *retval_ptr;

object_and_properties_init(return_value, ce, NULL);
+   zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 
TSRMLS_CC);

if (ce-constructor) {
fci.size = sizeof(fci);
@@ -1291,8 +1292,6 @@
} else if (ctor_params) {

zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, 
Class %v does not have a constructor hence you cannot use ctor_params, 
ce-name);
}
-
-   zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 
TSRMLS_CC);
}
 }
 /* }}} */

Deleted: php/php-src/trunk/ext/mysqli/tests/bug50636.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/bug50636.phpt2010-02-11 21:17:13 UTC 
(rev 294900)
+++ php/php-src/trunk/ext/mysqli/tests/bug50636.phpt2010-02-11 21:42:48 UTC 
(rev 294901)
@@ -1,35 +0,0 @@
---TEST--
-Bug #50636 (MySQLi_Result sets values before calling constructor)
---SKIPIF--
-?php
-require_once('skipif.inc');
-require_once('skipifconnectfailure.inc');
-?
---FILE--
-?php
-   include (connect.inc);
-
-class Book {
-private $title = 0;
-
-function __construct() {
-$this-title = 'foobar';
-}
-
-function __set($name, $value) {
-$this-{$name}   = $value;
-}
-}
-
-$link = new mysqli($host, $user, $passwd);
-var_dump($link-query('SELECT PHP AS title, Rasmus AS 
author')-fetch_object('Book'));
-echo done!;
-?
---EXPECTF--
-object(Book)#%d (2) {
-  [%u|b%title:%u|b%Book:private]=
-  %unicode|string%(3) PHP
-  [%u|b%author]=
-  %unicode|string%(6) Rasmus
-}
-done!

-- 
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/ext/pdo/pdo_stmt.c branches/PHP_5_3/ext/pdo/tests/pdo_005.phpt branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt branches/PHP_5_3/ext/p

2010-02-11 Thread Johannes Schlüter

johannes Thu, 11 Feb 2010 22:14:06 +

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

Log:
Revert 290786: Fixed bug #49521 (PDO fetchObject sets values before calling
constructor)

Bug: http://bugs.php.net/49521 (Closed) PDO fetchObject sets values before 
calling constructor
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c
U   php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_005.phpt
U   
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
D   php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/bug49521.phpt
U   php/php-src/trunk/ext/pdo/pdo_stmt.c
U   php/php-src/trunk/ext/pdo/tests/pdo_005.phpt
U   php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
D   php/php-src/trunk/ext/pdo_sqlite/tests/bug49521.phpt

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	2010-02-11 22:13:22 UTC (rev 294902)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c	2010-02-11 22:14:06 UTC (rev 294903)
@@ -1034,32 +1034,6 @@
 			}
 		}

-		switch (how) {
-			case PDO_FETCH_CLASS:
-if (ce-constructor  !(flags  (PDO_FETCH_PROPS_LATE | PDO_FETCH_SERIALIZE))) {
-	stmt-fetch.cls.fci.object_ptr = return_value;
-	stmt-fetch.cls.fcc.object_ptr = return_value;
-	if (zend_call_function(stmt-fetch.cls.fci, stmt-fetch.cls.fcc TSRMLS_CC) == FAILURE) {
-		pdo_raise_impl_error(stmt-dbh, stmt, HY000, could not call class constructor TSRMLS_CC);
-		return 0;
-	} else {
-		if (stmt-fetch.cls.retval_ptr) {
-			zval_ptr_dtor(stmt-fetch.cls.retval_ptr);
-		}
-	}
-}
-if (flags  PDO_FETCH_CLASSTYPE) {
-	do_fetch_opt_finish(stmt, 0 TSRMLS_CC);
-	stmt-fetch.cls.ce = old_ce;
-	stmt-fetch.cls.ctor_args = old_ctor_args;
-	stmt-fetch.cls.fci.param_count = old_arg_count;
-}
-break;
-
-			default:
-break;
-		}
-
 		for (idx = 0; i  stmt-column_count; i++, idx++) {
 			zval *val;
 			MAKE_STD_ZVAL(val);
@@ -1193,6 +1167,27 @@
 		}

 		switch (how) {
+			case PDO_FETCH_CLASS:
+if (ce-constructor  !(flags  (PDO_FETCH_PROPS_LATE | PDO_FETCH_SERIALIZE))) {
+	stmt-fetch.cls.fci.object_ptr = return_value;
+	stmt-fetch.cls.fcc.object_ptr = return_value;
+	if (zend_call_function(stmt-fetch.cls.fci, stmt-fetch.cls.fcc TSRMLS_CC) == FAILURE) {
+		pdo_raise_impl_error(stmt-dbh, stmt, HY000, could not call class constructor TSRMLS_CC);
+		return 0;
+	} else {
+		if (stmt-fetch.cls.retval_ptr) {
+			zval_ptr_dtor(stmt-fetch.cls.retval_ptr);
+		}
+	}
+}
+if (flags  PDO_FETCH_CLASSTYPE) {
+	do_fetch_opt_finish(stmt, 0 TSRMLS_CC);
+	stmt-fetch.cls.ce = old_ce;
+	stmt-fetch.cls.ctor_args = old_ctor_args;
+	stmt-fetch.cls.fci.param_count = old_arg_count;
+}
+break;
+
 			case PDO_FETCH_FUNC:
 stmt-fetch.func.fci.param_count = idx;
 stmt-fetch.func.fci.retval_ptr_ptr = retval;

Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_005.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_005.phpt	2010-02-11 22:13:22 UTC (rev 294902)
+++ php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_005.phpt	2010-02-11 22:14:06 UTC (rev 294903)
@@ -34,7 +34,7 @@

 	public function __construct($row)
 	{
-		echo __METHOD__ . ($row)\n;
+		echo __METHOD__ . ($row,{$this-id})\n;
 		$this-row = $row++;
 	}
 }
@@ -108,9 +108,9 @@
 string(2) CC
   }
 }
-TestDerived::__construct(0)
-TestDerived::__construct(1)
-TestDerived::__construct(2)
+TestDerived::__construct(0,1)
+TestDerived::__construct(1,2)
+TestDerived::__construct(2,3)
 array(3) {
   [0]=
   object(TestDerived)#%d (5) {
@@ -151,4 +151,4 @@
 [val2]=
 string(2) CC
   }
-}
+}
\ No newline at end of file

Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt	2010-02-11 22:13:22 UTC (rev 294902)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt	2010-02-11 22:14:06 UTC (rev 294903)
@@ -71,21 +71,21 @@
 MySQLPDOTest::dropTestTable();
 ?
 --EXPECTF--
-myclass::__construct(0, 1): 0 / 0
 myclass::__set(id, -'1'-) 1
 myclass::__set(, -''-) 2
 myclass::__set(null, -NULL-) 3
 myclass::__set(, -''-) 4
-myclass::__construct(1, 2): 4 / 0
+myclass::__construct(0, 1): 4 / 4
 myclass::__set(id, -'2'-) 1
 myclass::__set(, -''-) 2
 myclass::__set(null, -NULL-) 3
 myclass::__set(, -''-) 4
-myclass::__construct(2, 3): 8 / 0
+myclass::__construct(1, 2): 8 / 4
 myclass::__set(id, -'3'-) 1
 myclass::__set(, -''-) 2
 myclass::__set(null, -NULL-) 3
 myclass::__set(, -''-) 4
+myclass::__construct(2, 3): 12 / 4

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

2010-02-11 Thread Pierre Joye

pajoye   Thu, 11 Feb 2010 22:37:50 +

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

Log:
- fix php_date_llabs declaration

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/date/php_date.c
U   php/php-src/branches/PHP_5_3/ext/date/php_date.c
U   php/php-src/branches/PHP_5_3_2/ext/date/php_date.c
U   php/php-src/trunk/ext/date/php_date.c

Modified: php/php-src/branches/PHP_5_2/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_2/ext/date/php_date.c2010-02-11 22:29:23 UTC 
(rev 294905)
+++ php/php-src/branches/PHP_5_2/ext/date/php_date.c2010-02-11 22:37:50 UTC 
(rev 294906)
@@ -31,11 +31,13 @@
 #include time.h

 #ifdef PHP_WIN32
-# include win32/php_stdint.h
+static __inline __int64 php_date_llabs( __int64 i ) { return i = 0? i: -i; }
+#elif defined(__GNUC__)  __GNUC__  3
+static __inline __int64_t php_date_llabs( __int64_t i ) { return i = 0 ? i : 
-i; }
+#else
+static __inline long long php_date_llabs( long long i ) { return i = 0 ? i : 
-i; }
 #endif

-static __inline long long php_date_llabs( long long i ) { return i = 0 ? i : 
-i; }
-
 /* {{{ arginfo */
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)

Modified: php/php-src/branches/PHP_5_3/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_3/ext/date/php_date.c2010-02-11 22:29:23 UTC 
(rev 294905)
+++ php/php-src/branches/PHP_5_3/ext/date/php_date.c2010-02-11 22:37:50 UTC 
(rev 294906)
@@ -32,11 +32,13 @@
 #include time.h

 #ifdef PHP_WIN32
-# include win32/php_stdint.h
+static __inline __int64 php_date_llabs( __int64 i ) { return i = 0? i: -i; }
+#elif defined(__GNUC__)  __GNUC__  3
+static __inline __int64_t php_date_llabs( __int64_t i ) { return i = 0 ? i : 
-i; }
+#else
+static __inline long long php_date_llabs( long long i ) { return i = 0 ? i : 
-i; }
 #endif

-static __inline long long php_date_llabs( long long i ) { return i = 0 ? i : 
-i; }
-
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
ZEND_ARG_INFO(0, format)

Modified: php/php-src/branches/PHP_5_3_2/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_3_2/ext/date/php_date.c  2010-02-11 22:29:23 UTC 
(rev 294905)
+++ php/php-src/branches/PHP_5_3_2/ext/date/php_date.c  2010-02-11 22:37:50 UTC 
(rev 294906)
@@ -32,11 +32,13 @@
 #include time.h

 #ifdef PHP_WIN32
-# include win32/php_stdint.h
+static __inline __int64 php_date_llabs( __int64 i ) { return i = 0? i: -i; }
+#elif defined(__GNUC__)  __GNUC__  3
+static __inline __int64_t php_date_llabs( __int64_t i ) { return i = 0 ? i : 
-i; }
+#else
+static __inline long long php_date_llabs( long long i ) { return i = 0 ? i : 
-i; }
 #endif

-static __inline long long php_date_llabs( long long i ) { return i = 0 ? i : 
-i; }
-
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
ZEND_ARG_INFO(0, format)

Modified: php/php-src/trunk/ext/date/php_date.c
===
--- php/php-src/trunk/ext/date/php_date.c   2010-02-11 22:29:23 UTC (rev 
294905)
+++ php/php-src/trunk/ext/date/php_date.c   2010-02-11 22:37:50 UTC (rev 
294906)
@@ -33,11 +33,13 @@
 #include unicode/udat.h

 #ifdef PHP_WIN32
-# include win32/php_stdint.h
+static __inline __int64 php_date_llabs( __int64 i ) { return i = 0? i: -i; }
+#elif defined(__GNUC__)  __GNUC__  3
+static __inline __int64_t php_date_llabs( __int64_t i ) { return i = 0 ? i : 
-i; }
+#else
+static __inline long long php_date_llabs( long long i ) { return i = 0 ? i : 
-i; }
 #endif

-static __inline long long php_date_llabs( long long i ) { return i = 0 ? i : 
-i; }
-
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
ZEND_ARG_INFO(0, format)

-- 
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/ext/oci8/ package.xml

2010-02-11 Thread Christopher Jones

sixd Thu, 11 Feb 2010 22:43:54 +

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

Log:
Release PECL OCI8 1.4.1

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/oci8/package.xml

Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml
===
--- php/php-src/branches/PHP_5_3/ext/oci8/package.xml   2010-02-11 22:39:40 UTC 
(rev 294907)
+++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml   2010-02-11 22:43:54 UTC 
(rev 294908)
@@ -33,7 +33,7 @@
   activeno/active
  /lead

- date2010-??-??/date
+ date2010-02-11/date
  time15:00:00/time

  version

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

[PHP-CVS] svn: /SVNROOT/ global_avail

2010-02-11 Thread Rasmus Lerdorf

rasmus   Thu, 11 Feb 2010 22:57:41 +

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

Log:
pecl/xdom and phpdoc karma for Darren Hill

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2010-02-11 22:56:41 UTC (rev 294912)
+++ SVNROOT/global_avail2010-02-11 22:57:41 UTC (rev 294913)
@@ -318,6 +318,7 @@
 avail|dmendolia,patrickallaert,dragoonis|pecl/apm,phpdoc
 avail|fat|php/php-src/*/sapi/fpm
 avail|bd808|pecl/yaml,phpdoc
+avail|dchill42pecl|pecl/xdom,phpdoc

 # Objective-C bridge
 avail|wez,jan|php/php-objc

-- 
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_2/ ext/intl/resourcebundle/resourcebundle_class.c ext/intl/resourcebundle/resourcebundle_iterator.c ext/intl/tests/rb_build.php ext/intl/tests/resourcebund

2010-02-11 Thread Pierre Joye

pajoye   Thu, 11 Feb 2010 23:55:19 +

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

Log:
- missing patch for the resourcebunlde support in intl

Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   
php/php-src/branches/PHP_5_3_2/ext/intl/resourcebundle/resourcebundle_class.c
U   
php/php-src/branches/PHP_5_3_2/ext/intl/resourcebundle/resourcebundle_iterator.c
D   php/php-src/branches/PHP_5_3_2/ext/intl/tests/rb_build.php
A + php/php-src/branches/PHP_5_3_2/ext/intl/tests/resourcebundle.build
(from 
php/php-src/branches/PHP_5_3/ext/intl/tests/resourcebundle.build:r293437)
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855,294866,294882
/php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293437,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293813,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855,294866,294882
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/ext/intl/resourcebundle/resourcebundle_class.c
===
--- php/php-src/branches/PHP_5_3_2/ext/intl/resourcebundle/resourcebundle_class.c	2010-02-11 23:43:40 UTC (rev 294928)
+++ php/php-src/branches/PHP_5_3_2/ext/intl/resourcebundle/resourcebundle_class.c	2010-02-11 23:55:19 UTC (rev 294929)
@@ -87,7 +87,7 @@
 	char *pbuf;

 	zval  *object = return_value;
-	ResourceBundle_object *rb = (ResourceBundle_object *) zend_object_store_get_object( object );
+	ResourceBundle_object *rb = (ResourceBundle_object *) zend_object_store_get_object( object TSRMLS_CC);

 	intl_error_reset( NULL TSRMLS_CC );

@@ -247,7 +247,7 @@
 /* {{{ resourcebundle_array_count */
 int resourcebundle_array_count(zval *object, long *count TSRMLS_DC)
 {
-	ResourceBundle_object *rb = (ResourceBundle_object *) zend_object_store_get_object( object );
+	ResourceBundle_object *rb = (ResourceBundle_object *) zend_object_store_get_object( object TSRMLS_CC);

 	*count = ures_getSize( rb-me );


Modified: php/php-src/branches/PHP_5_3_2/ext/intl/resourcebundle/resourcebundle_iterator.c
===
--- php/php-src/branches/PHP_5_3_2/ext/intl/resourcebundle/resourcebundle_iterator.c	2010-02-11 23:43:40 UTC (rev 294928)
+++ php/php-src/branches/PHP_5_3_2/ext/intl/resourcebundle/resourcebundle_iterator.c	2010-02-11 23:55:19 UTC (rev 294929)
@@ -94,7 +94,7 @@
 {
 	ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
 	if (!iterator-current) {
-		resourcebundle_iterator_read( iterator );
+		resourcebundle_iterator_read( iterator TSRMLS_CC);
 	}
 	*data = iterator-current;
 }
@@ -106,7 +106,7 @@
 	ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;

 	if (!iterator-current) {
-		resourcebundle_iterator_read( iterator );
+

[PHP-CVS] svn: /php/php-src/tags/

2010-02-11 Thread Ilia Alshanetsky

iliaaThu, 11 Feb 2010 23:59:47 +

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

Log:
remove broken branch

Changed paths:
D   php/php-src/tags/php_5_2_13RC2/


-- 
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 configure.in main/php_version.h

2010-02-11 Thread Ilia Alshanetsky

iliaaFri, 12 Feb 2010 00:00:26 +

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

Log:
5.2.13RC2

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/configure.in
U   php/php-src/branches/PHP_5_2/main/php_version.h

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-02-11 23:59:47 UTC (rev 294930)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-02-12 00:00:26 UTC (rev 294931)
@@ -1,7 +1,5 @@
 PHPNEWS
 |||
-?? Feb 2010, PHP 5.2.13
-
 11 Feb 2010, PHP 5.2.13RC2
 - Downgrade bundled PCRE to version 7.9. (Ilia)
 - Fixed safe_mode validation inside tempnam() when the directory path does

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2010-02-11 23:59:47 UTC (rev 
294930)
+++ php/php-src/branches/PHP_5_2/configure.in   2010-02-12 00:00:26 UTC (rev 
294931)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=13
-PHP_EXTRA_VERSION=RC3-dev
+PHP_EXTRA_VERSION=RC2
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`


Modified: php/php-src/branches/PHP_5_2/main/php_version.h
===
--- php/php-src/branches/PHP_5_2/main/php_version.h 2010-02-11 23:59:47 UTC 
(rev 294930)
+++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-02-12 00:00:26 UTC 
(rev 294931)
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 13
-#define PHP_EXTRA_VERSION RC3-dev
-#define PHP_VERSION 5.2.13RC3-dev
+#define PHP_EXTRA_VERSION RC2
+#define PHP_VERSION 5.2.13RC2
 #define PHP_VERSION_ID 50213

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

[PHP-CVS] svn: /php/php-src/tags/

2010-02-11 Thread Ilia Alshanetsky

iliaaFri, 12 Feb 2010 00:00:40 +

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

Log:
5.2.13RC2

Changed paths:
A + php/php-src/tags/php_5_2_13RC2/
(from php/php-src/branches/PHP_5_2/:r294931)


Property changes on: php/php-src/tags/php_5_2_13RC2
___
Added: svn:ignore
   + Makefile.objects
Makefile.fragments
Makefile
acconfig.h
aclocal.m4
autom4te.cache
bsd_converted
buildmk.stamp
buildconf.stamp
config.h.in
config.cache
config.log
config.status
config_vars.mk
configuration-parser.c
configuration-parser.h
configuration-parser.output
configuration-scanner.c
configure
conftest
conftest.c
generated_lists
meta_cc
meta_ccld
mkinstalldirs
missing
install-sh
internal_functions.c
libtool
shlibtool
php
php5.spec
stamp-h
test.php3
*.lo
*.la
libs
modules
php-*.tar.gz
want_dependencies
deps
config.nice
php_version.h
*.plg
*.opt
*.ncb
Release
Release_inline
Debug
Release_TS
Release_TSDbg
Release_TS_inline
Debug_TS
results.txt
libs
_libs
include
autom4te.cache
FBCIndex
FBCLockFolder
debug.log
confdefs.h
configure.js
config.nice.bat
ZendEngine1
php_test_results_*.txt
*.gcda
*.gcno
lcov_data
lcov_html
php_lcov.info
tmp-php.ini

Added: svn:mergeinfo
   + /php/php-src/branches/PHP_5_3:284120,288260,288273
/php/php-src/trunk:284726

-- 
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 configure.in main/php_version.h

2010-02-11 Thread Ilia Alshanetsky

iliaaFri, 12 Feb 2010 00:03:13 +

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

Log:
back to dev

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/configure.in
U   php/php-src/branches/PHP_5_2/main/php_version.h

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-02-12 00:00:40 UTC (rev 294932)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-02-12 00:03:13 UTC (rev 294933)
@@ -1,5 +1,7 @@
 PHPNEWS
 |||
+?? Feb 2010, PHP 5.2.13
+
 11 Feb 2010, PHP 5.2.13RC2
 - Downgrade bundled PCRE to version 7.9. (Ilia)
 - Fixed safe_mode validation inside tempnam() when the directory path does

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2010-02-12 00:00:40 UTC (rev 
294932)
+++ php/php-src/branches/PHP_5_2/configure.in   2010-02-12 00:03:13 UTC (rev 
294933)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=13
-PHP_EXTRA_VERSION=RC2
+PHP_EXTRA_VERSION=RC3-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`


Modified: php/php-src/branches/PHP_5_2/main/php_version.h
===
--- php/php-src/branches/PHP_5_2/main/php_version.h 2010-02-12 00:00:40 UTC 
(rev 294932)
+++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-02-12 00:03:13 UTC 
(rev 294933)
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 13
-#define PHP_EXTRA_VERSION RC2
-#define PHP_VERSION 5.2.13RC2
+#define PHP_EXTRA_VERSION RC3-dev
+#define PHP_VERSION 5.2.13RC3-dev
 #define PHP_VERSION_ID 50213

-- 
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_2/ NEWS ext/pdo/pdo_stmt.c ext/pdo/tests/pdo_005.phpt ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt ext/pdo_sqlite/tests/bug49521.phpt tests/security

2010-02-11 Thread Johannes Schlüter

johannes Fri, 12 Feb 2010 00:19:10 +

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

Log:
merge 290786: Revert 290786: Fixed bug #49521 (PDO fetchObject sets values
before calling constructor)

Bug: http://bugs.php.net/49521 (Closed) PDO fetchObject sets values before 
calling constructor
  
Changed paths:
U   php/php-src/branches/PHP_5_3_2/NEWS
U   php/php-src/branches/PHP_5_3_2/ext/pdo/pdo_stmt.c
U   php/php-src/branches/PHP_5_3_2/ext/pdo/tests/pdo_005.phpt
U   
php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
D   php/php-src/branches/PHP_5_3_2/ext/pdo_sqlite/tests/bug49521.phpt
_U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS	2010-02-12 00:14:05 UTC (rev 294941)
+++ php/php-src/branches/PHP_5_3_2/NEWS	2010-02-12 00:19:10 UTC (rev 294942)
@@ -6,6 +6,9 @@

 - Improved LCG entropy. (Rasmus, Samy Kamkar)

+- Reverted fix for bug #49521 (PDO fetchObject sets values before calling
+  constructor). (Pierrick, Johannes)
+
 - Added libpng 1.4.0 support. (Pierre)
 - Added support for DISABLE_AUTHENTICATOR for imap_open. (Pierre)
 - Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.

Modified: php/php-src/branches/PHP_5_3_2/ext/pdo/pdo_stmt.c
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo/pdo_stmt.c	2010-02-12 00:14:05 UTC (rev 294941)
+++ php/php-src/branches/PHP_5_3_2/ext/pdo/pdo_stmt.c	2010-02-12 00:19:10 UTC (rev 294942)
@@ -1034,32 +1034,6 @@
 			}
 		}

-		switch (how) {
-			case PDO_FETCH_CLASS:
-if (ce-constructor  !(flags  (PDO_FETCH_PROPS_LATE | PDO_FETCH_SERIALIZE))) {
-	stmt-fetch.cls.fci.object_ptr = return_value;
-	stmt-fetch.cls.fcc.object_ptr = return_value;
-	if (zend_call_function(stmt-fetch.cls.fci, stmt-fetch.cls.fcc TSRMLS_CC) == FAILURE) {
-		pdo_raise_impl_error(stmt-dbh, stmt, HY000, could not call class constructor TSRMLS_CC);
-		return 0;
-	} else {
-		if (stmt-fetch.cls.retval_ptr) {
-			zval_ptr_dtor(stmt-fetch.cls.retval_ptr);
-		}
-	}
-}
-if (flags  PDO_FETCH_CLASSTYPE) {
-	do_fetch_opt_finish(stmt, 0 TSRMLS_CC);
-	stmt-fetch.cls.ce = old_ce;
-	stmt-fetch.cls.ctor_args = old_ctor_args;
-	stmt-fetch.cls.fci.param_count = old_arg_count;
-}
-break;
-
-			default:
-break;
-		}
-
 		for (idx = 0; i  stmt-column_count; i++, idx++) {
 			zval *val;
 			MAKE_STD_ZVAL(val);
@@ -1193,6 +1167,27 @@
 		}

 		switch (how) {
+			case PDO_FETCH_CLASS:
+if (ce-constructor  !(flags  (PDO_FETCH_PROPS_LATE | PDO_FETCH_SERIALIZE))) {
+	stmt-fetch.cls.fci.object_ptr = return_value;
+	stmt-fetch.cls.fcc.object_ptr = return_value;
+	if (zend_call_function(stmt-fetch.cls.fci, stmt-fetch.cls.fcc TSRMLS_CC) == FAILURE) {
+		pdo_raise_impl_error(stmt-dbh, stmt, HY000, could not call class constructor TSRMLS_CC);
+		return 0;
+	} else {
+		if (stmt-fetch.cls.retval_ptr) {
+			zval_ptr_dtor(stmt-fetch.cls.retval_ptr);
+		}
+	}
+}
+if (flags  PDO_FETCH_CLASSTYPE) {
+	do_fetch_opt_finish(stmt, 0 TSRMLS_CC);
+	stmt-fetch.cls.ce = old_ce;
+	stmt-fetch.cls.ctor_args = old_ctor_args;
+	stmt-fetch.cls.fci.param_count = old_arg_count;
+}
+break;
+
 			case PDO_FETCH_FUNC:
 stmt-fetch.func.fci.param_count = idx;
 stmt-fetch.func.fci.retval_ptr_ptr = retval;

Modified: php/php-src/branches/PHP_5_3_2/ext/pdo/tests/pdo_005.phpt
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo/tests/pdo_005.phpt	2010-02-12 00:14:05 UTC (rev 294941)
+++ php/php-src/branches/PHP_5_3_2/ext/pdo/tests/pdo_005.phpt	2010-02-12 00:19:10 UTC (rev 294942)
@@ -34,7 +34,7 @@

 	public function __construct($row)
 	{
-		echo __METHOD__ . ($row)\n;
+		echo __METHOD__ . ($row,{$this-id})\n;
 		$this-row = $row++;
 	}
 }
@@ -108,9 +108,9 @@
 string(2) CC
   }
 }
-TestDerived::__construct(0)
-TestDerived::__construct(1)
-TestDerived::__construct(2)
+TestDerived::__construct(0,1)
+TestDerived::__construct(1,2)
+TestDerived::__construct(2,3)
 array(3) {
   [0]=
   object(TestDerived)#%d (5) {
@@ -151,4 +151,4 @@
 [val2]=
 string(2) CC
   }
-}
+}
\ No newline at end of file

Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt	2010-02-12 00:14:05 UTC (rev 294941)
+++ php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt	2010-02-12 00:19:10 UTC (rev 294942)
@@ -71,21

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS configure.in main/php_version.h

2010-02-11 Thread Johannes Schlüter

johannes Fri, 12 Feb 2010 00:20:28 +

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

Log:
5.3.2RC2

Changed paths:
_U  php/php-src/branches/PHP_5_3_2/
U   php/php-src/branches/PHP_5_3_2/NEWS
U   php/php-src/branches/PHP_5_3_2/configure.in
U   php/php-src/branches/PHP_5_3_2/main/php_version.h


Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293437,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293813,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,29!
 4816,294825,294849,294854-294855,294866,294882
/php/php-src/trunk:284726
   + 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293437,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293813,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,29!
 4816,294825,294849,294854-294855,294866,294882,294903
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-02-12 00:19:10 UTC (rev 294942)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-12 00:20:28 UTC (rev 294943)
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-?? ??? 20??, PHP 5.3.2 RC 2
+12 Feb 2010, PHP 5.3.2 RC 2
 - Upgraded bundled sqlite to version 3.6.22. (Ilia)
 - Upgraded bundled libmagic to version 5.03. (Mikko)


Modified: php/php-src/branches/PHP_5_3_2/configure.in
===
--- php/php-src/branches/PHP_5_3_2/configure.in 2010-02-12 00:19:10 UTC (rev 
294942)
+++ php/php-src/branches/PHP_5_3_2/configure.in 2010-02-12 00:20:28 UTC (rev 
294943)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=3
 PHP_RELEASE_VERSION=2
-PHP_EXTRA_VERSION=RC2-dev
+PHP_EXTRA_VERSION=RC2
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`


Modified: php/php-src/branches/PHP_5_3_2/main/php_version.h
===
--- php/php-src/branches/PHP_5_3_2/main/php_version.h   2010-02-12 00:19:10 UTC 
(rev 294942)
+++ php/php-src/branches/PHP_5_3_2/main/php_version.h   2010-02-12 00:20:28 UTC 
(rev 294943)
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 2
-#define PHP_EXTRA_VERSION RC2-dev
-#define PHP_VERSION 5.3.2RC2-dev
+#define PHP_EXTRA_VERSION RC2
+#define PHP_VERSION 5.3.2RC2
 #define PHP_VERSION_ID 50302

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

[PHP-CVS] svn: /php/php-src/tags/

2010-02-11 Thread Johannes Schlüter

johannes Fri, 12 Feb 2010 00:22:26 +

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

Log:
5.3.2RC2

Changed paths:
A + php/php-src/tags/php_5_3_2RC2/
(from php/php-src/branches/PHP_5_3_2/:r294943)


Property changes on: php/php-src/tags/php_5_3_2RC2
___
Added: svn:ignore
   + Makefile.objects
Makefile.fragments
Makefile
acconfig.h
aclocal.m4
autom4te.cache
bsd_converted
buildmk.stamp
buildconf.stamp
config.h.in
config.cache
config.log
config.status
config_vars.mk
configuration-parser.c
configuration-parser.h
configuration-parser.output
configuration-scanner.c
configure
configure.bat
conftest
conftest.c
generated_lists
meta_cc
meta_ccld
mkinstalldirs
missing
install-sh
internal_functions.c
libtool
shlibtool
php
php5.spec
stamp-h
test.php3
*.lo
*.la
libs
modules
php-*.tar.gz
want_dependencies
deps
config.nice
php_version.h
*.plg
*.opt
*.ncb
Release
Release_inline
Debug
Release_TS
Release_TSDbg
Release_TS_inline
Debug_TS
results.txt
libs
_libs
include
autom4te.cache
FBCIndex
FBCLockFolder
debug.log
confdefs.h
configure.js
config.nice.bat
configure.bat
ZendEngine1
php_test_results_*.txt
*.gcda
*.gcno
lcov_data
lcov_html
php_lcov.info
tmp-php.ini
diff

Added: svn:mergeinfo
   + 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293437,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293813,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,29!
 4816,294825,294849,294854-294855,294866,294882,294903
/php/php-src/trunk:284726

-- 
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_2/ NEWS configure.in main/php_version.h

2010-02-11 Thread Johannes Schlüter

johannes Fri, 12 Feb 2010 00:53:32 +

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

Log:
Back to -dev

Changed paths:
U   php/php-src/branches/PHP_5_3_2/NEWS
U   php/php-src/branches/PHP_5_3_2/configure.in
U   php/php-src/branches/PHP_5_3_2/main/php_version.h

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-02-12 00:51:21 UTC (rev 294945)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-12 00:53:32 UTC (rev 294946)
@@ -1,5 +1,9 @@
 PHPNEWS
 |||
+?? ??? 2010, PHP 5.3.2 RC 3
+
+
+
 12 Feb 2010, PHP 5.3.2 RC 2
 - Upgraded bundled sqlite to version 3.6.22. (Ilia)
 - Upgraded bundled libmagic to version 5.03. (Mikko)

Modified: php/php-src/branches/PHP_5_3_2/configure.in
===
--- php/php-src/branches/PHP_5_3_2/configure.in 2010-02-12 00:51:21 UTC (rev 
294945)
+++ php/php-src/branches/PHP_5_3_2/configure.in 2010-02-12 00:53:32 UTC (rev 
294946)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=3
 PHP_RELEASE_VERSION=2
-PHP_EXTRA_VERSION=RC2
+PHP_EXTRA_VERSION=RC3-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`


Modified: php/php-src/branches/PHP_5_3_2/main/php_version.h
===
--- php/php-src/branches/PHP_5_3_2/main/php_version.h   2010-02-12 00:51:21 UTC 
(rev 294945)
+++ php/php-src/branches/PHP_5_3_2/main/php_version.h   2010-02-12 00:53:32 UTC 
(rev 294946)
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 2
-#define PHP_EXTRA_VERSION RC2
-#define PHP_VERSION 5.3.2RC2
+#define PHP_EXTRA_VERSION RC3-dev
+#define PHP_VERSION 5.3.2RC3-dev
 #define PHP_VERSION_ID 50302

-- 
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

2010-02-11 Thread Pierre Joye

pajoye   Fri, 12 Feb 2010 01:22:10 +

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

Log:
- merge 5.3.2RC2 changes, unsorted # for now

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   2010-02-12 01:20:09 UTC (rev 294949)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-02-12 01:22:10 UTC (rev 294950)
@@ -7,7 +7,8 @@
   mcrypt_filter). (Stas)

 ?? ??? 20??, PHP 5.3.2
-- Upgraded bundled sqlite to version 3.6.21. (Ilia)
+- Upgraded bundled sqlite to version 3.6.22. (Ilia)
+- Upgraded bundled libmagic to version 5.03. (Mikko)
 - Upgraded bundled PCRE to version 8.00. (Scott)

 - Changed gmp_strval() to use full range from 2 to 62, and -2 to -36. FR #50283
@@ -19,6 +20,11 @@
 - Removed automatic file descriptor unlocking happening on shutdown and/or
   stream close (on all OSes). (Tony, Ilia)

+- Added libpng 1.4.0 support. (Pierre)
+- Added support for DISABLE_AUTHENTICATOR for imap_open. (Pierre)
+- Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
+  (Ilia)
+- Added stream_resolve_include_path(). (Mikko)
 - Added INTERNALDATE support to imap_append. (nick at mailtrust dot com)
 - Added support for SHA-256 and SHA-512 to php's crypt. (Pierre)
 - Added realpath_cache_size() and realpath_cache_get() functions. (Stas)
@@ -44,7 +50,75 @@
   (Arvind Srinivasan)
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)
+- Fixed safe_mode validation inside tempnam() when the directory path does
+  not end with a /). (Martin Jansen)
+- Fixed a possible open_basedir/safe_mode bypass in session extension
+  identified by Grzegorz Stachowiak. (Ilia)
+- Fixed possible crash when a error/warning is raised during php startup.
+  (Pierre)
+- Fixed possible bad behavior of rename on windows when used with symbolic
+  links or invalid paths. (Pierre)
+- Fixed error output to stderr on Windows. (Pierre)
+- Fixed memory leaks in is_writable/readable/etc on Windows. (Pierre)
+- Fixed memory leaks in the ACL function on Windows. (Pierre)
+- Fixed memory leak in the realpath cache on Windows. (Pierre)
+- Fixed memory leak in zip_close. (Pierre)

+- Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files).
+  (Jani)
+- Fixed bug #50940 (Custom content-length set incorrectly in Apache SAPIs).
+  (Brian France, Rasmus)
+- Fixed bug #50930 (Wrong date by php_date.c patch with ancient gcc/glibc
+  versions). (Derick)
+- Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).
+  (Ilia)
+- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
+  (Ilia, hanno at hboeck dot de)
+- Fixed bug #50847 (strip_tags() removes all tags greater then 1023 bytes
+  long). (Ilia)
+- Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored).
+  (Ilia)
+- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
+  authentication). (Jani)
+- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams).
+  (vnegrier at optilian dot com, Ilia)
+- Fixed bug #50761 (system.multiCall crashes in xmlrpc extension).
+  (hiroaki dot kawai at gmail dot com, Ilia)
+- Fixed bug #50756 (CURLOPT_FTP_SKIP_PASV_IP does not exist). (Sriram)
+- Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia)
+- Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0).
+  (Joey, Ilia)
+- Fixed bug #50723 (Bug in garbage collector causes crash). (Dmitry)
+- Fixed bug #50690 (putenv does not set ENV when the value is only one char).
+  (Pierre)
+- Fixed bug #50680 (strtotime() does not support eighth ordinal number). (Ilia)
+- Fixed bug #50661 (DOMDocument::loadXML does not allow UTF-16). (Rob)
+- Fixed bug #50657 (copy() with an empty (zero-byte) HTTP source succeeds but
+  returns false). (Ilia)
+- Fixed bug #50636 (MySQLi_Result sets values before calling constructor).
+  (Pierrick)
+- Fixed bug #50632 (filter_input() does not return default value if the
+  variable does not exist). (Ilia)
+- Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick)
+- Fixed bug #50416 (PROCEDURE db.myproc can't return a result set in the given
+  context). (Andrey)
+- Fixed bug #49600 (imageTTFText text shifted right). (Takeshi Abe)
+- Fixed bug #49585 (date_format buffer not long enough for 4 digit years).
+  (Derick, Adam)
+- Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.)
+- Fixed bug #49463 (setAttributeNS fails setting default namespace). (Rob)
+- Fixed bug #48811 (Directives in PATH section do not get applied to
+  subdirectories). (Patch by: ct at swin dot edu dot au)
+- Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
+- Fixed bug #48190 (Content-type parameter boundary is not case-insensitive
+  in HTTP uploads). (Ilia)
+- Fixed bug

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/date/php_date.c ext/date/tests/bug49585.phpt tests/security/open_basedir_parse_ini_file.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/date/config0.m4 ext/date/lib/parse_date.c ext/date/lib/parse_date.re ext/date/php_date.c ext/date/tests/bug45866.phpt ext/date/tests/bug46268.phpt e

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ configure.in main/php_version.h

[PHP-CVS] svn: /php/php-src/tags/

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/mysql/php_mysql.c tests/security/open_basedir_parse_ini_file.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/spl/spl_dllist.h ext/spl/spl_fixedarray.h ext/spl/spl_heap.h main/php_getopt.h tests/security/open_basedir_parse_ini_file.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/tidy/tests/bug_50558.phpt ext/tidy/tidy.c tests/security/open_basedir_parse_ini_file.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/crypt_sha256.c ext/standard/crypt_sha512.c tests/security/open_basedir_parse_ini_file.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/config.m4 tests/security/open_basedir_parse_ini_file.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/standard/file.c tests/security/open_basedir_parse_ini_file.phpt

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

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS Zend/zend_API.c Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h ext/standard/tests/general_functions/bug49847.phpt ext/standard/var_un

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli.c branches/PHP_5_3/ext/mysqli/tests/bug50636.phpt trunk/ext/mysqli/mysqli.c trunk/ext/mysqli/tests/bug50636.phpt

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo/pdo_stmt.c branches/PHP_5_3/ext/pdo/tests/pdo_005.phpt branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt branches/PHP_5_3/ext/p

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/oci8/ package.xml

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/intl/resourcebundle/resourcebundle_class.c ext/intl/resourcebundle/resourcebundle_iterator.c ext/intl/tests/rb_build.php ext/intl/tests/resourcebund

[PHP-CVS] svn: /php/php-src/tags/

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h

[PHP-CVS] svn: /php/php-src/tags/

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/pdo/pdo_stmt.c ext/pdo/tests/pdo_005.phpt ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt ext/pdo_sqlite/tests/bug49521.phpt tests/security

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS configure.in main/php_version.h

[PHP-CVS] svn: /php/php-src/tags/

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS configure.in main/php_version.h

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

30 matches

Site Navigation

Mail list logo

Footer information