[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS main/main.c tests/security/open_basedir_parse_ini_file.phpt

2009-10-28 Thread Pierre-Alain Joye
pajoye   Wed, 28 Oct 2009 15:19:32 +

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

Log:
- Merge 290029, Lower the max upload default to 20

Changed paths:
_U  php/php-src/branches/PHP_5_3_1/
_U  php/php-src/branches/PHP_5_3_1/NEWS
_U  php/php-src/branches/PHP_5_3_1/ext/mysql/
_U  php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U  php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U  php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U  php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
U   php/php-src/branches/PHP_5_3_1/main/main.c
_U  
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990
/php/php-src/trunk:284726
   + 
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990,290029
/php/php-src/trunk:284726


Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990
/php/php-src/trunk/NEWS:284726
   + 
/php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029
/php/php-src/trunk/NEWS:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990
/php/php-src/trunk/ext/mysql:284726
   + 
/php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029
/php/php-src/trunk/ext/mysql:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990
/php/php-src/trunk/ext/mysqli:284726
   + 
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029
/php/php-src/trunk/ext/mysqli:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990
/php/php-src/trunk/ext/mysqlnd:284726
   + 
/php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029
/php/php-src/trunk/ext/mysqlnd:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990
/php/php-s

[PHP-CVS] svn: /php/win-installer/trunk/ GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBa

2009-10-28 Thread John Mertic
jmertic  Wed, 28 Oct 2009 14:59:10 +

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

Log:
Add HKLM/Software/PHP/Version registry key on install.

Changed paths:
_U  php/win-installer/trunk/
U   php/win-installer/trunk/GenPHPInstaller.wxs.php
U   php/win-installer/trunk/PHPInstallerBase52.wxs
U   php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs


Property changes on: php/win-installer/trunk
___
Modified: svn:ignore
   - *.wixobj
*.wixlib
*.msi

   + *.wixobj
*.wixlib
*.msi
Files


Modified: php/win-installer/trunk/GenPHPInstaller.wxs.php
===
--- php/win-installer/trunk/GenPHPInstaller.wxs.php 2009-10-28 14:53:28 UTC 
(rev 290032)
+++ php/win-installer/trunk/GenPHPInstaller.wxs.php 2009-10-28 14:59:10 UTC 
(rev 290033)
@@ -15,6 +15,15 @@
 
$PHPInstallerBaseWXS->getElementsByTagName('Product')->item(0)->setAttribute("Version","$version");
 
$PHPInstallerBaseWXS->getElementsByTagName('Product')->item(0)->setAttribute("Id",genGUID());
 
$PHPInstallerBaseWXS->getElementsByTagName('Package')->item(0)->setAttribute("Description","PHP
 $version Installer");
+$tags = $PHPInstallerBaseWXS->getElementsByTagName('Registry');
+$i = 0;
+while ( $i < $tags->length ) {
+if ( $tags->item($i)->getAttribute('Id') == 'PHPRegistryVersion' ) {
+$tags->item($i)->setAttribute("Value","$version");
+break;
+}
+$i++;
+}

 // Add in the VC9 MSM if we are building that installer
 if ( !empty($includemsm) ) {

Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52.wxs  2009-10-28 14:53:28 UTC 
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs  2009-10-28 14:59:10 UTC 
(rev 290033)
@@ -211,6 +211,13 @@
   Action='write'
   Type='string'
   Value='[INSTALLDIR]' />
+
   
   
+
   
   
+
   
   
+
   
   
+
   
   
+
   
   -- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerCommon52NTS.wxs PHPInstallerCommon53NTS.wxs PHPInstallerCommon60NTS.wxs PHPInstallerCommonNTS52.wxs PHPInstallerCommonNTS53.wxs PHPInstallerCommonN

2009-10-28 Thread John Mertic
jmertic  Wed, 28 Oct 2009 13:13:45 +

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

Log:
Renamed the PHPInstalerCommon*.php files to use the name naming convention for 
the NTS variants.

Changed paths:
A + php/win-installer/trunk/PHPInstallerCommon52NTS.wxs
(from php/win-installer/trunk/PHPInstallerCommonNTS52.wxs:r290026)
A + php/win-installer/trunk/PHPInstallerCommon53NTS.wxs
(from php/win-installer/trunk/PHPInstallerCommonNTS53.wxs:r290026)
A + php/win-installer/trunk/PHPInstallerCommon60NTS.wxs
(from php/win-installer/trunk/PHPInstallerCommonNTS60.wxs:r290026)
D   php/win-installer/trunk/PHPInstallerCommonNTS52.wxs
D   php/win-installer/trunk/PHPInstallerCommonNTS53.wxs
D   php/win-installer/trunk/PHPInstallerCommonNTS60.wxs
U   php/win-installer/trunk/build.bat


-- 
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/main/main.c branches/PHP_5_3/main/main.c trunk/main/main.c

2009-10-28 Thread Ilia Alshanetsky
iliaaWed, 28 Oct 2009 13:04:42 +

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

Log:
Lower the max upload default to 20

Changed paths:
U   php/php-src/branches/PHP_5_2/main/main.c
U   php/php-src/branches/PHP_5_3/main/main.c
U   php/php-src/trunk/main/main.c

Modified: php/php-src/branches/PHP_5_2/main/main.c
===
--- php/php-src/branches/PHP_5_2/main/main.c2009-10-28 13:03:21 UTC (rev 
290028)
+++ php/php-src/branches/PHP_5_2/main/main.c2009-10-28 13:04:42 UTC (rev 
290029)
@@ -452,7 +452,7 @@
PHP_INI_ENTRY("mail.force_extra_parameters",NULL,   
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnChangeMailForceExtra)
PHP_INI_ENTRY("disable_functions",  "", 
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY("disable_classes","", 
PHP_INI_SYSTEM, NULL)
-   PHP_INI_ENTRY("max_file_uploads",   "100",  
PHP_INI_SYSTEM, NULL)
+   PHP_INI_ENTRY("max_file_uploads",   "20",   
PHP_INI_SYSTEM, NULL)

STD_PHP_INI_BOOLEAN("allow_url_fopen",  "1",
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_fopen,
php_core_globals,   core_globals)
STD_PHP_INI_BOOLEAN("allow_url_include","0",
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_include,  
php_core_globals,   core_globals)

Modified: php/php-src/branches/PHP_5_3/main/main.c
===
--- php/php-src/branches/PHP_5_3/main/main.c2009-10-28 13:03:21 UTC (rev 
290028)
+++ php/php-src/branches/PHP_5_3/main/main.c2009-10-28 13:04:42 UTC (rev 
290029)
@@ -515,7 +515,7 @@
PHP_INI_ENTRY("mail.force_extra_parameters",NULL,   
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnChangeMailForceExtra)
PHP_INI_ENTRY("disable_functions",  "", 
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY("disable_classes","", 
PHP_INI_SYSTEM, NULL)
-   PHP_INI_ENTRY("max_file_uploads",   "100",  
PHP_INI_SYSTEM, NULL)
+   PHP_INI_ENTRY("max_file_uploads",   "20",   
PHP_INI_SYSTEM, NULL)

STD_PHP_INI_BOOLEAN("allow_url_fopen",  "1",
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_fopen,
php_core_globals,   core_globals)
STD_PHP_INI_BOOLEAN("allow_url_include","0",
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_include,  
php_core_globals,   core_globals)

Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c   2009-10-28 13:03:21 UTC (rev 290028)
+++ php/php-src/trunk/main/main.c   2009-10-28 13:04:42 UTC (rev 290029)
@@ -602,7 +602,7 @@
PHP_INI_ENTRY("mail.force_extra_parameters",NULL,   
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnChangeMailForceExtra)
PHP_INI_ENTRY("disable_functions",  "", 
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY("disable_classes","", 
PHP_INI_SYSTEM, NULL)
-   PHP_INI_ENTRY("max_file_uploads",   "100",  
PHP_INI_SYSTEM, NULL)
+   PHP_INI_ENTRY("max_file_uploads",   "20",   
PHP_INI_SYSTEM, NULL)

STD_PHP_INI_BOOLEAN("allow_url_fopen",  "1",
PHP_INI_ALL,OnUpdateAllowUrl,   allow_url_fopen_list,   
php_core_globals,   core_globals)
STD_PHP_INI_BOOLEAN("allow_url_include","0",
PHP_INI_ALL,OnUpdateAllowUrl,   allow_url_include_list, 
php_core_globals,   core_globals)

-- 
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_1/ NEWS Zend/zend.c tests/security/open_basedir_parse_ini_file.phpt

2009-10-28 Thread Pierre-Alain Joye
pajoye   Wed, 28 Oct 2009 11:08:33 +

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

Log:
- Merge revision 289987, Fixed bug #49142 (crash when exception thrown from 
__tostring())

Bug: http://bugs.php.net/49142 (Closed) crash when exception thrown from 
__tostring() (PHP_5_3 only!)
  
Changed paths:
_U  php/php-src/branches/PHP_5_3_1/
UU  php/php-src/branches/PHP_5_3_1/NEWS
U   php/php-src/branches/PHP_5_3_1/Zend/zend.c
_U  php/php-src/branches/PHP_5_3_1/ext/mysql/
_U  php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U  php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U  php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U  php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289990
/php/php-src/trunk:284726
   + 
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-28 11:03:36 UTC (rev 290025)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-28 11:08:33 UTC (rev 290026)
@@ -7,6 +7,8 @@

 - Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)

+- Fixed bug #49142 (crash when exception thrown from __tostring()).
+  (David Soria Parra)
 - Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre)
 - Fixed bug #48752 (Crash during date parsing with invalid date). (Pierre)



Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289990
/php/php-src/trunk/NEWS:284726
   + 
/php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990
/php/php-src/trunk/NEWS:284726

Modified: php/php-src/branches/PHP_5_3_1/Zend/zend.c
===
--- php/php-src/branches/PHP_5_3_1/Zend/zend.c  2009-10-28 11:03:36 UTC (rev 
290025)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend.c  2009-10-28 11:08:33 UTC (rev 
290026)
@@ -1067,10 +1067,16 @@
if (!EG(active_symbol_table)) {
zend_rebuild_symbol_table(TSRMLS_C);
}
-   Z_ARRVAL_P(z_context) = EG(active_symbol_table);
-   Z_TYPE_P(z_context) = IS_ARRAY;
-   zval_copy_ctor(z_context);

+   /* during shutdown the symbol table table can be still 
null */
+   if (!EG(active_symbol_table)) {
+   Z_TYPE_P(z_context) = IS_NULL;
+   } else {
+   Z_ARRVAL_P(z_context) = EG(active_symbol_table);
+   Z_TYPE_P(z_context) = IS_ARRAY;
+   zval_copy_ctor(z_context);
+   }
+
params = (zval ***) emalloc(si

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS main/main.c main/rfc1867.c php.ini-development php.ini-production tests/security/open_basedir_parse_ini_file.phpt

2009-10-28 Thread Pierre-Alain Joye
pajoye   Wed, 28 Oct 2009 11:03:36 +

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

Log:
- Merge revision 289990, introduce new INI setting max_file_uploads [DOC] added 
to 5.2 as well

Changed paths:
_U  php/php-src/branches/PHP_5_3_1/
UU  php/php-src/branches/PHP_5_3_1/NEWS
_U  php/php-src/branches/PHP_5_3_1/ext/mysql/
_U  php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U  php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U  php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U  php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
U   php/php-src/branches/PHP_5_3_1/main/main.c
U   php/php-src/branches/PHP_5_3_1/main/rfc1867.c
U   php/php-src/branches/PHP_5_3_1/php.ini-development
U   php/php-src/branches/PHP_5_3_1/php.ini-production
_U  
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779
/php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289990
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS	2009-10-28 10:14:29 UTC (rev 290024)
+++ php/php-src/branches/PHP_5_3_1/NEWS	2009-10-28 11:03:36 UTC (rev 290025)
@@ -1,6 +1,10 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.3.1 RC3
+- Added "max_file_uploads" INI directive, which can be set to limit the
+  number of file uploads per-request to 100 by default, to prevent possible
+  DOS via temporary file exhaustion. (Ilia)
+
 - Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)

 - Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre)


Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779
/php/php-src/trunk/NEWS:284726
   + /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289990
/php/php-src/trunk/NEWS:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779
/php/php-src/trunk/ext/mysql:284726
   + /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289990
/php/php-src/trunk/ext/mysql:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779
/php/php-src/trunk/ext/mysqli:284726
   + /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,28975