[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS
johannes Wed, 03 Mar 2010 16:45:49 + Revision: http://svn.php.net/viewvc?view=revision&revision=295793 Log: Release day is tomorrow, not today 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-03-03 16:36:07 UTC (rev 295792) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-03-03 16:45:49 UTC (rev 295793) @@ -1,6 +1,6 @@ PHPNEWS ||| -03 Mar 2010, PHP 5.3.2 +04 Mar 2010, PHP 5.3.2 - Upgraded bundled sqlite to version 3.6.22. (Ilia) - Upgraded bundled libmagic to version 5.03. (Mikko) -- 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
johannes Wed, 03 Mar 2010 16:36:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=295792 Log: PHP 5.3.2 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-03-03 16:08:57 UTC (rev 295791) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-03-03 16:36:07 UTC (rev 295792) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2010, PHP 5.3.2 +03 Mar 2010, PHP 5.3.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-03-03 16:08:57 UTC (rev 295791) +++ php/php-src/branches/PHP_5_3_2/configure.in 2010-03-03 16:36:07 UTC (rev 295792) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=2 -PHP_EXTRA_VERSION="RC4-dev" +PHP_EXTRA_VERSION="" 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-03-03 16:08:57 UTC (rev 295791) +++ php/php-src/branches/PHP_5_3_2/main/php_version.h 2010-03-03 16:36:07 UTC (rev 295792) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 2 -#define PHP_EXTRA_VERSION "RC4-dev" -#define PHP_VERSION "5.3.2RC4-dev" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.3.2" #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_2/ NEWS
johannes Wed, 03 Mar 2010 15:40:44 + Revision: http://svn.php.net/viewvc?view=revision&revision=295788 Log: merge 5.3.2 NEWS 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-03-03 15:15:28 UTC (rev 295787) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-03-03 15:40:44 UTC (rev 295788) @@ -1,33 +1,58 @@ PHPNEWS ||| -?? ??? 2010, PHP 5.3.2 RC 4 -- Updated timezone database to version 2010.3. (Derick) +?? ??? 2010, PHP 5.3.2 -23 Feb 2010, PHP 5.3.2 RC 3 - -- Improved crypt support for edge cases (UFC compatibility). (Solar Designer, - Joey, Pierre) - -- Fixed crypt's blowfish sanity check of the "setting" string, to reject iteration - counts encoded as 36 through 39. (Solar Designer, Joey, Pierre) - -- Fixed #51059 (crypt crashes when invalid salt are given). (Pierre) - -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) +- Upgraded bundled PCRE to version 8.00. (Scott) +- Updated timezone database to version 2010.3. (Derick) - Improved LCG entropy. (Rasmus, Samy Kamkar) +- Improved crypt support for edge cases (UFC compatibility). (Solar Designer, + Joey, Pierre) - Reverted fix for bug #49521 (PDO fetchObject sets values before calling constructor). (Pierrick, Johannes) +- Changed gmp_strval() to use full range from 2 to 62, and -2 to -36. FR #50283 + (David Soria Parra) +- Changed "post_max_size" php.ini directive to allow unlimited post size by + setting it to 0. (Rasmus) +- Changed tidyNode class to disallow manual node creation. (Pierrick) + +- 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) +- Added FILTER_FLAG_STRIP_BACKTICK option to the filter extension. (Ilia) +- Added protection for $_SESSION from interrupt corruption and improved + "session.save_path" check. (Stas) +- Added LIBXML_PARSEHUGE constant to override the maximum text size of a + single text node when using libxml2.7.3+. (Kalle) +- Added ReflectionMethod::setAccessible() for invoking non-public methods + through the Reflection API. (Sebastian) +- Added Collator::getSortKey for intl extension. (Stas) +- Added support for CURLOPT_POSTREDIR. FR #49571. (Sriram Natarajan) +- Added support for CURLOPT_CERTINFO. FR #49253. + (Linus Nielsen Feltzing ) +- Added client-side server name indication support in openssl. (Arnaud) +- Improved fix for bug #50006 (Segfault caused by uksort()). (Stas) + +- Fixed mysqlnd hang when queries exactly 16777214 bytes long are sent. (Andrey) +- Fixed incorrect decoding of 5-byte BIT sequences in mysqlnd. (Andrey) +- Fixed error_log() to be binary safe when using message_type 3. (Jani) +- Fixed unnecessary invocation of setitimer when timeouts have been disabled. + (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 @@ -41,7 +66,10 @@ - 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 crypt's blowfish sanity check of the "setting" string, to reject + iteration counts encoded as 36 through 39. (Solar Designer, Joey, Pierre) +- Fixed bug #51059 (crypt crashes when invalid salt are given). (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). @@ -78,65 +106,6 @@ - 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 shutdow
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS
pajoye Wed, 03 Mar 2010 15:15:28 + Revision: http://svn.php.net/viewvc?view=revision&revision=295787 Log: - tz update entry 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-03-03 14:48:39 UTC (rev 295786) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-03-03 15:15:28 UTC (rev 295787) @@ -1,9 +1,10 @@ PHPNEWS ||| ?? ??? 2010, PHP 5.3.2 RC 4 +- Updated timezone database to version 2010.3. (Derick) +23 Feb 2010, PHP 5.3.2 RC 3 -23 Feb 2010, PHP 5.3.2 RC 3 - Improved crypt support for edge cases (UFC compatibility). (Solar Designer, Joey, Pierre) -- 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/date/lib/timezonedb.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Mar 2010 11:42:54 + Revision: http://svn.php.net/viewvc?view=revision&revision=295779 Log: - Updated to version 2010.3 (2010c) Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/date/lib/timezonedb.h _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,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,294903,295164,295294-295295,295308-295309,295314,295339-295340,295402,295419-295420 /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,294903,295164,295294-295295,295308-295309,295314,295339-295340,295402,295419-295420,295660 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/date/lib/timezonedb.h === --- php/php-src/branches/PHP_5_3_2/ext/date/lib/timezonedb.h 2010-03-03 11:18:45 UTC (rev 295778) +++ php/php-src/branches/PHP_5_3_2/ext/date/lib/timezonedb.h 2010-03-03 11:42:54 UTC (rev 295779) @@ -1825,21 +1825,21 @@ 0x3D, 0x71, 0x90, 0xC0, 0x3E, 0x8F, 0x98, 0x30, 0x3F, 0x5A, 0xAD, 0x40, 0x40, 0x6F, 0x7A, 0x30, 0x41, 0x71, 0xEE, 0x40, 0x42, 0x33, 0xAC, 0xB0, 0x43, 0x51, 0xD0, 0x40, 0x44, 0x13, 0x8E, 0xB0, 0x45, 0x31, 0xB2, 0x40, 0x45, 0xF3, 0x70, 0xB0, 0x47, 0x1A, 0xCE, 0xC0, 0x47, 0xD3, 0x52, 0xB0, -0x48, 0xFA, 0xB0, 0xC0, 0x49, 0xB3, 0x34, 0xB0, 0x4A, 0xDA, 0x92, 0xC0, 0x4B, 0x9C, 0x51, 0x30, -0x4C, 0xBA, 0x74, 0xC0, 0x4D, 0x7C, 0x33, 0x30, 0x4E, 0x9A, 0x56, 0xC0, 0x4F, 0x5C, 0x15, 0x30, -0x50, 0x83, 0x73, 0x40, 0x51, 0x3B, 0xF7, 0x30, 0x52, 0x63, 0x55, 0x40, 0x53, 0x1B, 0xD9, 0x30, -0x54, 0x43, 0x37, 0x40, 0x54, 0xFB, 0xBB, 0x30, 0x56, 0x23, 0x19, 0x40, 0x56, 0xE4, 0xD7, 0xB0, -0x58, 0x02, 0xFB, 0x40, 0x58, 0xC4, 0xB9, 0xB0, 0x59, 0xE2, 0xDD, 0x40, 0x5A, 0xA4, 0x9B, 0xB0, -0x5B, 0xCB, 0xF9, 0xC0, 0x5C, 0x84, 0x7D, 0xB0, 0x5D, 0xAB, 0xDB, 0xC0, 0x5E, 0x64, 0x5F, 0xB0, -0x5F, 0x8B, 0xBD, 0xC0, 0x60, 0x4D, 0x7C, 0x30, 0x61, 0x6B, 0x9F, 0xC0, 0x62, 0x2D, 0x5E, 0x30, -0x63, 0x4B, 0x81, 0xC0, 0x64, 0x0D, 0x40, 0x30, 0x65, 0x2B, 0x63, 0xC0, 0x65, 0xED, 0x22, 0x30, -0x67, 0x14, 0x80, 0x40, 0x67, 0xCD, 0x04, 0x30, 0x68, 0xF4, 0x62, 0x40, 0x69, 0xAC, 0xE6, 0x30, -0x6A, 0xD4, 0x44, 0x40, 0x6B, 0x96, 0x02, 0xB0, 0x6C, 0xB4, 0x26, 0x40, 0x6D, 0x75, 0xE4, 0xB0, -0x6E, 0x94, 0x08, 0x40, 0x6F, 0x55, 0xC6, 0xB0, 0x70, 0x7D, 0x24, 0xC0, 0x71, 0x35, 0xA8, 0xB0, -0x72, 0x5D, 0x06, 0xC0, 0x73, 0x15, 0x8A, 0xB0, 0x74, 0x3C, 0xE8, 0xC0, 0x74, 0xFE, 0xA7, 0x30, -0x76, 0x1C, 0xCA, 0xC0, 0x76, 0xDE, 0x89, 0x30, 0x77, 0xFC, 0xAC, 0xC0, 0x78, 0xBE, 0x6B, 0x30, -0x79, 0xDC, 0x8E, 0xC0, 0x7A, 0x9E, 0x4D, 0x30, 0x7B, 0xC5, 0xAB, 0x40, 0x7C, 0x7E, 0x2F, 0x30, -0x7D, 0xA5, 0x8D, 0x40, 0x7E, 0x5E, 0x11, 0x30, 0x7F, 0x85, 0x6F, 0x40, 0x01, 0x02, 0x01, 0x03, +0x48
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS configure.in main/php_version.h
johannes Tue, 23 Feb 2010 19:33:30 + Revision: http://svn.php.net/viewvc?view=revision&revision=295434 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-23 19:16:46 UTC (rev 295433) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-23 19:33:30 UTC (rev 295434) @@ -1,5 +1,8 @@ PHPNEWS ||| +?? ??? 2010, PHP 5.3.2 RC 4 + + 23 Feb 2010, PHP 5.3.2 RC 3 - Improved crypt support for edge cases (UFC compatibility). (Solar Designer, Joey, Pierre) Modified: php/php-src/branches/PHP_5_3_2/configure.in === --- php/php-src/branches/PHP_5_3_2/configure.in 2010-02-23 19:16:46 UTC (rev 295433) +++ php/php-src/branches/PHP_5_3_2/configure.in 2010-02-23 19:33:30 UTC (rev 295434) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=2 -PHP_EXTRA_VERSION="RC3" +PHP_EXTRA_VERSION="RC4-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-23 19:16:46 UTC (rev 295433) +++ php/php-src/branches/PHP_5_3_2/main/php_version.h 2010-02-23 19:33:30 UTC (rev 295434) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 2 -#define PHP_EXTRA_VERSION "RC3" -#define PHP_VERSION "5.3.2RC3" +#define PHP_EXTRA_VERSION "RC4-dev" +#define PHP_VERSION "5.3.2RC4-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_2/ NEWS configure.in main/php_version.h
johannes Tue, 23 Feb 2010 18:47:15 + Revision: http://svn.php.net/viewvc?view=revision&revision=295431 Log: PHP 5.3.2 RC3 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-23 18:28:13 UTC (rev 295430) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-23 18:47:15 UTC (rev 295431) @@ -1,13 +1,12 @@ PHPNEWS ||| -?? ??? 2010, PHP 5.3.2 RC 3 +23 Feb 2010, PHP 5.3.2 RC 3 - Improved crypt support for edge cases (UFC compatibility). (Solar Designer, Joey, Pierre) -- Fixed crypt's blowfish sanity check of the "setting" string, to reject iteration - counts encoded as 36 through 39. (Pierre) +- Fixed crypt's blowfish sanity check of the "setting" string, to reject + iteration counts encoded as 36 through 39. (Pierre) - Fixed #51059 (crypt crashes when invalid salt are given). (Pierre) - 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-23 18:28:13 UTC (rev 295430) +++ php/php-src/branches/PHP_5_3_2/configure.in 2010-02-23 18:47:15 UTC (rev 295431) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=2 -PHP_EXTRA_VERSION="RC3-dev" +PHP_EXTRA_VERSION="RC3" 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-23 18:28:13 UTC (rev 295430) +++ php/php-src/branches/PHP_5_3_2/main/php_version.h 2010-02-23 18:47:15 UTC (rev 295431) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 2 -#define PHP_EXTRA_VERSION "RC3-dev" -#define PHP_VERSION "5.3.2RC3-dev" +#define PHP_EXTRA_VERSION "RC3" +#define PHP_VERSION "5.3.2RC3" #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_2/ NEWS
pajoye Tue, 23 Feb 2010 17:50:08 + Revision: http://svn.php.net/viewvc?view=revision&revision=295422 Log: - update 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-23 17:49:00 UTC (rev 295421) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-23 17:50:08 UTC (rev 295422) @@ -1,9 +1,13 @@ PHPNEWS ||| ?? ??? 2010, PHP 5.3.2 RC 3 +- Improved crypt support for edge cases (UFC compatibility). (Solar Designer, + Joey, Pierre) +- Fixed crypt's blowfish sanity check of the "setting" string, to reject iteration + counts encoded as 36 through 39. (Pierre) +- Fixed #51059 (crypt crashes when invalid salt are given). (Pierre) - 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) -- 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/standard/crypt.c ext/standard/tests/strings/bug51059.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Tue, 23 Feb 2010 17:49:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=295421
Log:
- return *0/*1 on failure instead of FALSE, to avoid possible issues with bad
user code
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/standard/crypt.c
U php/php-src/branches/PHP_5_3_2/ext/standard/tests/strings/bug51059.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,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,294903,295164,295294-295295,295308-295309,295314,295339-295340,295402
/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,294903,295164,295294-295295,295308-295309,295314,295339-295340,295402,295419-295420
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/standard/crypt.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/crypt.c 2010-02-23 17:46:10 UTC (rev 295420)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt.c 2010-02-23 17:49:00 UTC (rev 295421)
@@ -198,7 +198,11 @@
crypt_res = php_sha512_crypt_r(str, salt, output, needed);
if (!crypt_res) {
-RETVAL_FALSE;
+if (salt[0]=='*' && salt[1]=='0') {
+ RETVAL_STRING("*1", 1);
+} else {
+ RETVAL_STRING("*0", 1);
+}
} else {
RETVAL_STRING(output, 1);
}
@@ -217,7 +221,11 @@
crypt_res = php_sha256_crypt_r(str, salt, output, needed);
if (!crypt_res) {
-RETVAL_FALSE;
+if (salt[0]=='*' && salt[1]=='0') {
+ RETVAL_STRING("*1", 1);
+} else {
+ RETVAL_STRING("*0", 1);
+}
} else {
RETVAL_STRING(output, 1);
}
@@ -238,7 +246,11 @@
crypt_res = php_crypt_blowfish_rn(str, salt, output, sizeof(output));
if (!crypt_res) {
-RETVAL_FALSE;
+if (salt[0]=='*' && salt[1]=='0') {
+ RETVAL_STRING("*1", 1);
+} else {
+ RETVAL_STRING("*0", 1);
+}
} else {
RETVAL_STRING(output, 1);
}
@@ -250,7 +262,11 @@
crypt_res = _crypt_extended_r(str, salt, &buffer);
if (!crypt_res) {
-RETURN_FALSE;
+if (salt[0]=='*' && salt[1]=='0') {
+ RETURN_STRING("*1", 1);
+} else {
+ RETURN_STRING("*0", 1);
+}
} else {
RETURN_STRING(crypt_res, 1);
}
@@ -270,7 +286,11 @@
# endif
crypt_res = crypt_r(str, salt, &buffer);
if (!crypt_res) {
- RETURN_FALSE;
+if (salt[0]=='*' && salt[1]=='0') {
+ RETURN_STRING("*1", 1);
+} else {
+ RETURN_STRING("*0", 1);
+}
} else {
RETURN_STRING(crypt_res, 1);
}
Modified: php/php-src/branches/PHP_5_3_2/ext/standard/tests/strings/bug51059.phpt
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ main/streams/plain_wrapper.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Tue, 23 Feb 2010 15:04:29 + Revision: http://svn.php.net/viewvc?view=revision&revision=295417 Log: - get the right error on windows Changed paths: _U php/php-src/branches/PHP_5_3_2/ _U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_2/main/streams/plain_wrapper.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,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,295164,295294-295295,295309,295314,295339-295340,295402 /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,295164,295294-295295,295308-295309,295314,295339-295340,295402 /php/php-src/trunk:284726 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,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,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,294903,295164,295294-295295,295309,295314,295339-295340,295402 /php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941 + /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,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,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,294903,295164,295294-295295,295308-295
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/TSRM.c TSRM/TSRM.h tests/security/open_basedir_parse_ini_file.phpt
johannes Tue, 23 Feb 2010 14:46:39 + Revision: http://svn.php.net/viewvc?view=revision&revision=295415 Log: merge r295164: update copyright (iliaa) Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/TSRM/TSRM.c U php/php-src/branches/PHP_5_3_2/TSRM/TSRM.h _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,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,294903,295294-295295,295309,295314,295339-295340,295402 /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,294903,295164,295294-295295,295309,295314,295339-295340,295402 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/TSRM/TSRM.c === --- php/php-src/branches/PHP_5_3_2/TSRM/TSRM.c 2010-02-23 12:29:45 UTC (rev 295414) +++ php/php-src/branches/PHP_5_3_2/TSRM/TSRM.c 2010-02-23 14:46:39 UTC (rev 295415) @@ -2,7 +2,7 @@ +--+ | Thread Safe Resource Manager | +--+ - | Copyright (c) 1999-2009, Andi Gutmans, Sascha Schumann, Zeev Suraski | + | Copyright (c) 1999-2010, Andi Gutmans, Sascha Schumann, Zeev Suraski | | This source file is subject to the TSRM license, that is bundled | | with this package in the file LICENSE| +--+ Modified: php/php-src/branches/PHP_5_3_2/TSRM/TSRM.h === --- php/php-src/branches/PHP_5_3_2/TSRM/TSRM.h 2010-02-23 12:29:45 UTC (rev 295414) +++ php/php-src/branches/PHP_5_3_2/TSRM/TSRM.h 2010-02-23 14:46:39 UTC (rev 295415) @@ -2,7 +2,7 @@ +--+ | Thread Safe Resource Manager | +--+ - | Copyright (c) 1999-2009, Andi Gutmans, Sascha Schumann, Zeev Suraski | + | Copyright (c) 1999-2010, Andi Gutmans, Sascha Schumann, Zeev Suraski | | This source file is subject to the TSRM license, that is bundled | | with this package in the file LICENSE| +--+ 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,29314
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/gmp/gmp.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Tue, 23 Feb 2010 11:18:24 + Revision: http://svn.php.net/viewvc?view=revision&revision=295405 Log: - fix build when __GMP_BITS_PER_MP_LIMB is not defined but GMP_LIMB_BITS (no trace of this change in gmp's changelog...) Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/gmp/gmp.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,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,295294-295295,295309,295314,295339-295340 /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,295294-295295,295309,295314,295339-295340,295402 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/gmp/gmp.c === --- php/php-src/branches/PHP_5_3_2/ext/gmp/gmp.c2010-02-23 11:11:28 UTC (rev 295404) +++ php/php-src/branches/PHP_5_3_2/ext/gmp/gmp.c2010-02-23 11:18:24 UTC (rev 295405) @@ -1374,8 +1374,11 @@ GMPG(rand_initialized) = 1; } +#ifdef GMP_LIMB_BITS + mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS); +#else mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB); - +#endif ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp); } /* }}} */ 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,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,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,294903,295294-295295,295309,295314,295339-295340 /php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941 + /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,293341,293380,293400,293409,293437,29
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/config.m4 ext/standard/crypt.c ext/standard/crypt_blowfish.c ext/standard/crypt_freesec.c ext/standard/tests/strings/bug51059.phpt ext/stan
pajoye Mon, 22 Feb 2010 00:34:22 + Revision: http://svn.php.net/viewvc?view=revision&revision=295350 Log: - crypt() fixes and sync with Solar Designer updates (rev. 295294, 295294, 295294, 295294, 295294, 295294) 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/standard/crypt.c U php/php-src/branches/PHP_5_3_2/ext/standard/crypt_blowfish.c U php/php-src/branches/PHP_5_3_2/ext/standard/crypt_freesec.c A + php/php-src/branches/PHP_5_3_2/ext/standard/tests/strings/bug51059.phpt (from php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt:r295294) A + php/php-src/branches/PHP_5_3_2/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt (from php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt:r295294) _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,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,294903 /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,294903,295294-295295,295309,295314,295339-295340 /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-22 00:32:00 UTC (rev 295349) +++ php/php-src/branches/PHP_5_3_2/ext/standard/config.m4 2010-02-22 00:34:22 UTC (rev 295350) @@ -273,7 +273,7 @@ AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, 1, [Whether the system supports standard DES salt]) AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, 1, [Whether the system supports BlowFish salt]) AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, 1, [Whether the system supports extended DES salt]) - AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports extended DES salt]) + AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports MD5 salt]) AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, 1, [Whether the system supports SHA512 salt]) AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, 1, [Whether the system supports SHA256 salt]) Modified: php/php-src/branches/PHP_5_3_2/ext/standard/crypt.c === --- php/php-src/branches/PHP_5_3_2/ext/standard/crypt.c 2010-02-22 00:32:00 UTC (rev 295349) +++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt.c 2010-02-22 00:34:22 UTC (rev 295350) @@ -15,6 +15,7 @@ | Authors: Stig Bakken| | Zeev Suraski | | Rasmus Lerdorf | + | Pierre Joye | +-
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/snmp/config.w32 tests/security/open_basedir_parse_ini_file.phpt
we already explained why, blame svn.
Cheers,
On Fri, Feb 19, 2010 at 12:00 PM, Kalle Sommer Nielsen wrote:
> -- Forwarded message --
> From: Kalle Sommer Nielsen
> Date: 2010/2/9
> Subject: Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/
> ext/snmp/config.w32 tests/security/open_basedir_parse_ini_file.phpt
> To: Pierre Joye
>
>
> 2010/2/9 Pierre Joye :
>> + if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD
>> + "\\include\\net-snmp;" + PHP_SNMP)) {
>> + if (CHECK_LIB("netsnmp.lib", "snmp", PHP_SNMP)) {
>> + EXTENSION('snmp', 'snmp.c');
>> + CHECK_LIB("libeay32.lib", "snmp", PHP_SNMP)
>
> This doesn't look right, the CHECK_LIB call should be in a conditional
> here? no? Also, I don't remember how strict JScript is, but the
> function call is missing a ;, but I remember Douglas Crockford saying
> something about JS and its magic semicolons =]
>
>> + AC_DEFINE('HAVE_SNMP', 1);
>> + AC_DEFINE("HAVE_NET_SNMP", 1);
>> + } else if (CHECK_LIB("libsnmp.lib", "snmp", PHP_SNMP)) {
>> + EXTENSION('snmp', 'snmp.c');
>> + AC_DEFINE('HAVE_SNMP', 1);
>> + } else {
>> + WARNING("snmp not enabled; libraries and headers not
>> found");
>> + }
>
> Also, in every commit you do to 5.3.2, you seem to change properties
> on /ext/tidy/tests/ and an open_base_dir test.
>
> --
> regards,
>
> Kalle Sommer Nielsen
> ka...@php.net
>
>
>
> --
> regards,
>
> Kalle Sommer Nielsen
> ka...@php.net
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Fwd: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/snmp/config.w32 tests/security/open_basedir_parse_ini_file.phpt
-- Forwarded message --
From: Kalle Sommer Nielsen
Date: 2010/2/9
Subject: Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/
ext/snmp/config.w32 tests/security/open_basedir_parse_ini_file.phpt
To: Pierre Joye
2010/2/9 Pierre Joye :
> + if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD +
> "\\include\\net-snmp;" + PHP_SNMP)) {
> + if (CHECK_LIB("netsnmp.lib", "snmp", PHP_SNMP)) {
> + EXTENSION('snmp', 'snmp.c');
> + CHECK_LIB("libeay32.lib", "snmp", PHP_SNMP)
This doesn't look right, the CHECK_LIB call should be in a conditional
here? no? Also, I don't remember how strict JScript is, but the
function call is missing a ;, but I remember Douglas Crockford saying
something about JS and its magic semicolons =]
> + AC_DEFINE('HAVE_SNMP', 1);
> + AC_DEFINE("HAVE_NET_SNMP", 1);
> + } else if (CHECK_LIB("libsnmp.lib", "snmp", PHP_SNMP)) {
> + EXTENSION('snmp', 'snmp.c');
> + AC_DEFINE('HAVE_SNMP', 1);
> + } else {
> + WARNING("snmp not enabled; libraries and headers not
> found");
> + }
Also, in every commit you do to 5.3.2, you seem to change properties
on /ext/tidy/tests/ and an open_base_dir test.
--
regards,
Kalle Sommer Nielsen
ka...@php.net
--
regards,
Kalle Sommer Nielsen
ka...@php.net
--
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
johannes Fri, 12 Feb 2010 00:53:32 + Revision: http://svn.php.net/viewvc?view=revision&revision=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_2/ NEWS configure.in main/php_version.h
johannes Fri, 12 Feb 2010 00:20:28 + Revision: http://svn.php.net/viewvc?view=revision&revision=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/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
johannes Fri, 12 Feb 2010 00:19:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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_fetc
[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
pajoye Thu, 11 Feb 2010 23:55:19 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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 );
+ resourcebundle_i
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS
pajoye Thu, 11 Feb 2010 21:12:11 + Revision: http://svn.php.net/viewvc?view=revision&revision=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_2/ NEWS
johannes Thu, 11 Feb 2010 19:51:28 + Revision: http://svn.php.net/viewvc?view=revision&revision=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 ext/standard/file.c tests/security/open_basedir_parse_ini_file.phpt
johannes Thu, 11 Feb 2010 18:03:57 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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/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,29
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/config.m4 tests/security/open_basedir_parse_ini_file.phpt
johannes Thu, 11 Feb 2010 18:00:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=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/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,294
[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
johannes Thu, 11 Feb 2010 17:53:22 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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 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
#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: svn:mergeinfo
[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
johannes Thu, 11 Feb 2010 17:36:40 + Revision: http://svn.php.net/viewvc?view=revision&revision=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/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,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,
[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
johannes Thu, 11 Feb 2010 17:24:43 + Revision: http://svn.php.net/viewvc?view=revision&revision=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: ph
[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
johannes Thu, 11 Feb 2010 17:14:44 + Revision: http://svn.php.net/viewvc?view=revision&revision=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/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,293726-293728,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-29
[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
pajoye Thu, 11 Feb 2010 11:11:47 + Revision: http://svn.php.net/viewvc?view=revision&revision=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.hf = (f / 100); } Modified: php/php-src/branches/PHP_5_3_2/ext/date/lib/parse_date.re === --- php/php-src/branches/PHP_5_3_2/ext/date/lib/parse_date.re 2010-02-11 11:08:44 UTC (rev 294879) +++ php/php-src/branches/PHP_5_3_2/ext/date/lib/parse_date.re 2010-02-11 11:11:47 UTC (rev 294880) @@ -1951,8 +1951,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); + if ((f = timelib_get_nr((char **) &ptr, 6)) == TIMELIB_UNSET || ptr - tptr != 6) { + add_pbf_error(s, "A six digit millisecond could not be found", string, begin); } else { s->time->f = (f / 100); } Modified: php/php-src/br
[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
pajoye Thu, 11 Feb 2010 11:02:53 + Revision: http://svn.php.net/viewvc?view=revision&revision=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/php-src/branches/PHP_5_3/e
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ext/standard/ config.m4
johannes Wed, 10 Feb 2010 13:46:39 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294848
Log:
merge 294847: fix config test (johannes)
Changed paths:
U php/php-src/branches/PHP_5_3_2/ext/standard/config.m4
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-10
13:37:17 UTC (rev 294847)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/config.m4 2010-02-10
13:46:39 UTC (rev 294848)
@@ -239,13 +239,11 @@
dnl
dnl Check for __alignof__ support in the compiler
dnl
- AC_CACHE_CHECK(whether the compiler supports
__alignof__,ac_cv_alignof_exists,[
+ AC_CACHE_CHECK(whether the compiler supports __alignof__,
ac_cv_alignof_exists,[
AC_TRY_COMPILE([
-int main() {
- int align = __alignof__(int);
- return 0;
-}
],[
+int align = __alignof__(int);
+ ],[
ac_cv_alignof_exists=yes
],[
ac_cv_alignof_exists=no
@@ -257,8 +255,9 @@
dnl
dnl Check for __attribute__ ((__aligned__)) support in the compiler
dnl
- AC_CACHE_CHECK(whether the compiler supports aligned
attribute,ac_cv_attribute_aligned,[
+ AC_CACHE_CHECK(whether the compiler supports aligned attribute,
ac_cv_attribute_aligned,[
AC_TRY_COMPILE([
+ ],[
unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int;
],[
ac_cv_attribute_aligned=yes
@@ -266,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, [Wheter the compiler supports
__attribute__ ((__aligned__))])
fi
--
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/standard/config.m4 ext/standard/crypt_sha256.c ext/standard/crypt_sha512.c tests/security/open_basedir_parse_ini_file.phpt
johannes Tue, 09 Feb 2010 22:29:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294827
Log:
merge 294825: Detect if we can rely on compiler-specific alignment features else
use custom workarounds. Fixes #50753 (johannes)
Bug: http://bugs.php.net/50753 (Closed) crypt_sha256.c / crypt_sha512.c - Gnu
specific code, non-Gnu compiler
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/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,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
/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
/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-09 22:06:31 UTC (rev 294826)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/config.m4 2010-02-09 22:29:10 UTC (rev 294827)
@@ -235,6 +235,41 @@
dnl If one of them is missing, use our own implementation, portable code is then possible
dnl
if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
+
+ dnl
+ dnl Check for __alignof__ support in the compiler
+ dnl
+ AC_CACHE_CHECK(whether the compiler supports __alignof__,ac_cv_alignof_exists,[
+ AC_TRY_COMPILE([
+int main() {
+ int align = __alignof__(int);
+ return 0;
+}
+ ],[
+ac_cv_alignof_exists=yes
+ ],[
+ac_cv_alignof_exists=no
+ ])])
+ if test "$ac_cv_alignof_exists" = "yes"; then
+AC_DEFINE([HAVE_ALIGNOF], 1, [whether the compiler supports __alignof__])
+ fi
+
+ dnl
+ dnl Check for __attribute__ ((__aligned__)) support in the compiler
+ dnl
+ AC_CACHE_CHECK(whether the compiler supports aligned attribute,ac_cv_attribute_aligned,[
+ AC_TRY_COMPILE([
+unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int;
+ ],[
+ac_cv_attribute_aligned=yes
+ ],[
+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__))])
+ fi
+
+
AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5])
AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, 1, [Whether the system supports standard DES salt])
AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, 1, [Whether the system supports BlowFish salt])
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-09 22:06:31 UTC (rev 294826)
+
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/zip/php_zip.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Tue, 09 Feb 2010 17:51:39 + Revision: http://svn.php.net/viewvc?view=revision&revision=294817 Log: - It's a size_t here, not an unsigned int Changed paths: _U php/php-src/branches/PHP_5_3_2/ _U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_2/ext/zip/php_zip.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,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 /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 /php/php-src/trunk:284726 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,293726-293728,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,294814 /php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941 + /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,293726-293728,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,294814,294816 /php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941 Modified: php/php-src/branches/PHP_5_3_2/ext/zip/php_zip.c === --- php/php-src/branches/PHP_5_3_2/ext/zip/php_zip.c2010-02-09 17:38:36 UTC (rev 294816) +++ php/php-src/branches/PHP_5_3_2/ext/zip/php_zip.c2010-02-09 17:51:39 UTC (rev 294817) @@ -182,7 +182,7 @@ len = spprintf(&file_dirname_fullpath, 0, "%s/%s", dest, file_dirname); } - php_basename(path_cleaned, path_cleaned_len, NULL, 0, &file_basename, (unsigned int *)&file_basename_
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/snmp/config.w32 tests/security/open_basedir_parse_ini_file.phpt
pajoye Tue, 09 Feb 2010 16:42:40 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294815
Log:
- improve netsnmp detectio and restore snmp on win
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/snmp/config.w32
_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
/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
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/snmp/config.w32
===
--- php/php-src/branches/PHP_5_3_2/ext/snmp/config.w32 2010-02-09 16:38:24 UTC
(rev 294814)
+++ php/php-src/branches/PHP_5_3_2/ext/snmp/config.w32 2010-02-09 16:42:40 UTC
(rev 294815)
@@ -4,13 +4,18 @@
ARG_WITH("snmp", "SNMP support", "no");
if (PHP_SNMP != "no") {
-
- if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD +
"\\include\\ucd-snmp;" + PHP_PHP_BUILD + "\\include\\net-snmp;" + PHP_SNMP) &&
- CHECK_LIB("libsnmp.lib", "snmp", PHP_SNMP)) {
- EXTENSION('snmp', 'snmp.c');
-
- AC_DEFINE('HAVE_SNMP', 1);
-
+ if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD +
"\\include\\net-snmp;" + PHP_SNMP)) {
+ if (CHECK_LIB("netsnmp.lib", "snmp", PHP_SNMP)) {
+ EXTENSION('snmp', 'snmp.c');
+ CHECK_LIB("libeay32.lib", "snmp", PHP_SNMP)
+ AC_DEFINE('HAVE_SNMP', 1);
+ AC_DEFINE("HAVE_NET_SNMP", 1);
+ } else if (CHECK_LIB("libsnmp.lib", "snmp", PHP_SNMP)) {
+ EXTENSION('snmp', 'snmp.c');
+ AC_DEFINE('HAVE_SNMP', 1);
+ } else {
+ WARNING("snmp not enabled; libraries and headers not
found");
+ }
} else {
WARNING("snmp not enabled; libraries and headers not found");
}
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,293726-293728,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,29
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Sun, 07 Feb 2010 21:09:19 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294728
Log:
- fix leak
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.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,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
/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
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-07 21:07:10 UTC
(rev 294727)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-07 21:09:19 UTC
(rev 294728)
@@ -223,11 +223,13 @@
}
if(access(pathname, mode)) {
+ free(real_path);
return errno;
}
/* If only existence check is made, return now */
if (mode == 0) {
+ free(real_path);
return 0;
}
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,293726-293728,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,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
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
+
/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,293726-293728,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
/php/php-src/trunk/ext/tidy/tes
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ Zend/zend_ini_scanner.c Zend/zend_ini_scanner.l Zend/zend_ini_scanner_defs.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Sun, 07 Feb 2010 12:08:22 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294698
Log:
- Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files)
Bug: http://bugs.php.net/50952 (Closed) allow underscore _ in constants parsed
in php.ini files
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/Zend/zend_ini_scanner.c
U php/php-src/branches/PHP_5_3_2/Zend/zend_ini_scanner.l
U php/php-src/branches/PHP_5_3_2/Zend/zend_ini_scanner_defs.h
_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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571
/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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_ini_scanner.c
===
--- php/php-src/branches/PHP_5_3_2/Zend/zend_ini_scanner.c 2010-02-07 11:42:52 UTC (rev 294697)
+++ php/php-src/branches/PHP_5_3_2/Zend/zend_ini_scanner.c 2010-02-07 12:08:22 UTC (rev 294698)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Dec 8 12:24:52 2009 */
+/* Generated by re2c 0.13.5 on Sun Feb 7 13:25:37 2010 */
#line 1 "Zend/zend_ini_scanner.l"
/*
+--+
@@ -1273,7 +1273,7 @@
YYDEBUG(84, *YYCURSOR);
YYFILL(2);
yych = *YYCURSOR;
- if (yych <= ',') {
+ if (yych <= '-') {
if (yych <= ' ') {
if (yych <= '\n') {
if (yych <= 0x08) goto yy86;
@@ -1284,29 +1284,30 @@
if (yych >= ' ') goto yy88;
}
} else {
-if (yych <= '#') {
+if (yych <= '$') {
if (yych == '"') goto yy91;
+ if (yych >= '$') goto yy93;
} else {
- if (yych <= '$') goto yy93;
if (yych == '\'') goto yy94;
+ if (yych >= '-') goto yy95;
}
}
} else {
- if (yych <= '@') {
-if (yych <= '/') {
- if (yych <= '-') goto yy95;
+ if (yych <= 'Z') {
+if (yych <= '9') {
if (yych <= '.') goto yy96;
+ if (yych >= '0') goto yy97;
} else {
- if (yych <= '9') goto yy97;
if (yych == ';') goto yy89;
+ if (yych >= 'A') goto yy99;
}
} else {
-if (yych <= '\\') {
- if (yych <= 'Z') goto yy99;
- if (yych >= '\\') goto yy101;
+if (yych <= '^') {
+ if (yych <= '[') goto yy86;
+ if (yych <= '\\') goto yy101;
+ if (yych <= ']') goto yy102;
} else {
- if (yych <= ']') goto yy102;
- if (yych <= '`') goto yy86;
+ if (yych == '`') goto yy86;
if (yych <= 'z') goto yy99;
}
}
@@ -1323,7 +1324,7 @@
{ /* Get rest as section/offset value */
RETURN_TOKEN(TC_STRING, yytext, yyleng);
}
-#line 1327 "Zend/zend_ini_scanner.c"
+#line 1328 "Zend/zend_ini_scanner.c"
yy88:
YYDEBUG(88, *YYCURSOR);
yyaccept = 0;
@@ -1344,7 +1345,7 @@
{
return 0;
}
-#line 1348 "Zend/zend_ini_scanner.c"
+#line 1349 "Zend/zend_ini_scanner.c"
yy91:
YYDEBUG(91, *YYCURSOR);
++YYCURSOR;
@@ -1356,7 +1357,7 @@
yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
return '"';
}
-#line 1360 "Zend/zend_ini_scanner.c"
+#line 1361 "Zend/zend_ini_scanner.c"
yy93:
YYDEBUG(93, *YYCURSOR);
yych = *++YYCURSOR;
@@ -1422,7 +1423,7 @@
{ /* Get number opti
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS sapi/apache/mod_php5.c sapi/apache2filter/sapi_apache2.c sapi/apache2handler/sapi_apache2.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Fri, 05 Feb 2010 19:34:47 + Revision: http://svn.php.net/viewvc?view=revision&revision=294572 Log: - Fix bug #50940 Bug: http://bugs.php.net/50940 (Closed) All Apache SAPI sets content length wrong 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/ U php/php-src/branches/PHP_5_3_2/sapi/apache/mod_php5.c U php/php-src/branches/PHP_5_3_2/sapi/apache2filter/sapi_apache2.c U php/php-src/branches/PHP_5_3_2/sapi/apache2handler/sapi_apache2.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,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532 /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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571 /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-05 18:59:05 UTC (rev 294571) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-05 19:34:47 UTC (rev 294572) @@ -17,6 +17,8 @@ links or invalid paths. (Pierre) - Fixed error output to stderr on Windows. (Pierre) +- Fixed bug #50940 Custom content-length set incorrectly in Apache sapis. + (Brian France, Rasmus) - 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). 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,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532 /php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941 + /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,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571 /php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941 Modified: php/php-src/branches/PHP_5_3_2/sapi/apache/mod_php5.c === --- php/php-src/branches/PHP_5_3_2/sapi/apache/mod_php5.c 2010-02-05 18:59:05 UTC (rev 294571) +++ php/php-src/branches/PHP_5_3_2/sapi/apache/mod_php5.c 2010-02-05 19:34:47 UTC (rev 294572) @@ -
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/standard/mail.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Fri, 05 Feb 2010 00:19:32 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294548
Log:
- Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).
Bug: http://bugs.php.net/50907 (Closed) X-PHP-Originating-Script adding two new
lines in *NIX
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/mail.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,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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487,294498,294532
/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,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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334-294335,294418,294421,294487,294498,294532
/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-05 00:17:54 UTC (rev 294547)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-05 00:19:32 UTC (rev 294548)
@@ -17,6 +17,8 @@
links or invalid paths. (Pierre)
- Fixed error output to stderr on Windows. (Pierre)
+- 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
Modified: php/php-src/branches/PHP_5_3_2/ext/standard/mail.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/mail.c 2010-02-05 00:17:54 UTC
(rev 294547)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/mail.c 2010-02-05 00:19:32 UTC
(rev 294548)
@@ -241,7 +241,7 @@
php_basename(tmp, strlen(tmp), NULL, 0,&f, &f_len TSRMLS_CC);
if (headers != NULL) {
- spprintf(&hdr, 0, "X-PHP-Originating-Script:
%ld:%s\r\n%s", php_getuid(), f, headers);
+ spprintf(&hdr, 0, "X-PHP-Originating-Script:
%ld:%s\n%s", php_getuid(), f, headers);
} else {
spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n",
php_getuid(), f);
}
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,293176,293180,293216,293235,293253,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,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487,294498,294532
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,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,293897,29
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/tests/mail/mail_basic.phpt ext/standard/tests/mail/mail_basic2.phpt ext/standard/tests/mail/mail_variation2.phpt tests/security/open_basedi
pajoye Fri, 05 Feb 2010 00:43:02 + Revision: http://svn.php.net/viewvc?view=revision&revision=294551 Log: - Explicitly set mail.add_x_header in php.ini Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/standard/tests/mail/mail_basic.phpt U php/php-src/branches/PHP_5_3_2/ext/standard/tests/mail/mail_basic2.phpt U php/php-src/branches/PHP_5_3_2/ext/standard/tests/mail/mail_variation2.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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532 /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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/standard/tests/mail/mail_basic.phpt === --- php/php-src/branches/PHP_5_3_2/ext/standard/tests/mail/mail_basic.phpt 2010-02-05 00:39:31 UTC (rev 294550) +++ php/php-src/branches/PHP_5_3_2/ext/standard/tests/mail/mail_basic.phpt 2010-02-05 00:43:02 UTC (rev 294551) @@ -2,6 +2,7 @@ Test mail() function : basic functionality --INI-- sendmail_path=tee mailBasic.out >/dev/null +mail.add_x_header = Off --SKIPIF-- --INI-- sendmail_path="sed > /tmp/php_test_mailBasic2.out" +mail.add_x_header = Off --FILE-- /tmp/php_test_mailVariation2.out" mail.force_extra_parameters="-e4a---forced-params" +mail.add_x_header = Off --SKIPIF-- -- 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/ main/streams/streams.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Fri, 05 Feb 2010 00:39:31 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294550
Log:
- Fixed bug #50657
Bug: http://bugs.php.net/50657 (Closed) copy() with an empty (zero-byte) HTTP
source succeeds but returns false
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_2/main/streams/streams.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,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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk:284726
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,293176,293180,293216,293235,293253,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,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
+
/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,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_2/main/streams/streams.c
===
--- php/php-src/branches/PHP_5_3_2/main/streams/streams.c 2010-02-05
00:37:07 UTC (rev 294549)
+++ php/php-src/branches/PHP_5_3_2/main/streams/streams.c 2010-02-05
00:39:31 UTC (rev 294550)
@@ -1396,7 +1396,7 @@
/* we've got at least 1 byte to read.
* less than 1 is an error */
- if (haveread > 0) {
+ if (haveread > 0 || src->eof) {
return SUCCESS;
}
return FAILURE;
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,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,293897,293901-293902,293906,293965,293976,293985,293998,294
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ Zend/tests/bug48667_1.phpt Zend/tests/bug48667_2.phpt Zend/zend_interfaces.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Fri, 05 Feb 2010 00:37:07 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294549
Log:
- Fix #48667 (Implementing Iterator and IteratorAggregate is now restricted..
Bug: http://bugs.php.net/48667 (Closed) "could not implement" - NOT redefining
functions
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
A + php/php-src/branches/PHP_5_3_2/Zend/tests/bug48667_1.phpt
(from php/php-src/branches/PHP_5_3/Zend/tests/bug48667_1.phpt:r294304)
A + php/php-src/branches/PHP_5_3_2/Zend/tests/bug48667_2.phpt
(from php/php-src/branches/PHP_5_3/Zend/tests/bug48667_2.phpt:r294304)
U php/php-src/branches/PHP_5_3_2/Zend/zend_interfaces.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,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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334-294335,294418,294421,294487,294498,294532
/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,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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk:284726
Copied: php/php-src/branches/PHP_5_3_2/Zend/tests/bug48667_1.phpt (from rev
294304, php/php-src/branches/PHP_5_3/Zend/tests/bug48667_1.phpt)
===
--- php/php-src/branches/PHP_5_3_2/Zend/tests/bug48667_1.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/Zend/tests/bug48667_1.phpt 2010-02-05
00:37:07 UTC (rev 294549)
@@ -0,0 +1,10 @@
+--TEST--
+Bug #48667 (Implementing both iterator and iteratoraggregate)
+--FILE--
+
+--EXPECTF--
+Fatal error: Class A cannot implement both IteratorAggregate and Iterator at
the same time in %s on line %d
Copied: php/php-src/branches/PHP_5_3_2/Zend/tests/bug48667_2.phpt (from rev
294304, php/php-src/branches/PHP_5_3/Zend/tests/bug48667_2.phpt)
===
--- php/php-src/branches/PHP_5_3_2/Zend/tests/bug48667_2.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/Zend/tests/bug48667_2.phpt 2010-02-05
00:37:07 UTC (rev 294549)
@@ -0,0 +1,10 @@
+--TEST--
+Bug #48667 (Implementing both iterator and iteratoraggregate)
+--FILE--
+
+--EXPECTF--
+Fatal error: Class A cannot implement both Iterator and IteratorAggregate at
the same time in %s on line %d
Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_interfaces.c
===
--- php/php-src/branches/PHP_5_3_2/Zend/zend_interfaces.c 2010-02-05
00:19:32 UTC (rev 294548)
+++ php/php-src/branches/PHP_5_3_2/Zend/zend_interfaces.c 2010-02-05
00:37:07 UTC (rev 294549)
@@ -353,6 +353,10 @@
if (class_type->num_interfaces) {
for (i = 0; i < class_type->num_interfaces;
i++) {
if (class_type->interfaces[i] ==
zend_ce_iterator) {
+ zend_error(E_ERROR, "Class %s
cannot implement both %s and %s at the same time",
+
class_type->name,
+
interface->name,
+
zend_ce_iterator->name);
return FAILURE;
}
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ README.WIN32-BUILD-SYSTEM tests/security/open_basedir_parse_ini_file.phpt
pajoye Fri, 05 Feb 2010 00:17:54 + Revision: http://svn.php.net/viewvc?view=revision&revision=294547 Log: - if they are outdated/wrong, no need to confuse the users Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/README.WIN32-BUILD-SYSTEM _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,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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487,294532 /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,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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487,294498,294532 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/README.WIN32-BUILD-SYSTEM === --- php/php-src/branches/PHP_5_3_2/README.WIN32-BUILD-SYSTEM 2010-02-05 00:14:18 UTC (rev 294546) +++ php/php-src/branches/PHP_5_3_2/README.WIN32-BUILD-SYSTEM 2010-02-05 00:17:54 UTC (rev 294547) @@ -1,179 +1,6 @@ The Win32 Build System. -$Id$ -Wez Furlong +See http://wiki.php.net/internals/windows/stepbystepbuild -NOTE: - These instructions are outdated, use at your own risk. - - -If you need help with the build system, send mail to -internals-...@lists.php.net; please don't email me directly. - -=== -Contents: -1. How to build PHP under windows - a. Requirements - b. Opening a command prompt - c. Generating configure.js - d. Configuring - e. Building - f. Cleaning up - g. Running the test suite - h. snapshot building - -2. How to write config.w32 files - x. to be written. - -=== -1. How to build PHP under windows -a. Requirements - - You need: - - Windows Scripting Host (cscript.exe) - - Microsoft Build Tools from: - Microsoft Visual Studio (VC6) or later - - You also need: - - bindlib_w32 [http://www.php.net/extra/bindlib_w32.zip] - - win32build [http://www.php.net/extra/win32build.zip] - - b. Opening the Build Environment Command Prompt: - - Using Visual Studio (VC6) -1. Install it -2. If you have a VC++ Command Prompt icon on your start menu, - click on it to get a Command Prompt with the env vars - set up correctly. - - If not, create a new shortcut and set the Target to: - - %comspec% /k "C:\Program Files\Microsoft Visual Studio\VC98\Bin\vcvars32.bat" - - You might also want to set the prompt to start in - a convenient location (such as the root of your - PHP source checkout). - - - Using Visual Studio .Net -1. Install it. -2. Under the Visual Studio .Net Tools sub menu of your start - menu, you should have a Visual Studio .Net Command Prompt - icon. If not, create a new shortcut and set the Target to: - - %comspec% /k "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat" - - You might also want to set the prompt to start in - a convenient location (such as the root of your - PHP source checkout). - - - Using the Platform SDK tools -1. Download the Platform SDK: - http://www.microsoft.com/msdownload/platformsdk/sdkupdate/ - - - You need the Core SDK, which is approx 200MB to download - and requires approx 500MB of disk space. - - The other components of the SDK are not required by PHP - - You might be able to reduce the download size by downloading - the install
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Fri, 05 Feb 2010 00:14:18 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294546
Log:
- silent warning
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.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,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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487
/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,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,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487,294532
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 23:05:18 UTC
(rev 294545)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-05 00:14:18 UTC
(rev 294546)
@@ -348,7 +348,7 @@
else if(desired_access == FILE_GENERIC_WRITE) {
bucket->is_wvalid = 1;
bucket->is_writable = fAccess;
- } else if (desired_access == FILE_GENERIC_READ |
FILE_GENERIC_WRITE) {
+ } else if (desired_access == (FILE_GENERIC_READ |
FILE_GENERIC_WRITE)) {
bucket->is_rvalid = 1;
bucket->is_readable = fAccess;
bucket->is_wvalid = 1;
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,293176,293180,293216,293235,293253,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,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,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,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487,294532
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,2937
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 19:54:04 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294542
Log:
- fix write access check when write mode only is requested (not RW)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 19:50:49 UTC
(rev 294541)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 19:54:04 UTC
(rev 294542)
@@ -303,7 +303,7 @@
fAccess = bucket->is_writable;
goto Finished;
}
- desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
+ desired_access = FILE_GENERIC_WRITE;
} else if(mode <= 4) {
if(bucket != NULL && bucket->is_rvalid) {
fAccess = bucket->is_readable;
@@ -348,6 +348,11 @@
else if(desired_access == FILE_GENERIC_WRITE) {
bucket->is_wvalid = 1;
bucket->is_writable = fAccess;
+ } else if (desired_access == FILE_GENERIC_READ |
FILE_GENERIC_WRITE) {
+ bucket->is_rvalid = 1;
+ bucket->is_readable = fAccess;
+ bucket->is_wvalid = 1;
+ bucket->is_writable = fAccess;
}
}
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_par
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/pdo_oci/config.m4 tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 19:50:49 + Revision: http://svn.php.net/viewvc?view=revision&revision=294541 Log: - Allow newer oracle versions Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/pdo_oci/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,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418 /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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_oci/config.m4 === --- php/php-src/branches/PHP_5_3_2/ext/pdo_oci/config.m42010-02-04 19:14:07 UTC (rev 294540) +++ php/php-src/branches/PHP_5_3_2/ext/pdo_oci/config.m42010-02-04 19:50:49 UTC (rev 294541) @@ -132,7 +132,7 @@ fi case $PDO_OCI_VERSION in -9.0|10.1|10.2|11.1) +9.0|10.1|10.2|11.1|11.2) PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; 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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,2
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS Zend/zend_execute.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 10:21:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=294526 Log: - Fixed bug #50723 (Bug in garbage collector causes crash) Bug: http://bugs.php.net/50723 (unknown) 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/Zend/zend_execute.h _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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294418 /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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418 /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-04 10:18:42 UTC (rev 294525) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-04 10:21:05 UTC (rev 294526) @@ -9,6 +9,39 @@ (Ilia) - Added stream_resolve_include_path(). (Mikko) +- 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 #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) Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_execute.h === --- php/php-src/branches/PHP_5_3_2/Zend/zend_execute.h 2010-02-04 10:18:42 UTC (rev 294525) +++ php/php-src/branches/PHP_5_3_2/Zend/zend_execute.h 2010-02-04 10:21:05 UTC (rev 294526) @@ -228,7 +228,7 @@ int extra = (ZEND_MM_ALIGNMENT - ((zend_uintptr_t)EG(argument_stack)->top & (ZEND_MM_ALIGNMENT - 1))) / sizeof(void*); if (UNEXPECTED(size + extra + ZEND_MM_ALIGNED_SIZE(sizeof(void*)) / sizeof(void*) > - (zend_uintptr_t)EG(argument_stack)->end - (zend_
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ main/php.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 10:13:54 + Revision: http://svn.php.net/viewvc?view=revision&revision=294524 Log: - missing patch for #45986 (r294053) Bug: http://bugs.php.net/45986 (unknown) Changed paths: _U php/php-src/branches/PHP_5_3_2/ _U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_2/main/php.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294418 /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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294418 /php/php-src/trunk:284726 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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294418 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294418 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Modified: php/php-src/branches/PHP_5_3_2/main/php.h === --- php/php-src/branches/PHP_5_3_2/main/php.h 2010-02-04 10:09:55 UTC (rev 294523) +++ php/php-src/branches/PHP_5_3_2/main/php.h 2010-02-04 10:13:54 UTC (rev 294524) @@ -309,8 +309,9 @@ PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5); PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6); +#ifdef PHP_WIN32 PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC); - +#endif END_EXTERN_C() #define php_error_docref php_error_docref0 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294418 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/zip/lib/zip_close.c ext/zip/lib/zip_dirent.c ext/zip/lib/zip_file_get_offset.c ext/zip/lib/zip_fread.c ext/zip/lib/zip_open.c ext/zip/lib/zipint.h e
pajoye Thu, 04 Feb 2010 10:09:25 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294522
Log:
- update lib to 0.9.3, fix leaks and test
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_close.c
U php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_dirent.c
U php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_file_get_offset.c
U php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_fread.c
U php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_open.c
U php/php-src/branches/PHP_5_3_2/ext/zip/lib/zipint.h
U php/php-src/branches/PHP_5_3_2/ext/zip/tests/bug47667.phpt
_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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294418
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294418
/php/php-src/trunk:284726
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294418
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+ /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294418
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_close.c
===
--- php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_close.c 2010-02-04 10:08:07 UTC (rev 294521)
+++ php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_close.c 2010-02-04 10:09:25 UTC (rev 294522)
@@ -135,6 +135,7 @@
if ((temp=_zip_create_temp_output(za, &out)) == NULL) {
_zip_cdir_free(cd);
+ free(filelist);
return -1;
}
@@ -192,7 +193,8 @@
error = 1;
break;
}
- if (_zip_dirent_read(&de, za->zp, NULL, 0, 1, &za->error) != 0) {
+ if (_zip_dirent_read(&de, za->zp, NULL, NULL, 1,
+ &za->error) != 0) {
error = 1;
break;
}
@@ -264,6 +266,8 @@
_zip_dirent_finalize(&de);
}
+free(filelist);
+
if (!error) {
if (write_cdir(za, cd, out) < 0)
error = 1;
@@ -306,6 +310,8 @@
mask = umask(0);
umask(mask);
chmod(za->zn, 0666&~mask);
+if (za->ch_comment)
+free(za->ch_comment);
_zip_free(za);
free(temp);
@@ -443,6 +449,7 @@
zstr.next_out = (Bytef *)b2;
zstr.avail_out = sizeof(b2);
+zstr.next_in = NULL;
zstr.avail_in = 0;
flush = 0;
Modified: php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_dirent.c
===
--- php/php-src/branches/PHP_5_3_2/ext/zip/lib/zip_dirent.c 20
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_virtual_cwd.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:57:30 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294520
Log:
- set errno on failure so that the caller can still rely on strerror, missing
patch
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294418
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c 2010-02-04
09:55:13 UTC (rev 294519)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c 2010-02-04
09:57:30 UTC (rev 294520)
@@ -1002,7 +1002,11 @@
if (path_length == 0 || path_length >= MAXPATHLEN-1) {
#ifdef TSRM_WIN32
+# if _MSC_VER < 1300
+ errno = EINVAL;
+# else
_set_errno(EINVAL);
+# endif
#else
errno = EINVAL;
#endif
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294418
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_virtual_cwd.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:55:13 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294519
Log:
- - set errno on failure so that the caller can still rely on strerror
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c 2010-02-04
09:48:02 UTC (rev 294518)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c 2010-02-04
09:55:13 UTC (rev 294519)
@@ -1001,6 +1001,11 @@
TSRMLS_FETCH();
if (path_length == 0 || path_length >= MAXPATHLEN-1) {
+#ifdef TSRM_WIN32
+ _set_errno(EINVAL);
+#else
+ errno = EINVAL;
+#endif
return 1;
}
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ Zend/zend_alloc.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:48:02 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294518
Log:
- try again to get a crypto context when the key container did not exist
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/Zend/zend_alloc.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_alloc.c
===
--- php/php-src/branches/PHP_5_3_2/Zend/zend_alloc.c2010-02-04 09:44:16 UTC
(rev 294517)
+++ php/php-src/branches/PHP_5_3_2/Zend/zend_alloc.c2010-02-04 09:48:02 UTC
(rev 294518)
@@ -944,15 +944,27 @@
#endif
#if ZEND_MM_HEAP_PROTECTION || ZEND_MM_COOKIES
-static void zend_mm_random(unsigned char *buf, size_t size)
+static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */
{
size_t i = 0;
unsigned char t;
#ifdef ZEND_WIN32
HCRYPTPROV hCryptProv;
+ int has_context = 0;
- if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
+ if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
+ /* Could mean that the key container does not exist, let try
+ again by asking for a new one */
+ if (GetLastError() == NTE_BAD_KEYSET) {
+ if (CryptAcquireContext(&hCryptProv, NULL, NULL,
PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
+ has_context = 1;
+ }
+ }
+ } else {
+ has_context = 1;
+ }
+ if (has_context) {
do {
BOOL ret = CryptGenRandom(hCryptProv, size, buf);
CryptReleaseContext(hCryptProv, 0);
@@ -961,7 +973,7 @@
i++;
}
if (i == size) {
- return;
+ return;
}
}
} while (0);
@@ -990,6 +1002,7 @@
t = buf[i++] << 1;
}
}
+/* }}} */
#endif
/* Notes:
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property c
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/string.c ext/standard/tests/strings/bug50847.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:44:16 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294517
Log:
- Fixed bug #50847 (strip_tags() removes all tags greater then 1023 bytes long)
Bug: http://bugs.php.net/50847 (unknown)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/standard/string.c
A + php/php-src/branches/PHP_5_3_2/ext/standard/tests/strings/bug50847.phpt
(from
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug50847.phpt:r294303)
_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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/standard/string.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/string.c 2010-02-04 09:42:06 UTC (rev 294516)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/string.c 2010-02-04 09:44:16 UTC (rev 294517)
@@ -4243,7 +4243,7 @@
{
char *tbuf, *buf, *p, *tp, *rp, c, lc;
int br, i=0, depth=0, in_q = 0;
- int state = 0;
+ int state = 0, pos;
if (stateptr)
state = *stateptr;
@@ -4256,7 +4256,7 @@
br = 0;
if (allow) {
php_strtolower(allow, allow_len);
- tbuf = emalloc(PHP_TAG_BUF_SIZE+1);
+ tbuf = emalloc(PHP_TAG_BUF_SIZE + 1);
tp = tbuf;
} else {
tbuf = tp = NULL;
@@ -4277,7 +4277,11 @@
lc = '<';
state = 1;
if (allow) {
- tp = ((tp-tbuf) >= PHP_TAG_BUF_SIZE ? tbuf: tp);
+ if (tp - tbuf >= PHP_TAG_BUF_SIZE) {
+ pos = tp - tbuf;
+ tbuf = erealloc(tbuf, (tp - tbuf) + PHP_TAG_BUF_SIZE + 1);
+ tp = tbuf + pos;
+ }
*(tp++) = '<';
}
} else if (state == 1) {
@@ -4292,7 +4296,11 @@
br++;
}
} else if (allow && state == 1) {
- tp = ((tp-tbuf) >= PHP_TAG_BUF_SIZE ? tbuf: tp);
+ if (tp - tbuf >= PHP_TAG_BUF_SIZE) {
+ pos = tp - tbuf;
+ tbuf = erealloc(tbuf, (tp - tbuf) + PHP_TAG_BUF_SIZE + 1);
+ tp = tbuf + pos;
+ }
*(tp++) = c;
} else if (state == 0) {
*(rp++) = c;
@@ -4306,7 +4314,11 @@
br--;
}
} else if (allow && state == 1) {
- tp = ((tp-tbuf) >= PHP_TAG_BUF_SIZE ? tbuf: tp);
+ if (tp - tbuf >= PHP_TAG_BUF_SIZE) {
+ pos = tp - tbuf;
+ tbuf = erealloc(tbuf, (tp - tbuf) + PHP_TAG_BUF_SIZE + 1);
+ tp = tbuf + pos;
+ }
*(tp++) = c;
} else if (state == 0) {
*(rp++) = c;
@@ -4328,7 +4340,11 @@
lc = '>';
in_q = state = 0;
if (allow) {
- tp = ((tp-tbuf) >= PHP_TAG_BUF_SIZE ? tbuf: tp);
+ if (tp - tbuf >= PHP_TAG_BUF_SIZE) {
+pos = tp - tbuf;
+tbuf = erealloc(tbuf, (tp - tbuf) + PHP_TAG_BUF_SIZE + 1);
+tp = tbuf + pos;
+ }
*(tp++) = '>';
*tp='\0';
if (php_tag_find(tbuf, tp-tbuf, allow)) {
@@ -4378,7 +4394,11 @@
} else if (state == 0) {
*(rp++) = c;
} else if (allow && state == 1) {
- tp = ((tp-tbuf) >= PHP_TAG_BUF_SIZE ? tbuf: tp);
+ if (tp - tbuf >= PHP_TAG_BUF_SIZE) {
+ pos = tp - tbuf;
+ tbuf = erealloc(tbuf, (tp - tbuf) + PHP_TAG_BUF_SIZE + 1);
+ tp = tbuf + pos;
+ }
*(tp++) = c;
}
if (state && p != buf && (state == 1 || *(p-1) != '\\') && (!in_q || *p == in_q)) {
@@ -4399,7 +4419,11 @@
if (state == 0) {
*(rp++) = c;
} else if (allow && state == 1) {
- tp = ((tp-tbuf) >= PHP_TAG_BUF_SIZE ? tbuf: tp);
+ if (tp - tbuf >= PHP_TAG_BUF_SIZE) {
+
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/session/session.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:40:38 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294515
Log:
- Fixed a possible open_basedir/safe_mode bypass in session extension
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/session/session.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294278
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/session/session.c
===
--- php/php-src/branches/PHP_5_3_2/ext/session/session.c2010-02-04
09:37:38 UTC (rev 294514)
+++ php/php-src/branches/PHP_5_3_2/ext/session/session.c2010-02-04
09:40:38 UTC (rev 294515)
@@ -687,8 +687,13 @@
return FAILURE;
}
- if ((p = zend_memrchr(new_value, ';', new_value_length))) {
+ /* we do not use zend_memrchr() since path can contain ; itself
*/
+ if ((p = strchr(new_value, ';'))) {
+ char *p2;
p++;
+ if ((p2 = strchr(p, ';'))) {
+ p = p2 + 1;
+ }
} else {
p = new_value;
}
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294278
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294272,294278
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294278
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/pdo_mysql/pdo_mysql.c ext/pdo_mysql/php_pdo_mysql_int.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:37:38 + Revision: http://svn.php.net/viewvc?view=revision&revision=294514 Log: - Fixed crash in ZTS mode due to ini values not being initialized Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c U php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h _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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104 /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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294278 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c === --- php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c2010-02-04 09:32:50 UTC (rev 294513) +++ php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c2010-02-04 09:37:38 UTC (rev 294514) @@ -196,7 +196,7 @@ pdo_mysql_functions, PHP_MINIT(pdo_mysql), PHP_MSHUTDOWN(pdo_mysql), -#if PDO_USE_MYSQLND +#if PDO_USE_MYSQLND && PDO_DBG_ENABLED PHP_RINIT(pdo_mysql), PHP_RSHUTDOWN(pdo_mysql), #else Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h === --- php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h 2010-02-04 09:32:50 UTC (rev 294513) +++ php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h 2010-02-04 09:37:38 UTC (rev 294514) @@ -77,7 +77,7 @@ #endif ZEND_END_MODULE_GLOBALS(pdo_mysql) -ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql); +ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql) #ifdef ZTS #define PDO_MYSQL_G(v) TSRMG(pdo_mysql_globals_id, zend_pdo_mysql_globals *, v) 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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104,294267,294269,294278 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:31:09 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294512
Log:
- fix leak
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 09:29:24 UTC
(rev 294511)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 09:31:09 UTC
(rev 294512)
@@ -170,13 +170,13 @@
/* ConvertSidToStringSid(pTokenUser->User.Sid, &ptcSidOwner); */
pResultSid = malloc(sid_len);
-
if (!pResultSid) {
goto Finished;
}
if (!CopySid(sid_len, pResultSid, pTokenUser->User.Sid)) {
goto Finished;
}
+ HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
return pResultSid;
Finished:
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
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/ TSRM/tsrm_virtual_cwd.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:29:24 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294511
Log:
- don't go through the reparse code when we have a share or DFS path
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c 2010-02-04
09:27:40 UTC (rev 294510)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c 2010-02-04
09:29:24 UTC (rev 294511)
@@ -714,7 +714,9 @@
tmp = tsrm_do_alloca(len+1, use_heap);
memcpy(tmp, path, len+1);
- if(save && (data.dwFileAttributes &
FILE_ATTRIBUTE_REPARSE_POINT)) {
+ if(save &&
+ !(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
+ (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
PHP
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_virtual_cwd.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:27:40 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294510
Log:
- fix leak in the realpath cache, win only
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c 2010-02-04
09:25:09 UTC (rev 294509)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_virtual_cwd.c 2010-02-04
09:27:40 UTC (rev 294510)
@@ -432,8 +432,8 @@
static inline unsigned long realpath_cache_key(const char *path, int path_len
TSRMLS_DC) /* {{{ */
{
register unsigned long h;
- char *bucket_key = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
- char *bucket_key_start = (char *)bucket_key;
+ char *bucket_key_start = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
+ char *bucket_key = (char *)bucket_key_start;
const char *e = bucket_key + strlen(bucket_key);
if (!bucket_key) {
@@ -444,11 +444,7 @@
h *= 16777619;
h ^= *bucket_key++;
}
- /* if no SID were present the path is returned. Otherwise a Heap
- allocated string is returned. */
- if (bucket_key_start != path) {
- LocalFree(bucket_key_start);
- }
+ HeapFree(GetProcessHeap(), 0, (LPVOID)bucket_key_start);
return h;
}
/* }}} */
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,2935
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:25:09 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294509
Log:
- fix leak when the SID is already used and duplicated, windows only
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 09:23:22 UTC
(rev 294508)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 09:25:09 UTC
(rev 294509)
@@ -170,6 +170,7 @@
/* ConvertSidToStringSid(pTokenUser->User.Sid, &ptcSidOwner); */
pResultSid = malloc(sid_len);
+
if (!pResultSid) {
goto Finished;
}
@@ -271,6 +272,9 @@
if (!DuplicateToken(thread_token,
SecurityImpersonation, &TWG(impersonation_token))) {
goto Finished;
}
+ } else {
+ /* we already have it, free it then */
+ free(token_sid);
}
if (CWDG(realpath_cache_size_limit)) {
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscrib
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/openssl/openssl.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:23:22 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294508
Log:
- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation)
Bug: http://bugs.php.net/50859 (unknown)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/openssl/openssl.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_3_2/ext/openssl/openssl.c2010-02-04
09:21:02 UTC (rev 294507)
+++ php/php-src/branches/PHP_5_3_2/ext/openssl/openssl.c2010-02-04
09:23:22 UTC (rev 294508)
@@ -61,7 +61,9 @@
#define OPENSSL_ALGO_SHA1 1
#define OPENSSL_ALGO_MD5 2
#define OPENSSL_ALGO_MD4 3
+#ifdef HAVE_OPENSSL_MD2_H
#define OPENSSL_ALGO_MD2 4
+#endif
#define OPENSSL_ALGO_DSS1 5
#define DEBUG_SMIME0
@@ -917,9 +919,11 @@
case OPENSSL_ALGO_MD4:
mdtype = (EVP_MD *) EVP_md4();
break;
+#ifdef HAVE_OPENSSL_MD2_H
case OPENSSL_ALGO_MD2:
mdtype = (EVP_MD *) EVP_md2();
break;
+#endif
case OPENSSL_ALGO_DSS1:
mdtype = (EVP_MD *) EVP_dss1();
break;
@@ -1001,7 +1005,9 @@
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA1", OPENSSL_ALGO_SHA1,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD5", OPENSSL_ALGO_MD5,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD4", OPENSSL_ALGO_MD4,
CONST_CS|CONST_PERSISTENT);
+#ifdef HAVE_OPENSSL_MD2_H
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2,
CONST_CS|CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1,
CONST_CS|CONST_PERSISTENT);
/* flags for S/MIME */
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,2
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ main/main.c main/php.h main/streams/plain_wrapper.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:21:02 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294507
Log:
- [doc] #45986, bad file descriptor warning when rename is used with invalid
path
Bug: http://bugs.php.net/45986 (unknown)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_2/main/main.c
U php/php-src/branches/PHP_5_3_2/main/php.h
U php/php-src/branches/PHP_5_3_2/main/streams/plain_wrapper.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053
/php/php-src/trunk:284726
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_2/main/main.c
===
--- php/php-src/branches/PHP_5_3_2/main/main.c 2010-02-04 09:17:20 UTC (rev
294506)
+++ php/php-src/branches/PHP_5_3_2/main/main.c 2010-02-04 09:21:02 UTC (rev
294507)
@@ -848,6 +848,27 @@
}
/* }}} */
+#ifdef PHP_WIN32
+#define PHP_WIN32_ERROR_MSG_BUFFER_SIZE 512
+PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1,
const char *param2 TSRMLS_DC) {
+ if (error == 0) {
+ php_error_docref2(NULL TSRMLS_CC, param1, param2, E_WARNING,
"%s", strerror(errno));
+ } else {
+ char buf[PHP_WIN32_ERROR_MSG_BUFFER_SIZE + 1];
+ int buf_len;
+
+ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, buf,
PHP_WIN32_ERROR_MSG_BUFFER_SIZE, NULL);
+ buf_len = strlen(buf);
+ if (buf_len >= 2) {
+ buf[buf_len - 1] = '\0';
+ buf[buf_len - 2] = '\0';
+ }
+ php_error_docref2(NULL TSRMLS_CC, param1, param2, E_WARNING,
"%s (code: %lu)", (char *)buf, error);
+ }
+}
+#undef PHP_WIN32_ERROR_MSG_BUFFER_SIZE
+#endif
+
/* {{{ php_html_puts */
PHPAPI void php_html_puts(const char *str, uint size TSRMLS_DC)
{
Modified: php/php-src/branches/PHP_5_3_2/main/php.h
===
--- php/php-src/branches/PHP_5_3_2/main/php.h 2010-02-04 09:17:20 UTC (rev
294506)
+++ php/php-src/branches/PHP_5_3_2/main/php.h 2010-02-04 09:21:02 UTC (rev
294507)
@@ -309,6 +309,8 @@
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4,
PHP_ATTR_FMT_OFFSET + 5);
PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char
*param1, const char *param2, int type, const char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5,
PHP_ATTR_FMT_OFFSET + 6);
+PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1,
const char *para
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/http_fopen_wrapper.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:17:20 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294506
Log:
- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
Bug: http://bugs.php.net/50832 (unknown)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/standard/http_fopen_wrapper.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,294040
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/http_fopen_wrapper.c
2010-02-04 09:13:14 UTC (rev 294505)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/http_fopen_wrapper.c
2010-02-04 09:17:20 UTC (rev 294506)
@@ -416,16 +416,20 @@
}
/* auth header if it was specified */
- if (((have_header & HTTP_HEADER_AUTH) == 0) && resource->user &&
resource->pass){
+ if (((have_header & HTTP_HEADER_AUTH) == 0) && resource->user) {
/* decode the strings first */
php_url_decode(resource->user, strlen(resource->user));
- php_url_decode(resource->pass, strlen(resource->pass));
/* scratch is large enough, since it was made large enough for
the whole URL */
strcpy(scratch, resource->user);
strcat(scratch, ":");
- strcat(scratch, resource->pass);
+ /* Note: password is optional! */
+ if (resource->pass) {
+ php_url_decode(resource->pass, strlen(resource->pass));
+ strcat(scratch, resource->pass);
+ }
+
tmp = (char*)php_base64_encode((unsigned char*)scratch,
strlen(scratch), NULL);
if (snprintf(scratch, scratch_len, "Authorization: Basic
%s\r\n", tmp) > 0) {
@@ -746,7 +750,7 @@
s++;\
} \
} \
-} \
+}
/* check for control characters in login, password &
path */
if (strncasecmp(new_path, "http://";, sizeof("http://";)
- 1) || strncasecmp(new_path, "https://";, sizeof("https://";) - 1)) {
CHECK_FOR_CNTRL_CHARS(resource->user)
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ Zend/zend_alloc.c Zend/zend_execute.c Zend/zend_execute_API.c Zend/zend_extensions.c main/output.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:13:14 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294505
Log:
- Ensure that stderr output are not buffered, portability for tests
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/Zend/zend_alloc.c
U php/php-src/branches/PHP_5_3_2/Zend/zend_execute.c
U php/php-src/branches/PHP_5_3_2/Zend/zend_execute_API.c
U php/php-src/branches/PHP_5_3_2/Zend/zend_extensions.c
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_2/main/output.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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,294040
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,294040
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_alloc.c
===
--- php/php-src/branches/PHP_5_3_2/Zend/zend_alloc.c 2010-02-04 09:11:00 UTC (rev 294504)
+++ php/php-src/branches/PHP_5_3_2/Zend/zend_alloc.c 2010-02-04 09:13:14 UTC (rev 294505)
@@ -84,6 +84,10 @@
static void zend_mm_panic(const char *message)
{
fprintf(stderr, "%s\n", message);
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
#if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID)
kill(getpid(), SIGSEGV);
#endif
@@ -1031,11 +1035,19 @@
if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) {
fprintf(stderr, "'block_size' must be a power of two\n");
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
exit(255);
}
storage = handlers->init(params);
if (!storage) {
fprintf(stderr, "Cannot initialize zend_mm storage [%s]\n", handlers->name);
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
exit(255);
}
storage->handlers = handlers;
@@ -1118,9 +1130,17 @@
if (!mem_handlers[i].name) {
fprintf(stderr, "Wrong or unsupported zend_mm storage type '%s'\n", mem_type);
fprintf(stderr, " supported types:\n");
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
for (i = 0; mem_handlers[i].name; i++) {
fprintf(stderr, "'%s'\n", mem_handlers[i].name);
}
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
exit(255);
}
}
@@ -1131,9 +1151,17 @@
seg_size = zend_atoi(tmp, 0);
if (zend_mm_low_bit(seg_size) != zend_mm_high_bit(seg_size)) {
fprintf(stderr, "ZEND_MM_SEG_SIZE must be a power of two\n");
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
exit(255);
} else if (seg_size < ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE) {
fprintf(stderr, "ZEND_MM_SEG_SIZE is too small\n");
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
exit(255);
}
} else {
@@ -1672,6 +1700,10 @@
size);
fprintf(stderr, " in %s on line %d\n", error_filename, error_lineno);
}
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
} zend_end_try();
} else {
heap->overflow = 2;
Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_execute.c
===
--- php/php-src/branches/PHP_5_3_2/Zend/zend_execute.c 2010-02-04 09:11:00 UTC (rev 294504)
+++ php/php-src/branches/PHP_5_3_2/Zend/zend_execute.c 2010-02-04 09:13:14 UTC (rev 294505)
@@ -1232,6 +1232,10 @@
{
if (Z_TYPE_PP(pz) > 9) {
fprintf(stderr, "Warning! %x has invalid type!\n", *pz);
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
} else if (Z_TYPE_PP(pz) == IS_ARRAY) {
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/tests/general_functions/.getservbyport_basic.phpt.swp tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:11:00 + Revision: http://svn.php.net/viewvc?view=revision&revision=294504 Log: - pls don't add .swp/bak/etc Changed paths: _U php/php-src/branches/PHP_5_3_2/ D php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/.getservbyport_basic.phpt.swp _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,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,293762,293768,293804,293862,293897,293901-293902,293906,293974,294040 /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,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,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,294040 /php/php-src/trunk:284726 Deleted: php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/.getservbyport_basic.phpt.swp === (Binary files differ) 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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,294040 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,294040 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,294040 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,294040 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 -- 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/standard/basic_functions.c ext/standard/tests/general_functions/bug50690.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:08:57 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294503
Log:
- #50690, putenv does assign value when their length is one char on windows
Bug: http://bugs.php.net/50690 (unknown)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c
A +
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug50690.phpt
(from
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug50690.phpt:r293902)
_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,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,293762,293768,293804,293862,293897,293901,293906,293974,294040
/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,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,293762,293768,293804,293862,293897,293901-293902,293906,293974,294040
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c
2010-02-04 09:04:37 UTC (rev 294502)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c
2010-02-04 09:08:57 UTC (rev 294503)
@@ -4056,7 +4056,7 @@
pe.key_len = strlen(pe.key);
#ifdef PHP_WIN32
if (equals) {
- if (pe.key_len < setting_len - 2) {
+ if (pe.key_len < setting_len - 1) {
value = p + 1;
} else {
/* empty string*/
Copied:
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug50690.phpt
(from rev 293902,
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug50690.phpt)
===
---
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug50690.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug50690.phpt
2010-02-04 09:08:57 UTC (rev 294503)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #23650 (putenv() does not assign values when the value is one character)
+--FILE--
+
+--EXPECT--
+string(2) "ab"
+string(1) "c"
+bool(false)
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901,293906,294040
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/basic_functions.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:04:37 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294502
Log:
- make getservbyname on windows behaves like *nux when proto is an empty string
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.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,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,293762,293768,293804,293862,293897,293906,293974,294040
/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,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,293762,293768,293804,293862,293897,293901,293906,293974,294040
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c
2010-02-04 09:02:19 UTC (rev 294501)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c
2010-02-04 09:04:37 UTC (rev 294502)
@@ -5582,6 +5582,15 @@
return;
}
+
+/* empty string behaves like NULL on windows implementation of
+ getservbyname. Let be portable instead. */
+#ifdef PHP_WIN32
+ if (proto_len == 0) {
+ RETURN_FALSE;
+ }
+#endif
+
serv = getservbyname(name, proto);
if (serv == NULL) {
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293906,294040
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901,293906,294040
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
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/ main/main.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:02:19 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294501
Log:
- prevent possible crash when error/warnings are raised during startup on
windows
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_2/main/main.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,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,293762,293768,293804,293862,293906,293974,294040
/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,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,293762,293768,293804,293862,293897,293906,293974,294040
/php/php-src/trunk:284726
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_2/main/main.c
===
--- php/php-src/branches/PHP_5_3_2/main/main.c 2010-02-04 08:58:49 UTC (rev
294500)
+++ php/php-src/branches/PHP_5_3_2/main/main.c 2010-02-04 09:02:19 UTC (rev
294501)
@@ -980,6 +980,7 @@
php_log_err(log_buffer TSRMLS_CC);
efree(log_buffer);
}
+
if (PG(display_errors)
&& ((module_initialized && !PG(during_request_startup))
|| (PG(display_startup_errors)
@@ -1008,7 +1009,12 @@
if ((!strcmp(sapi_module.name, "cli")
|| !strcmp(sapi_module.name, "cgi")) &&
PG(display_errors) ==
PHP_DISPLAY_ERRORS_STDERR
) {
+#ifdef PHP_WIN32
+ fprintf(stderr, "%s: %s in %s
on line%d\n", error_type_str, buffer, error_filename, error_lineno);
+ fflush(stderr);
+#else
fprintf(stderr, "%s: %s in %s
on line %d\n", error_type_str, buffer, error_filename, error_lineno);
+#endif
} else {
php_printf("%s\n%s: %s in %s on
line %d\n%s", STR_PRINT(prepend_string), error_type_str, buffer,
error_filename, error_lineno, STR_PRINT(append_string));
}
@@ -1850,7 +1856,7 @@
#endif
EG(bailout) = NULL;
EG(error_reporting) = E_ALL & ~E_NOTICE;
-
+ EG(active_symbol_table) = NULL;
PG(header_is_being_sent) = 0;
SG(request_info).headers_only = 0;
SG(request_info).argv0 = NULL;
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/pdo_mysql/tests/pdo_mysql___construct.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 08:58:49 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294500
Log:
- Overlong hostnames breakthistest on NIS enabled FreeBSD
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U
php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/tests/pdo_mysql___construct.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,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,293762,293768,293862,293906,293974,294040
/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,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,293762,293768,293804,293862,293906,293974,294040
/php/php-src/trunk:284726
Modified:
php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
===
---
php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2010-02-04 08:38:21 UTC (rev 294499)
+++
php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2010-02-04 08:58:49 UTC (rev 294500)
@@ -101,7 +101,8 @@
}
// what about long values for a valid option ...
- $dsn = MySQLPDOTest::getDSN(array('host' =>
str_repeat('0123456789', 1024 * 100)));
+ // hostnames > 1024 chars break on some NIS-enabled FreeBSD...
+ $dsn = MySQLPDOTest::getDSN(array('host' =>
str_repeat('0123456789', 100)));
try { $db = @new PDO($dsn, $user, $pass); assert(false);
printf("%s\n", $dsn); } catch (PDOException $e) {
$tmp = $e->getMessage();
if (!stristr($tmp, 'HY000') && !stristr($tmp, '2005')
&& !stristr($tmp, '2002'))
@@ -296,4 +297,4 @@
[009] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using
password: YES), [n/a] n/a
[010] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using
password: YES), [n/a] n/a
[017] DSN=%s, SQLSTATE[%s] [%d] %s
-[033] DSN = mysql:%s, character sets has not been set,
@@character_set_connection reports 'latin1', expecting 'latin2'done!
\ No newline at end of file
+[033] DSN = mysql:%s, character sets has not been set,
@@character_set_connection reports 'latin1', expecting 'latin2'done!
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906,294040
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,29
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/pdo_mysql/pdo_mysql.c ext/pdo_mysql/php_pdo_mysql_int.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 21:00:20 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294469
Log:
Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored)
Bug: http://bugs.php.net/50829 (Closed) php.ini directive
pdo_mysql.default_socket is ignored
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c
U php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h
_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,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,293762,293768,293862,293906,293974
/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,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,293762,293768,293862,293906,293974,294040
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c2010-02-03
20:59:27 UTC (rev 294468)
+++ php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c2010-02-03
21:00:20 UTC (rev 294469)
@@ -35,7 +35,6 @@
ZEND_GET_MODULE(pdo_mysql)
#endif
-#if PDO_USE_MYSQLND
ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql);
#ifndef PHP_WIN32
@@ -59,7 +58,6 @@
#endif
PHP_INI_END()
/* }}} */
-#endif
/* true global environment */
@@ -67,9 +65,7 @@
*/
static PHP_MINIT_FUNCTION(pdo_mysql)
{
-#if PDO_USE_MYSQLND
REGISTER_INI_ENTRIES();
-#endif
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_USE_BUFFERED_QUERY",
(long)PDO_MYSQL_ATTR_USE_BUFFERED_QUERY);
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_LOCAL_INFILE",
(long)PDO_MYSQL_ATTR_LOCAL_INFILE);
Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h
2010-02-03 20:59:27 UTC (rev 294468)
+++ php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h
2010-02-03 21:00:20 UTC (rev 294469)
@@ -61,7 +61,6 @@
#include "ext/mysqlnd/mysqlnd_debug.h"
#endif
-#ifdef PDO_USE_MYSQLND
ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql)
#ifndef PHP_WIN32
char *default_socket;
@@ -79,7 +78,6 @@
ZEND_END_MODULE_GLOBALS(pdo_mysql)
ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql);
-#endif
#ifdef ZTS
#define PDO_MYSQL_G(v) TSRMG(pdo_mysql_globals_id, zend_pdo_mysql_globals *, v)
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,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906
/php/php-src/trunk/tests/security/open_basedir_parse_ini_f
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/curl/interface.c ext/curl/tests/curl_ftp_pasv.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:53:31 + Revision: http://svn.php.net/viewvc?view=revision&revision=294464 Log: - Fixed bug #50756 (CURLOPT_FTP_SKIP_PASV_IP does not exist.) Bug: http://bugs.php.net/50756 (To be documented) CURLOPT_FTP_SKIP_PASV_IP does not exist Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/curl/interface.c A + php/php-src/branches/PHP_5_3_2/ext/curl/tests/curl_ftp_pasv.phpt (from php/php-src/branches/PHP_5_3/ext/curl/tests/curl_ftp_pasv.phpt:r293862) _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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293762,293768,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293762,293768,293862,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/curl/interface.c === --- php/php-src/branches/PHP_5_3_2/ext/curl/interface.c 2010-02-03 20:50:38 UTC (rev 294463) +++ php/php-src/branches/PHP_5_3_2/ext/curl/interface.c 2010-02-03 20:53:31 UTC (rev 294464) @@ -789,6 +789,7 @@ #if LIBCURL_VERSION_NUM >= 0x070f01 REGISTER_CURL_CONSTANT(CURLOPT_FTP_FILEMETHOD); + REGISTER_CURL_CONSTANT(CURLOPT_FTP_SKIP_PASV_IP); #endif #if LIBCURL_VERSION_NUM >= 0x071001 @@ -1657,6 +1658,7 @@ #endif #if LIBCURL_VERSION_NUM >= 0x070f01 case CURLOPT_FTP_FILEMETHOD: + case CURLOPT_FTP_SKIP_PASV_IP: #endif #if LIBCURL_VERSION_NUM > 0x071301 case CURLOPT_CERTINFO: Copied: php/php-src/branches/PHP_5_3_2/ext/curl/tests/curl_ftp_pasv.phpt (from rev 293862, php/php-src/branches/PHP_5_3/ext/curl/tests/curl_ftp_pasv.phpt) === --- php/php-src/branches/PHP_5_3_2/ext/curl/tests/curl_ftp_pasv.phpt (rev 0) +++ php/php-src/branches/PHP_5_3_2/ext/curl/tests/curl_ftp_pasv.phpt 2010-02-03 20:53:31 UTC (rev 294464) @@ -0,0 +1,59 @@ +--TEST-- +Test curl_exec() function with basic functionality +--CREDITS-- +--SKIPIF-- + +--FILE-- +ftp://$username:$passw...@$host/test.phpt"; ; + + $ch = curl_init (); + + // enable below to get the output in verbose mode. + // curl_setopt ( $ch , CURLOPT_VERBOSE, 1 ); + + /* Without enabling SKIP_PASV_IP flag, the following output will be seen.. + < 227 Entering Passive Mode (10,5,80,146,100,199) + * Trying 10.5.80.146... * connected + * Connecting to 10.5.80.146 (10.5.80.146) port 25799 + */ + + /* After enabling SKIP_PASV_IP flag, the following output will be seen.. + < 227 Entering Passive Mode (10,5,80,146,50,229) + * Skips 10.5.80.146 for data connection, uses 10.5.80.146 instead + * Trying 10.5.80.146... * connected + */ + + curl_setopt ( $ch , CURLOPT_URL, $url ); + curl_setopt ( $ch , CURLOPT_TRANSFERTEXT, 1 ); + + //force passive connection + curl_setopt ( $ch , CURLOPT_FTP_USE_EPSV, 0 ); + curl_setopt ( $ch , CURLOPT_FTP_SKIP_PASV_IP, 1 ); + + // mark the file for upload.. + curl_setopt ( $ch , CURLOPT_INFILE, $fp ); + curl_setopt ( $ch , CURLOPT_INFILESIZE, filesize(__FILE__) ); + curl_setopt ( $ch , CURLOPT_PUT, 1 ); + curl_setopt ( $ch , CURLOPT_UPLOAD, 1 ); + + $result = curl_exec ( $ch ); + var_dump ( $result ); + curl_close ( $ch ); + +?> +===DONE=== +--EXPECTF-- +bool(true) +===DONE=== 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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/soap/tests/server009.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:50:38 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294463
Log:
- fix test
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/soap/tests/server009.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293762,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293762,293768,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/soap/tests/server009.phpt
===
--- php/php-src/branches/PHP_5_3_2/ext/soap/tests/server009.phpt
2010-02-03 20:49:03 UTC (rev 294462)
+++ php/php-src/branches/PHP_5_3_2/ext/soap/tests/server009.phpt
2010-02-03 20:50:38 UTC (rev 294463)
@@ -7,6 +7,9 @@
die('skip this test needs session extension');
}
?>
+--INI--
+session.auto_start=1
+session.save_handler=files
--FILE--
--
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/curl/streams.c main/streams/cast.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:49:03 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294462
Log:
- Fixed bug #50791 (Compile failure: Bad logic in defining fopencookie emulation
Bug: http://bugs.php.net/50791 (Closed) Bad logic in defining fopencookie
emulation
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/curl/streams.c
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_2/main/streams/cast.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293762,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293762,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/curl/streams.c
===
--- php/php-src/branches/PHP_5_3_2/ext/curl/streams.c 2010-02-03 20:48:22 UTC
(rev 294461)
+++ php/php-src/branches/PHP_5_3_2/ext/curl/streams.c 2010-02-03 20:49:03 UTC
(rev 294462)
@@ -280,7 +280,7 @@
* have a FILE* associated with it.
* Otherwise, use the "smart" memory stream that will turn itself into
a file
* when it gets large */
-#if !HAVE_FOPENCOOKIE
+#ifndef HAVE_FOPENCOOKIE
if (options & STREAM_WILL_CAST) {
curlstream->readbuffer.buf = php_stream_fopen_tmpfile();
} else
@@ -445,7 +445,7 @@
php_stream_to_zval(curlstream->readbuffer.buf, tmp);
add_assoc_zval(stream->wrapperdata, "readbuf", tmp);
-#if !HAVE_FOPENCOOKIE
+#ifndef HAVE_FOPENCOOKIE
if (options & STREAM_WILL_CAST) {
/* we will need to download the whole resource now,
* since we cannot get the actual FD for the download,
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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293762
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_2/main/streams/cast.c
===
--- php/php-src/branches/PHP_5_3_2/main/streams/cast.c 2010-02-03 20:48:22 UTC
(rev 294461)
+++ php/php-src/branches/PHP_5_3_2/main/streams/cast.c 2010-02-03 20:49:03 UTC
(rev 294462)
@@ -30,7 +30,7 @@
#include "php_streams_int.h"
/* Under BSD, emulate fopencookie using funopen */
-#if HAVE_FUNOPEN
+#if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
typedef struct {
int (*reader)(void *, char *, int);
int (*writer)(void *, const char *, int);
@@ -43,13 +43,14 @@
return funopen(cookie, funcs->reader, funcs->writer, funcs->seeker,
funcs->closer);
}
# define HAVE_FOPENCOOKIE 1
+# define PHP_EMULATE_FOPENCOOKIE 1
# define PHP_STREAM_COOKIE_FUNCTIONS &stream_cookie_functions
-#elif HAVE_FOPENCOOKIE
+#elif defined(HAVE_FOPENCOOKIE)
# define PHP_STREAM_COOKIE_FUNCTIONS stream_cookie_functions
#endif
/* {{{ STDIO with fopencookie */
-#if HAVE_FUNOPEN
+#if defined(PHP_EMULATE_FOPENCOOKIE)
/* use our fopencookie emulation */
static int stream_cookie_reader(void *cookie, char *buffer, int size)
{
@@ -80,8 +81,7 @@
stream->fclose_stdiocast = PHP_STREAM_FCLOSE_NONE;
return php_stream_close(stream);
}
-
-#elif HAVE_FOPENCOOKIE
+#elif defined(HAVE_FOPENCOOKIE)
st
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/gd/libgd/gd.c ext/gd/tests/libgd00100.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:46:41 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294460
Log:
- fix libgd FS100 (spurious horizontal line drawn by gdImageFilledPolygon)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c
A + php/php-src/branches/PHP_5_3_2/ext/gd/tests/libgd00100.phpt
(from php/php-src/branches/PHP_5_3/ext/gd/tests/libgd00100.phpt:r293762)
_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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293762,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c
===
--- php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c2010-02-03 20:44:43 UTC
(rev 294459)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c2010-02-03 20:46:41 UTC
(rev 294460)
@@ -2614,7 +2614,7 @@
{
int i;
int y;
- int miny, maxy;
+ int miny, maxy, pmaxy;
int x1, y1;
int x2, y2;
int ind1, ind2;
@@ -2658,7 +2658,7 @@
maxy = p[i].y;
}
}
-
+ pmaxy = maxy;
/* 2.0.16: Optimization by Ilia Chipitsine -- don't waste time
offscreen */
if (miny < 0) {
miny = 0;
@@ -2700,13 +2700,13 @@
*/
if (y >= y1 && y < y2) {
im->polyInts[ints++] = (float) ((y - y1) * (x2
- x1)) / (float) (y2 - y1) + 0.5 + x1;
- } else if (y == maxy && y > y1 && y <= y2) {
- im->polyInts[ints++] = (float) ((y - y1) * (x2
- x1)) / (float) (y2 - y1) + 0.5 + x1;
+ } else if (y == pmaxy && y == y2) {
+ im->polyInts[ints++] = x2;
}
}
qsort(im->polyInts, ints, sizeof(int), gdCompareInt);
- for (i = 0; i < ints; i += 2) {
+ for (i = 0; i < ints - 1; i += 2) {
gdImageLine(im, im->polyInts[i], y, im->polyInts[i +
1], y, fill_color);
}
}
Copied: php/php-src/branches/PHP_5_3_2/ext/gd/tests/libgd00100.phpt (from rev
293762, php/php-src/branches/PHP_5_3/ext/gd/tests/libgd00100.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/gd/tests/libgd00100.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/tests/libgd00100.phpt 2010-02-03
20:46:41 UTC (rev 294460)
@@ -0,0 +1,119 @@
+--TEST--
+libgd #100 (spurious horizontal line drawn by gdImageFilledPolygon)
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+2e6cf558bb4dadf60c8b608d5f8cda4e
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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293762
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_i
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ Zend/zend.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:44:43 + Revision: http://svn.php.net/viewvc?view=revision&revision=294459 Log: - Fix gcc version check - bug #50771 Bug: http://bugs.php.net/50771 (Closed) ZEND_GCC_VERSION is incorrectly defined Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/Zend/zend.h _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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293597,293627,293644,293653,293655,293699,293726-293728,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,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,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/Zend/zend.h === --- php/php-src/branches/PHP_5_3_2/Zend/zend.h 2010-02-03 20:42:50 UTC (rev 294458) +++ php/php-src/branches/PHP_5_3_2/Zend/zend.h 2010-02-03 20:44:43 UTC (rev 294459) @@ -166,7 +166,7 @@ # define ZEND_ATTRIBUTE_DEPRECATED #endif -#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400 && defined(__i386__) +#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__) # define ZEND_FASTCALL __attribute__((fastcall)) #elif defined(_MSC_VER) && defined(_M_IX86) # define ZEND_FASTCALL __fastcall @@ -174,7 +174,7 @@ # define ZEND_FASTCALL #endif -#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400 +#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 #else # define __restrict__ #endif 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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293597,293627,293644,293653,293655,293699,293726-293728 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293597,293627,293644,293653,293655,293699,293726-293728 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 -- 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/gd/gd.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:42:50 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294458
Log:
- fix wrong type and useless assignments
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/gd/gd.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293597,293627,293644,293653,293655,293699,293726-293728,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/gd.c
===
--- php/php-src/branches/PHP_5_3_2/ext/gd/gd.c 2010-02-03 20:40:01 UTC (rev
294457)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/gd.c 2010-02-03 20:42:50 UTC (rev
294458)
@@ -3883,7 +3883,7 @@
long col = -1, x = -1, y = -1;
int str_len, fontname_len, i, brect[8];
double ptsize, angle;
- unsigned char *str = NULL, *fontname = NULL;
+ char *str = NULL, *fontname = NULL;
char *error = NULL;
int argc = ZEND_NUM_ARGS();
#if HAVE_GD_STRINGFTEX
@@ -3945,28 +3945,24 @@
{
char tmp_font_path[MAXPATHLEN];
- if (VCWD_REALPATH((char *)fontname, tmp_font_path)) {
- fontname = (unsigned char *) fontname;
- } else {
+ if (!VCWD_REALPATH(fontname, tmp_font_path)) {
fontname = NULL;
}
}
-#else
- fontname = (unsigned char *) fontname;
#endif
- PHP_GD_CHECK_OPEN_BASEDIR((char *)fontname, "Invalid font filename");
+ PHP_GD_CHECK_OPEN_BASEDIR(fontname, "Invalid font filename");
#ifdef USE_GD_IMGSTRTTF
# if HAVE_GD_STRINGFTEX
if (extended) {
- error = gdImageStringFTEx(im, brect, col, (char *)fontname,
ptsize, angle, x, y, (char *)str, &strex);
+ error = gdImageStringFTEx(im, brect, col, fontname, ptsize,
angle, x, y, str, &strex);
}
else
# endif
# if HAVE_GD_STRINGFT
- error = gdImageStringFT(im, brect, col, (char *)fontname, ptsize,
angle, x, y, (char *)str);
+ error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y,
str);
# elif HAVE_GD_STRINGTTF
error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y,
str);
# endif
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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293597,293627,293644,293653,293655,29369
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/soap/php_http.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:29:09 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294456
Log:
- Don't free soap_headers just before comparing the length. This causes
SoapClient..
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/soap/php_http.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c 2010-02-03 20:26:26 UTC
(rev 294455)
+++ php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c 2010-02-03 20:29:09 UTC
(rev 294456)
@@ -759,7 +759,6 @@
smart_str_0(&soap_headers);
err = php_stream_write(stream, soap_headers.c,
soap_headers.len);
- smart_str_free(&soap_headers);
if (err != soap_headers.len) {
if (request != buf) {efree(request);}
php_stream_close(stream);
@@ -770,6 +769,7 @@
smart_str_free(&soap_headers_z);
return FALSE;
}
+ smart_str_free(&soap_headers);
} else {
add_soap_fault(this_ptr, "HTTP", "Failed to create stream??",
NULL, NULL TSRMLS_CC);
smart_str_free(&soap_headers_z);
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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
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/standard/tests/misc/time_sleep_until_error2.phpt ext/zlib/tests/bug_40189.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:26:26 + Revision: http://svn.php.net/viewvc?view=revision&revision=294455 Log: -fix tests Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/standard/tests/misc/time_sleep_until_error2.phpt _U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_2/ext/zlib/tests/bug_40189.phpt _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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293727,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/standard/tests/misc/time_sleep_until_error2.phpt === --- php/php-src/branches/PHP_5_3_2/ext/standard/tests/misc/time_sleep_until_error2.phpt 2010-02-03 20:23:53 UTC (rev 294454) +++ php/php-src/branches/PHP_5_3_2/ext/standard/tests/misc/time_sleep_until_error2.phpt 2010-02-03 20:26:26 UTC (rev 294455) @@ -1,5 +1,9 @@ --TEST-- time_sleep_until() function - error test for time_sleep_until() +--SKIPIF-- + --CREDITS-- Filippo De Santis f...@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293727 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Modified: php/php-src/branches/PHP_5_3_2/ext/zlib/tests/bug_40189.phpt === --- php/php-src/branches/PHP_5_3_2/ext/zlib/tests/bug_40189.phpt 2010-02-03 20:23:53 UTC (rev 294454) +++ php/php-src/branches/PHP_5_3_2/ext/zlib/tests/bug_40189.phpt 2010-02-03 20:26:26 UTC (rev 294455) @@ -23,5 +23,5 @@ ?> --EXPECT-- string(40) "AwCFRi98wqppK23l2/7kIY8AlyEdAgAAAEdCTUI=" -bool(false) +int(0) string(0) "" Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293727 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 -- 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/sqlite3/libsqlite/sqlite3.c ext/sqlite3/libsqlite/sqlite3.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:23:53 + Revision: http://svn.php.net/viewvc?view=revision&revision=294454 Log: - Upgraded bundled sqlite to version 3.6.22 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/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_3_2/ext/sqlite3/libsqlite/sqlite3.h _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 -- 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/ main/streams/xp_socket.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:21:40 + Revision: http://svn.php.net/viewvc?view=revision&revision=294453 Log: - Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams). Bug: http://bugs.php.net/50787 (Closed) stream_set_write_buffer() has no effect on socket streams Changed paths: _U php/php-src/branches/PHP_5_3_2/ _U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_2/main/streams/xp_socket.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293974 /php/php-src/trunk:284726 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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Modified: php/php-src/branches/PHP_5_3_2/main/streams/xp_socket.c === --- php/php-src/branches/PHP_5_3_2/main/streams/xp_socket.c 2010-02-03 20:19:05 UTC (rev 294452) +++ php/php-src/branches/PHP_5_3_2/main/streams/xp_socket.c 2010-02-03 20:21:40 UTC (rev 294453) @@ -400,6 +400,10 @@ } #endif + case PHP_STREAM_OPTION_WRITE_BUFFER: + php_stream_set_chunk_size(stream, (ptrparam ? *(size_t *)ptrparam : PHP_SOCK_CHUNK_SIZE)); + return PHP_STREAM_OPTION_RETURN_OK; + default: return PHP_STREAM_OPTION_RETURN_NOTIMPL; } Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 -- 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/xmlrpc/tests/bug50761.phpt ext/xmlrpc/xmlrpc-epi-php.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:19:05 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294452
Log:
- Fixed bug #50761 (system.multiCall crashes in xmlrpc extension).
Bug: http://bugs.php.net/50761 (Closed) system.multiCall crashes
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
A + php/php-src/branches/PHP_5_3_2/ext/xmlrpc/tests/bug50761.phpt
(from
php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug50761.phpt:r293655)
U php/php-src/branches/PHP_5_3_2/ext/xmlrpc/xmlrpc-epi-php.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293974
/php/php-src/trunk:284726
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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Copied: php/php-src/branches/PHP_5_3_2/ext/xmlrpc/tests/bug50761.phpt (from rev
293655, php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug50761.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/xmlrpc/tests/bug50761.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/xmlrpc/tests/bug50761.phpt
2010-02-03 20:19:05 UTC (rev 294452)
@@ -0,0 +1,62 @@
+--TEST--
+Bug #50761 (system.multiCall crashes)
+--FILE--
+
+
+system.multiCall
+
+
+methodNametestMethodA
+paramsA
+
+
+
+methodNametestMethodB
+paramsB
+
+
+
+';
+
+function testA($methodName, $params, $var){ return "C"; }
+function testB($methodName, $params, $var){ return "D"; }
+
+$server = xmlrpc_server_create();
+xmlrpc_server_register_method($server, 'testMethodA', 'testA');
+xmlrpc_server_register_method($server, 'testMethodB', 'testB');
+$res = xmlrpc_server_call_method($server, $req, null);
+echo $res;
+?>
+--EXPECT--
+
+
+
+
+
+
+
+
+
+
+
+ C
+
+
+
+
+
+
+
+
+ D
+
+
+
+
+
+
+
+
+
+
Modified: php/php-src/branches/PHP_5_3_2/ext/xmlrpc/xmlrpc-epi-php.c
===
--- php/php-src/branches/PHP_5_3_2/ext/xmlrpc/xmlrpc-epi-php.c 2010-02-03
20:16:21 UTC (rev 294451)
+++ php/php-src/branches/PHP_5_3_2/ext/xmlrpc/xmlrpc-epi-php.c 2010-02-03
20:19:05 UTC (rev 294452)
@@ -911,13 +911,27 @@
static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST
xRequest, void* data) /* {{{ */
{
xmlrpc_callback_data* pData = (xmlrpc_callback_data*)data;
+ zval** php_function;
zval* xmlrpc_params;
zval* callback_params[3];
TSRMLS_FETCH();
+ zval_dtor(pData->xmlrpc_method);
+ zval_dtor(pData->return_data);
+
/* convert xmlrpc to native php types */
+ ZVAL_STRING(pData->xmlrpc_method,
XMLRPC_RequestGetMethodName(xRequest), 1);
xmlrpc_params = XMLRPC_to_PHP(XMLRPC_RequestGetData(xRequest));
+
+ /* check if the called method has been previous registered */
+ if(zend_hash_find(Z_ARRVAL_P(pData->server->method_map),
+ Z_STRVAL_P(pData->xmlrpc_method),
+ Z_STRLEN_P(pData->xmlrpc_method) + 1,
+ (void**)&php_function) == SUCCESS) {
+ pData->php_function = *php_function;
+ }
+
/* setup data hoojum */
callback
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ README.WIN32-BUILD-SYSTEM ext/soap/readme.html tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:16:21 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294451
Log:
- kill/update old docs
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/README.WIN32-BUILD-SYSTEM
D php/php-src/branches/PHP_5_3_2/ext/soap/readme.html
_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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/README.WIN32-BUILD-SYSTEM
===
--- php/php-src/branches/PHP_5_3_2/README.WIN32-BUILD-SYSTEM 2010-02-03 20:14:54 UTC (rev 294450)
+++ php/php-src/branches/PHP_5_3_2/README.WIN32-BUILD-SYSTEM 2010-02-03 20:16:21 UTC (rev 294451)
@@ -2,8 +2,13 @@
$Id$
Wez Furlong
+
+NOTE:
+ These instructions are outdated, use at your own risk.
+
+
If you need help with the build system, send mail to
-intern...@lists.php.net; please don't email me directly.
+internals-...@lists.php.net; please don't email me directly.
===
Contents:
Deleted: php/php-src/branches/PHP_5_3_2/ext/soap/readme.html
===
--- php/php-src/branches/PHP_5_3_2/ext/soap/readme.html 2010-02-03 20:14:54 UTC (rev 294450)
+++ php/php-src/branches/PHP_5_3_2/ext/soap/readme.html 2010-02-03 20:16:21 UTC (rev 294451)
@@ -1,646 +0,0 @@
-
-
-PHP SOAP Manual
-
-TR{
- vertical-align: "top";
-}
-TH{
- text-align: "left";
-}
-TD:{
- text-align: "left";
-}
-
-
-
-
-PHP SOAP
-Introduction
-
-Warning
-This extension is EXPERIMENTAL. The behaviour of this extension -- including the names of its functions and anything else documented about this extension -- may change without notice in a future release of PHP. Use this extension at your own risk.
-
-
-
-SOAP extension can be used to write SOAP Servers and Clients. It supports
-subsets of http://www.w3.org/TR/2000/NOTE-SOAP-2508"; target="_top">SOAP 1.1,
-http://www.w3.org/TR/"; target="_top">SOAP 1.2 and
-http://www.w3.org/TR/wsdl"; target="_top">WSDL 1.1 specifications.
-
-
-Requirements
-This extension makes use of the http://www.xmlsoft.org"; TARGET="_top">GNOME XML library. Download and install this library. You will need at least libxml-2.5.4.
-
-Installation
-This extension is only available if PHP was configured with --enable-soap.
-
-Runtime Configuration
-The behaviour of these functions is affected by settings in php.ini.
-
-NameDefaultChangeable
-soap.wsdl_cache_enabled"1"PHP_INI_ALL
-soap.wsdl_cache_dir"/tmp"PHP_INI_ALL
-soap.wsdl_cache_ttl86400PHP_INI_ALL
-
-Here is a short explanation of the configuration directives.
-
-soap.wsdl_cache_enabled (boolean)
-enables or disables WSDL caching feature.
-soap.wsdl_cache_dir (string)
-sets the directory name where SOAP extension will put cache files
-soap.wsdl_cache_ttl (integer)
-(time to live) sets the number of second while cached file will be used instead of original one.
-
-
-
-
-Predefined Constants
-The constants below are defined by this extension, and will only be available when the extension has either been compiled into PHP or dynamically loaded at runtime.
-
-ConstantValueDescription
-SOAP_1_1 (integer)1SOAP version - SOAP 1.1. Can be used as an option in SoapClient and SoapServer constructors.
-SOAP_1_2 (integer)2SOAP version - SOAP 1.2. Can be used as an option in SoapClient and SoapServer constructors.
-SOAP_FUNCTIONS_ALL (integer)999Allows to export all defined functions with SoapClient::addFunction
-SOAP_PERSISTENCE_SESSION (integer)1Allows making class passed to SoapServer::setClass persistent for a PHP session.
-SOAP_PERSISTENCE_REQUEST (integer)2Allows making class passed to SoapServer::setClass non-persistent for a PHP session.
-SOAP_ENCODED (integer)1Can be passed as style option to SoapClient constructor in nonWSDL mode.
-SOAP_LITERAL (integer)2Can be passed as style option to SoapClient constructor in nonWSD
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/pdo_dblib/dblib_driver.c ext/pdo_firebird/firebird_driver.c ext/pdo_mysql/mysql_driver.c ext/pdo_oci/oci_driver.c ext/pdo_odbc/odbc_driver.c ext/pdo
pajoye Wed, 03 Feb 2010 19:48:04 +
Revision: http://svn.php.net/viewvc?view=revision&revision=29
Log:
- Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0)
Bug: http://bugs.php.net/50728 (Closed) All PDOExceptions hardcode 'code'
property to 0
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/pdo_dblib/dblib_driver.c
U php/php-src/branches/PHP_5_3_2/ext/pdo_firebird/firebird_driver.c
U php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/mysql_driver.c
U php/php-src/branches/PHP_5_3_2/ext/pdo_oci/oci_driver.c
U php/php-src/branches/PHP_5_3_2/ext/pdo_odbc/odbc_driver.c
U php/php-src/branches/PHP_5_3_2/ext/pdo_pgsql/pgsql_driver.c
U php/php-src/branches/PHP_5_3_2/ext/pdo_sqlite/sqlite_driver.c
A + php/php-src/branches/PHP_5_3_2/ext/pdo_sqlite/tests/bug50728.phpt
(from
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/bug50728.phpt:r293447)
_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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293268,293341,293380,293400,293442,293502,293538,293548,293558,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293268,293341,293380,293400,293442,293447,293502,293538,293548,293558,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_dblib/dblib_driver.c
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo_dblib/dblib_driver.c 2010-02-03
19:44:23 UTC (rev 294443)
+++ php/php-src/branches/PHP_5_3_2/ext/pdo_dblib/dblib_driver.c 2010-02-03
19:48:04 UTC (rev 29)
@@ -255,7 +255,7 @@
dbh->driver_data = H;
if (!ret) {
- zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC,
+ zend_throw_exception_ex(php_pdo_get_exception(),
DBLIB_G(err).dberr TSRMLS_CC,
"SQLSTATE[%s] %s (severity %d)",
DBLIB_G(err).sqlstate,
DBLIB_G(err).dberrstr,
Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_firebird/firebird_driver.c
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo_firebird/firebird_driver.c
2010-02-03 19:44:23 UTC (rev 294443)
+++ php/php-src/branches/PHP_5_3_2/ext/pdo_firebird/firebird_driver.c
2010-02-03 19:48:04 UTC (rev 29)
@@ -691,7 +691,7 @@
char errmsg[512];
ISC_STATUS *s = H->isc_status;
isc_interprete(errmsg, &s);
- zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC,
"SQLSTATE[%s] [%d] %s",
+ zend_throw_exception_ex(php_pdo_get_exception(),
H->isc_status[1] TSRMLS_CC, "SQLSTATE[%s] [%d] %s",
"HY000", H->isc_status[1], errmsg);
}
Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/mysql_driver.c
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/mysql_driver.c 2010-02-03
19:44:23 UTC (rev 294443)
+++ php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/mysql_driver.c 2010-02-03
19:48:04 UTC (rev 29)
@@ -127,7 +127,7 @@
if (!dbh->methods) {
PDO_DBG_INF("Throwing exception");
- zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC,
"SQLSTATE[%s] [%d] %s",
+ zend_throw_exception_ex(php_pdo_get_exception(), einfo->errcode
TSRMLS_CC, "SQLSTATE[%s] [%d] %s",
*pdo_err, einfo->errcode, einfo->errmsg);
}
Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_oci/oci_driver.c
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo_oci/oci_driver.c 2010-02-03
19:44:23 UTC (rev 294443)
+++ php/php-src/branches/PHP_5_3_2/ext/pdo_oci/oci_driver.c 2010-02-03
19:48:04 UTC (rev 29)
@@ -173,7 +173,7 @@
/* little mini hack so that we can use this code from the dbh ctor */
if (!dbh->methods) {
- zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC,
"SQLSTATE[%s]: %s", *pdo_err, einfo->errmsg);
+ zend_throw_exception_ex(php_pdo_get_exception(), einfo->errcode
TSRMLS_CC, "SQLSTATE[%s]: %s
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ main/php_ini.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:13:18 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294449
Log:
- Fixed bug #48811 (Directives in PATH section do not get applied to subdirector
Bug: http://bugs.php.net/48811 (Closed) Directives in PATH section do not get
applied to subdirectories
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_2/main/php_ini.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293974
/php/php-src/trunk:284726
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,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_2/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3_2/main/php_ini.c 2010-02-03 20:10:35 UTC
(rev 294448)
+++ php/php-src/branches/PHP_5_3_2/main/php_ini.c 2010-02-03 20:13:18 UTC
(rev 294449)
@@ -807,7 +807,7 @@
while ((ptr = strchr(ptr, '/')) != NULL) {
*ptr = 0;
/* Search for source array matching the path from
configuration_hash */
- if (zend_hash_find(&configuration_hash, path, path_len,
(void **) &tmp) == SUCCESS) {
+ if (zend_hash_find(&configuration_hash, path,
strlen(path) + 1, (void **) &tmp) == SUCCESS) {
php_ini_activate_config(Z_ARRVAL_P(tmp),
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
}
*ptr = '/';
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
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/standard/lcg.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:10:35 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294448
Log:
Worked with Samy Kamkar to improve LCG entropy.
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/standard/lcg.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/standard/lcg.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/lcg.c 2010-02-03 20:08:42 UTC
(rev 294447)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/lcg.c 2010-02-03 20:10:35 UTC
(rev 294448)
@@ -78,7 +78,7 @@
struct timeval tv;
if (gettimeofday(&tv, NULL) == 0) {
- LCG(s1) = tv.tv_sec ^ (~tv.tv_usec);
+ LCG(s1) = tv.tv_sec ^ (tv.tv_usec<<11);
} else {
LCG(s1) = 1;
}
@@ -88,6 +88,11 @@
LCG(s2) = (long) getpid();
#endif
+ /* Add entropy to s2 by calling gettimeofday() again */
+ if (gettimeofday(&tv, NULL) == 0) {
+ LCG(s2) ^= (tv.tv_usec<<11);
+ }
+
LCG(seeded) = 1;
}
/* }}} */
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,292719,292765,293146,293152,293176,293180,293216,293235,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
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/oci8/oci8.c ext/oci8/tests/bug47281.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:08:42 + Revision: http://svn.php.net/viewvc?view=revision&revision=294447 Log: Bug #47281 ( is limited in size of characters). Also remove redundant code line Bug: http://bugs.php.net/47281 (Closed) $php_errormsg is limited in size of characters Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/oci8/oci8.c A + php/php-src/branches/PHP_5_3_2/ext/oci8/tests/bug47281.phpt (from php/php-src/branches/PHP_5_3/ext/oci8/tests/bug47281.phpt:r293235) _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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/oci8/oci8.c === --- php/php-src/branches/PHP_5_3_2/ext/oci8/oci8.c 2010-02-03 20:04:38 UTC (rev 294446) +++ php/php-src/branches/PHP_5_3_2/ext/oci8/oci8.c 2010-02-03 20:08:42 UTC (rev 294447) @@ -91,7 +91,7 @@ #define SQLT_CFILEE 115 #endif -#define PHP_OCI_ERRBUF_LEN 512 +#define PHP_OCI_ERRBUF_LEN 1024 #if ZEND_MODULE_API_NO > 20020429 #define ONUPDATELONGFUNC OnUpdateLong @@ -1614,8 +1614,6 @@ sb4 error_code = 0; text err_buf[PHP_OCI_ERRBUF_LEN]; - err_buf[0] = '\0'; - memset(err_buf, 0, sizeof(err_buf)); PHP_OCI_CALL(OCIErrorGet, (error_handle, (ub4)1, NULL, &error_code, err_buf, (ub4)PHP_OCI_ERRBUF_LEN, (ub4)OCI_HTYPE_ERROR)); Copied: php/php-src/branches/PHP_5_3_2/ext/oci8/tests/bug47281.phpt (from rev 293235, php/php-src/branches/PHP_5_3/ext/oci8/tests/bug47281.phpt) === --- php/php-src/branches/PHP_5_3_2/ext/oci8/tests/bug47281.phpt (rev 0) +++ php/php-src/branches/PHP_5_3_2/ext/oci8/tests/bug47281.phpt 2010-02-03 20:08:42 UTC (rev 294447) @@ -0,0 +1,73 @@ +--TEST-- +Bug #47281 ($php_errormsg is limited in size of characters) +--SKIPIF-- + +--ENV-- +NLS_LANG=.AL32UTF8 +--FILE-- + +===DONE=== + +--EXPECTF-- +Test 1 +ORA-2: aaaBcccD +Test 2 +oci_execute(): ORA-2: aaaBc
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/dom/element.c ext/dom/tests/bug49463.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:04:38 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294446
Log:
- fix bug #49463 (setAttributeNS fails setting default namespace)
Bug: http://bugs.php.net/49463 (Closed) setAttributeNS fails setting default
namespace
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/dom/element.c
A + php/php-src/branches/PHP_5_3_2/ext/dom/tests/bug49463.phpt
(from php/php-src/branches/PHP_5_3/ext/dom/tests/bug49463.phpt:r293597)
_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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/dom/element.c
===
--- php/php-src/branches/PHP_5_3_2/ext/dom/element.c2010-02-03 20:00:49 UTC
(rev 294445)
+++ php/php-src/branches/PHP_5_3_2/ext/dom/element.c2010-02-03 20:04:38 UTC
(rev 294446)
@@ -777,9 +777,15 @@
node_list_unlink(nodep->children TSRMLS_CC);
}
- if (xmlStrEqual((xmlChar *) prefix, (xmlChar *)"xmlns")
&& xmlStrEqual((xmlChar *) uri, (xmlChar *)DOM_XMLNS_NAMESPACE)) {
+ if ((xmlStrEqual((xmlChar *) prefix, (xmlChar
*)"xmlns") ||
+ (prefix == NULL && xmlStrEqual((xmlChar *)
localname, (xmlChar *)"xmlns"))) &&
+ xmlStrEqual((xmlChar *) uri, (xmlChar
*)DOM_XMLNS_NAMESPACE)) {
is_xmlns = 1;
- nsptr = dom_get_nsdecl(elemp, (xmlChar
*)localname);
+ if (prefix == NULL) {
+ nsptr = dom_get_nsdecl(elemp, NULL);
+ } else {
+ nsptr = dom_get_nsdecl(elemp, (xmlChar
*)localname);
+ }
} else {
nsptr = xmlSearchNsByHref(elemp->doc, elemp,
(xmlChar *)uri);
if (nsptr && nsptr->prefix == NULL) {
@@ -802,7 +808,12 @@
if (nsptr == NULL) {
if (prefix == NULL) {
- errorcode = NAMESPACE_ERR;
+ if (is_xmlns == 1) {
+ xmlNewNs(elemp, (xmlChar
*)value, NULL);
+ xmlReconciliateNs(elemp->doc,
elemp);
+ } else {
+ errorcode = NAMESPACE_ERR;
+ }
} else {
if (is_xmlns == 1) {
xmlNewNs(elemp, (xmlChar
*)value, (xmlChar *)localname);
Copied: php/php-src/branches/PHP_5_3_2/ext/dom/tests/bug49463.phpt (from rev
293597, php/php-src/branches/PHP_5_3/ext/dom/tests/bug49463.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/dom/tests/bug49463.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/dom/tests/bug49463.phpt 2010-02-03
20:04:38 UTC (rev 294446)
@@ -0,0 +1,17 @@
+--TEST--
+Bug #49463 (setAttributeNS fails setting default namespace).
+--SKIPIF--
+
+--FILE--
+createElementNS('http://purl.org/rss/1.0/','rdf:RDF');
+$doc->appendChild($root);
+$root->setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns","http://purl.org/rss/1.0/";
);
+
+echo $doc->saveXML()."\n";
+?>
+--EXPECT--
+
+http://purl.org/rss/1.0/";
xmlns="http://purl.org/rss/1.0/"/>
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,292719,292765,293146,293152,293176,
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/oci8/package.xml ext/oci8/php_oci8.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 20:00:49 + Revision: http://svn.php.net/viewvc?view=revision&revision=294445 Log: - Bump version in early preparation for release Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/oci8/package.xml U php/php-src/branches/PHP_5_3_2/ext/oci8/php_oci8.h _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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293268,293341,293380,293400,293442,293447,293502,293538,293548,293558,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/oci8/package.xml === --- php/php-src/branches/PHP_5_3_2/ext/oci8/package.xml 2010-02-03 19:48:04 UTC (rev 29) +++ php/php-src/branches/PHP_5_3_2/ext/oci8/package.xml 2010-02-03 20:00:49 UTC (rev 294445) @@ -33,52 +33,21 @@ no - 2009-10-06 + 2010-??-?? 15:00:00 - 1.4.0 - 1.4.0 + 1.4.1 + 1.4.1 - alpha - alpha + stable + stable http://www.php.net/license";>PHP -1. Introduce connection attribute functions: - - oci_set_module_name - oci_set_action - oci_set_client_info - oci_set_client_identifier - - These set values that are visible/used by the database. They - are useful for tracing, authentication and auditing. - -2. Introduce connection attribute function: - - oci_set_edition - - Oracle 11g R2 "editions" allow multiple versions of DB objects - to exist at one time. By setting different editions, two - different versions of an application can run concurrently, - making upgrading easier and faster. - -3. Set the DRIVER_NAME attribute of Oracle Database 11gR2 - connections to aid application tracing. The value used is to - "PHP OCI8" followed by the OCI8 version number. Note the - version number may get truncated in DB views such as - v$session_connect_info. - -4. Allow the oci_set_prefetch value to be 0. This is important in - some cases using REF CURSORS in Oracle 11gR2. - -5. Introduce OCI_NO_AUTO_COMMIT as an alias for the OCI_DEFAULT - constant (which is not the default value) used by oci_execute(). - -6. Generate an error if an invalid resource type is used in - oci_bind_by_name +Fixed bug #49560 (Using LOBs causes slow PHP shutdown) +Fixed bug #47281 ($php_errormsg is limited in size of characters) @@ -126,6 +95,7 @@ + @@ -148,6 +118,7 @@ + @@ -258,12 +229,15 @@ + + + @@ -315,6 +289,7 @@ + @@ -394,6 +369,56 @@ + 1.4.0 + 1.4.0 + + + alpha + alpha + + http://www.php.net/license";>PHP + +1. Introduce connection attribute functions: + + oci_set_module_name + oci_set_action + oci_set_client_info + oci_set_client_identifier + + These set values that are visible/used by the database. They + are useful for tracing, authentication and auditing. + +2. Introduce connection attribute function: + + oci_set_edition + + Oracle 11g R2 "editions" allow multiple versions of DB objects + to exist at one time. By setting different editions, two + different versions of an application can run concurrently, + making upgrading easier and faster. + +3. Set the DRIVER_NAME attribute of Oracle Database 11gR2 + connections to aid application tracing. The value used is to + "PHP OCI8" followed by the OCI8 version number. Note the + version number may get truncated in DB views such as + v$session_connect_info. + +4. Allow the oci_set_prefetch value to be 0. This is important in + some cases using REF CURSORS in Oracle 11gR2. + +5. Introduce OCI_NO_AUTO_COMMIT as an alias for the OCI_DEFAULT + constant (which is not the default value) used by oci_execute(). + +6. Generate an error if an invalid resource type is used in + oci_bi
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/oci8/oci8.c ext/oci8/oci8_interface.c ext/oci8/oci8_lob.c ext/oci8/oci8_statement.c ext/oci8/php_oci8_int.h ext/oci8/tests/bug43497.phpt ext/oc
pajoye Wed, 03 Feb 2010 19:37:35 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294441
Log:
- Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown)
Bug: http://bugs.php.net/49560 (Closed) OCI_RETURN_LOBS causes php_shutdown to
take very long
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/oci8/oci8.c
U php/php-src/branches/PHP_5_3_2/ext/oci8/oci8_interface.c
U php/php-src/branches/PHP_5_3_2/ext/oci8/oci8_lob.c
U php/php-src/branches/PHP_5_3_2/ext/oci8/oci8_statement.c
U php/php-src/branches/PHP_5_3_2/ext/oci8/php_oci8_int.h
U php/php-src/branches/PHP_5_3_2/ext/oci8/tests/bug43497.phpt
A + php/php-src/branches/PHP_5_3_2/ext/oci8/tests/lob_043.phpt
(from php/php-src/branches/PHP_5_3/ext/oci8/tests/lob_043.phpt:r293180)
_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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293268,293341,293380,293400,293442,293502,293538,293558,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293268,293341,293380,293400,293442,293502,293538,293558,293974
/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-03 19:12:47 UTC (rev 294440)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-03 19:37:35 UTC (rev 294441)
@@ -11,6 +11,7 @@
- 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 #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
in HTTP uploads). (Ilia)
@@ -18,7 +19,6 @@
(Ilia, chrisstocktonaz at gmail dot com)
- Fixed bug #44827 (define() allows :: in constant names). (Ilia)
-
22 Dec 2009, PHP 5.3.2 RC 1
- Upgraded bundled sqlite to version 3.6.21. (Ilia)
- Upgraded bundled PCRE to version 8.00. (Scott)
Modified: php/php-src/branches/PHP_5_3_2/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_3_2/ext/oci8/oci8.c 2010-02-03 19:12:47 UTC (rev 294440)
+++ php/php-src/branches/PHP_5_3_2/ext/oci8/oci8.c 2010-02-03 19:37:35 UTC (rev 294441)
@@ -1530,23 +1530,21 @@
}
/* }}} */
-/* {{{ php_oci_descriptor_delete_from_hash()
+/* }}} */
+
+/* {{{ php_oci_connection_descriptors_free()
*
- * Delete descriptor from the hash
+ * Free descriptors for a connection
*/
-int php_oci_descriptor_delete_from_hash(void *data, void *id TSRMLS_DC)
+void php_oci_connection_descriptors_free(php_oci_connection *connection TSRMLS_DC)
{
- php_oci_descriptor *descriptor = *(php_oci_descriptor **)data;
- int *desc_id = (int *) id;
-
- if (descriptor && desc_id && descriptor->id == *desc_id) {
- return 1;
- }
- return 0;
+ zend_hash_destroy(connection->descriptors);
+ efree(connection->descriptors);
+ connection->descriptors = NULL;
+ connection->descriptor_count = 0;
}
/* }}} */
-/* }}} */
/* {{{ php_oci_error()
*
@@ -2271,9 +2269,7 @@
}
if (connection->descriptors) {
- zend_hash_destroy(connection->descriptors);
- efree(connection->descriptors);
- connection->descriptors = NULL;
+ php_oci_connection_descriptors_free(connection TSRMLS_CC);
}
if (connection->svc) {
Modified: php/php-src/branches/PHP_5_3_2/ext/oci8/oci8_interface.c
===
--- php/php-src/branches/PHP_5_3_2/ext/oci8/oci8_interface.c 2010-02-03 19:12:47 UTC (rev 294440)
+++ php/php-src/branches/PHP_5_3_2/ext/oci8/oci8_interface.c 2010-02-03 19:37:35 UTC (rev 294441)
@@ -1066,9 +1066,7 @@
PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
if (connection->descriptors) {
- zend_hash_destroy(connection->descriptors);
- efree(connection->descriptors);
- connection->descriptors = NULL;
+ php_oci_connection_descriptors_free(connection TSRMLS_CC);
}
if (php_oci_connection_rollback(connection TSRMLS_CC)) {
@@ -1092,9 +1090,7 @@
PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ configure.in tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 18:52:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=294438 Log: - Revert commit 29. It's not needed anymore to specify c99. Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/configure.in _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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293268,293341,293380,293400,293502,293538,293558,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293268,293341,293380,293400,293442,293502,293538,293558,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/configure.in === --- php/php-src/branches/PHP_5_3_2/configure.in 2010-02-03 18:47:13 UTC (rev 294437) +++ php/php-src/branches/PHP_5_3_2/configure.in 2010-02-03 18:52:17 UTC (rev 294438) @@ -202,14 +202,9 @@ ;; sparc*) if test "$SUNCC" = "yes"; then - CFLAGS="$CFLAGS -xc99=all -xmemalign=8s" + CFLAGS="$CFLAGS -xmemalign=8s" fi ;; - i386) -if test "$SUNCC" = "yes"; then - CFLAGS="$CFLAGS -xc99=all" -fi -;; esac dnl activate some gcc specific optimizations for gcc >= 4 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,292719,292765,293146,293152,293176,293380,293400,293502,293538,293558 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293380,293400,293442,293502,293538,293558 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293380,293400,293502,293538,293558 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293380,293400,293442,293502,293538,293558 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 -- 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/ Zend/header tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 18:47:13 + Revision: http://svn.php.net/viewvc?view=revision&revision=294437 Log: - year++ Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/Zend/header _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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293268,293341,293400,293502,293538,293558,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293268,293341,293380,293400,293502,293538,293558,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/Zend/header === --- php/php-src/branches/PHP_5_3_2/Zend/header 2010-02-03 18:41:27 UTC (rev 294436) +++ php/php-src/branches/PHP_5_3_2/Zend/header 2010-02-03 18:47:13 UTC (rev 294437) @@ -2,7 +2,7 @@ +--+ | Zend Engine | +--+ - | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) | + | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +--+ | This source file is subject to version 2.00 of the Zend license, | | that is bundled with this package in the file LICENSE, and is| 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,292719,292765,293146,293152,293176,293400,293502,293538,293558 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293380,293400,293502,293538,293558 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293400,293502,293538,293558 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293380,293400,293502,293538,293558 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 -- 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/dom/document.c ext/dom/tests/bug50661.phpt tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 18:41:27 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294436
Log:
fix bug #50661 (DOMDocument::loadXML does not allow UTF-16)
Bug: http://bugs.php.net/50661 (Closed) DOMDocument::loadXML does not allow
UTF-16
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/dom/document.c
A + php/php-src/branches/PHP_5_3_2/ext/dom/tests/bug50661.phpt
(from php/php-src/branches/PHP_5_3/ext/dom/tests/bug50661.phpt:r293176)
_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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293268,293341,293400,293502,293538,293558,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293268,293341,293400,293502,293538,293558,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/dom/document.c
===
--- php/php-src/branches/PHP_5_3_2/ext/dom/document.c 2010-02-03 18:38:11 UTC
(rev 294435)
+++ php/php-src/branches/PHP_5_3_2/ext/dom/document.c 2010-02-03 18:41:27 UTC
(rev 294436)
@@ -1542,7 +1542,7 @@
}
/* }}} */
-static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int
options TSRMLS_DC) /* {{{ */
+static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int
source_len, int options TSRMLS_DC) /* {{{ */
{
xmlDocPtr ret;
xmlParserCtxtPtr ctxt = NULL;
@@ -1579,7 +1579,7 @@
}
} else {
- ctxt = xmlCreateDocParserCtxt(source);
+ ctxt = xmlCreateMemoryParserCtxt(source, source_len);
}
if (ctxt == NULL) {
@@ -1682,7 +1682,7 @@
RETURN_FALSE;
}
- newdoc = dom_document_parser(id, mode, source, options TSRMLS_CC);
+ newdoc = dom_document_parser(id, mode, source, source_len, options
TSRMLS_CC);
if (!newdoc)
RETURN_FALSE;
Copied: php/php-src/branches/PHP_5_3_2/ext/dom/tests/bug50661.phpt (from rev
293176, php/php-src/branches/PHP_5_3/ext/dom/tests/bug50661.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/dom/tests/bug50661.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/dom/tests/bug50661.phpt 2010-02-03
18:41:27 UTC (rev 294436)
@@ -0,0 +1,16 @@
+--TEST--
+Bug #50661 (DOMDocument::loadXML does not allow UTF-16).
+--SKIPIF--
+
+--FILE--
+loadXML($data);
+echo $dom->saveXML();
+
+?>
+--EXPECT--
+
+
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,292719,292765,293146,293152,293400,293502,293538,293558
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293400,293502,293538,293558
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293400,293502,293538,293558
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293400,293502,293538,293558
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
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/soap/php_http.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 18:38:11 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294435
Log:
- Addressing minor leak noticed while addressing bug #48590
Bug: http://bugs.php.net/48590 (Closed) SOAP Client (redirect loop)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/soap/php_http.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293268,293341,293400,293502,293538,293558,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293268,293341,293400,293502,293538,293558,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c 2010-02-03 18:35:58 UTC
(rev 294434)
+++ php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c 2010-02-03 18:38:11 UTC
(rev 294435)
@@ -759,18 +759,17 @@
smart_str_0(&soap_headers);
err = php_stream_write(stream, soap_headers.c,
soap_headers.len);
+ smart_str_free(&soap_headers);
if (err != soap_headers.len) {
if (request != buf) {efree(request);}
- smart_str_free(&soap_headers);
php_stream_close(stream);
zend_hash_del(Z_OBJPROP_P(this_ptr), "httpurl",
sizeof("httpurl"));
zend_hash_del(Z_OBJPROP_P(this_ptr), "httpsocket",
sizeof("httpsocket"));
zend_hash_del(Z_OBJPROP_P(this_ptr), "_use_proxy",
sizeof("_use_proxy"));
add_soap_fault(this_ptr, "HTTP", "Failed Sending HTTP
SOAP request", NULL, NULL TSRMLS_CC);
+ smart_str_free(&soap_headers_z);
return FALSE;
}
- smart_str_free(&soap_headers);
-
} else {
add_soap_fault(this_ptr, "HTTP", "Failed to create stream??",
NULL, NULL TSRMLS_CC);
smart_str_free(&soap_headers_z);
@@ -1022,8 +1021,8 @@
phpurl = new_url;
if (--redirect_max < 1) {
- smart_str_free(&soap_headers_z);
add_soap_fault(this_ptr, "HTTP",
"Redirection limit reached, aborting", NULL, NULL TSRMLS_CC);
+ smart_str_free(&soap_headers_z);
return FALSE;
}
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,292719,292765,293146,293400,293502,293538,293558
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293400,293502,293538,293558
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293400,293502,293538,293558
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293400,293502,293538,293558
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
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/xml/tests/bug50576.phpt ext/xml/xml.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 18:35:58 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294434
Log:
- Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect).
Bug: http://bugs.php.net/50576 (Closed) XML_OPTION_SKIP_TAGSTART option has no
effect
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/xml/tests/bug50576.phpt
(from php/php-src/branches/PHP_5_3/ext/xml/tests/bug50576.phpt:r293146)
U php/php-src/branches/PHP_5_3_2/ext/xml/xml.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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293538,293558,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293268,293341,293400,293502,293538,293558,293974
/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-03 18:29:52 UTC (rev 294433)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-03 18:35:58 UTC (rev 294434)
@@ -10,6 +10,7 @@
- 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 #48590 (SoapClient does not honor max_redirects). (Sriram)
- Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive
in HTTP uploads). (Ilia)
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,292719,292765,293400,293502,293538,293558
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293400,293502,293538,293558
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Copied: php/php-src/branches/PHP_5_3_2/ext/xml/tests/bug50576.phpt (from rev
293146, php/php-src/branches/PHP_5_3/ext/xml/tests/bug50576.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/xml/tests/bug50576.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/xml/tests/bug50576.phpt 2010-02-03
18:35:58 UTC (rev 294434)
@@ -0,0 +1,133 @@
+--TEST--
+Bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect)
+--SKIPIF--
+
+--FILE--
+
+http://www.fpdsng.com/FPDS";>
+
+867
+
+
+XML;
+
+$xml_parser = xml_parser_create();
+xml_parser_set_option($xml_parser, XML_OPTION_SKIP_TAGSTART, 4);
+xml_parse_into_struct($xml_parser, $XML, $vals, $index);
+echo 'Index array' . PHP_EOL;
+print_r($index);
+echo 'Vals array' . PHP_EOL;
+print_r($vals);
+xml_parser_free($xml_parser);
+
+function startElement($parser, $name, $attribs) { echo $name . PHP_EOL; }
+function endElement($parser, $name) { echo $name . PHP_EOL; }
+$xml_parser = xml_parser_create();
+xml_set_element_handler($xml_parser, 'startElement', 'endElement');
+xml_parser_set_option($xml_parser, XML_OPTION_SKIP_TAGSTART, 4);
+xml_parse($xml_parser, $XML);
+xml_parser_free($xml_parser);
+
+?>
+--EXPECTF--
+Index array
+Array
+(
+[LISTOFAWARDS] => Array
+(
+[0] => 0
+[1] => 5
+[2] => 6
+)
+
+[COUNT] => Array
+(
+[0] => 1
+[1] => 3
+[2] => 4
+)
+
+[TOTAL] => Array
+(
+[0] => 2
+)
+
+)
+Vals array
+Array
+(
+[0] => Array
+(
+[tag] => LISTOFAWARDS
+[type] => open
+[level] => 1
+[attributes] => Array
+(
+[XMLNS:NS1] => http://www.fpdsng.com/FPDS
+)
+
+[value] =>
+
+)
+
+[1] => Array
+(
+[tag] => COUNT
+[type] => open
+[level] => 2
+[value] =>
+
+)
+
+[2] => Array
+(
+[tag] => TOTAL
+[type] => complete
+[level] => 3
+[value] => 867
+)
+
+[3] => Array
+(
+[tag] => COUNT
+[value] =>
+
+[type] => cdata
+
[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
pajoye Wed, 03 Feb 2010 18:29:52 + Revision: http://svn.php.net/viewvc?view=revision&revision=294433 Log: - merge fix build for sha 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,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293538,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293538,293558,293974 /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-03 18:17:32 UTC (rev 294432) +++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c 2010-02-03 18:29:52 UTC (rev 294433) @@ -2,10 +2,8 @@ Released into the Public Domain by Ulrich Drepper . */ /* Windows VC++ port by Pierre Joye */ -#ifndef PHP_WIN32 -# include "php.h" -# include "php_main.h" -#endif +#include "php.h" +#include "php_main.h" #include #include 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-03 18:17:32 UTC (rev 294432) +++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c 2010-02-03 18:29:52 UTC (rev 294433) @@ -2,10 +2,8 @@ Released into the Public Domain by Ulrich Drepper . */ /* Windows VC++ port by Pierre Joye */ -#ifndef PHP_WIN32 -# include "php.h" -# include "php_main.h" -#endif +#include "php.h" +#include "php_main.h" #include #include 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,292719,292765,293400,293502,293538 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293400,293502,293538,293558 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293400,293502,293538 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293400,293502,293538,293558 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 -- 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/gd/gd.c ext/gd/libgd/gd.c ext/gd/tests/imagefilledpolygon_negative.phpt ext/gd/tests/imagepolygon_negative.phpt tests/security/open_basedir_parse_in
pajoye Wed, 03 Feb 2010 18:15:16 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294430
Log:
-merge: imagepolygon() and imagefilledpolygon() does not allow negative number
of points
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/gd/gd.c
U php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c
A +
php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagefilledpolygon_negative.phpt
(from
php/php-src/branches/PHP_5_3/ext/gd/tests/imagefilledpolygon_negative.phpt:r293538)
A + php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagepolygon_negative.phpt
(from
php/php-src/branches/PHP_5_3/ext/gd/tests/imagepolygon_negative.phpt:r293538)
_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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293538,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/gd.c
===
--- php/php-src/branches/PHP_5_3_2/ext/gd/gd.c 2010-02-03 18:11:24 UTC (rev
294429)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/gd.c 2010-02-03 18:15:16 UTC (rev
294430)
@@ -3427,7 +3427,10 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must have at
least 3 points in your array");
RETURN_FALSE;
}
-
+ if (npoints <= 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must give a
positive number of points");
+ RETURN_FALSE;
+ }
if (nelem < npoints * 2) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Trying to use %d
points in array with only %d points", npoints, nelem/2);
RETURN_FALSE;
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c
===
--- php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c2010-02-03 18:11:24 UTC
(rev 294429)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c2010-02-03 18:15:16 UTC
(rev 294430)
@@ -2568,7 +2568,7 @@
typedef void (*image_line)(gdImagePtr im, int x1, int y1, int x2, int
y2, int color);
image_line draw_line;
- if (!n) {
+ if (n <= 0) {
return;
}
@@ -2621,7 +2621,7 @@
int ints;
int fill_color;
- if (!n) {
+ if (n <= 0) {
return;
}
Copied:
php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagefilledpolygon_negative.phpt
(from rev 293538,
php/php-src/branches/PHP_5_3/ext/gd/tests/imagefilledpolygon_negative.phpt)
===
---
php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagefilledpolygon_negative.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagefilledpolygon_negative.phpt
2010-02-03 18:15:16 UTC (rev 294430)
@@ -0,0 +1,15 @@
+--TEST--
+imagefilledpolygon() with a negative num of points
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+Warning: imagefilledpolygon(): You must give a positive number of points in %s
on line %d
Copied: php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagepolygon_negative.phpt
(from rev 293538,
php/php-src/branches/PHP_5_3/ext/gd/tests/imagepolygon_negative.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagepolygon_negative.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagepolygon_negative.phpt
2010-02-03 18:15:16 UTC (rev 294430)
@@ -0,0 +1,15 @@
+--TEST--
+imagepolygon() with a negative num of points
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+Warning: imagepolygon(): You must give a positive number of points in %s on
line %d
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,292719,292765,293400,293502
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293400,293502,293538
/php/php-src/trunk/ext/tidy/tests:2
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/exec.c ext/standard/tests/general_functions/bug49847.phpt ext/standard/tests/general_functions/bug50732.phpt tests/security/open_basedir_pa
pajoye Wed, 03 Feb 2010 18:11:24 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294429
Log:
- merge: Fixed bug #50732 (exec() adds single byte twice to array).
Bug: http://bugs.php.net/50732 (Closed) exec() adds single byte twice to
$output array
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/standard/exec.c
A +
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug49847.phpt
(from
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug49847.phpt:r293502)
A +
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug50732.phpt
(from
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug50732.phpt:r293502)
_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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/standard/exec.c
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/exec.c 2010-02-03 18:08:05 UTC (rev 294428)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/exec.c 2010-02-03 18:11:24 UTC (rev 294429)
@@ -121,7 +121,7 @@
if (type != 3) {
b = buf;
-
+
while (php_stream_get_line(stream, b, EXEC_INPUT_BUF, &bufl)) {
/* no new line found, let's read some more */
if (b[bufl - 1] != '\n' && !php_stream_eof(stream)) {
@@ -157,7 +157,7 @@
}
if (bufl) {
/* strip trailing whitespaces if we have not done so already */
- if ((type == 2 && bufl && !l) || type != 2) {
+ if ((type == 2 && buf != b) || type != 2) {
l = bufl;
while (l-- && isspace(((unsigned char *)buf)[l]));
if (l != (int)(bufl - 1)) {
Copied: php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug49847.phpt (from rev 293502, php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug49847.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug49847.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug49847.phpt 2010-02-03 18:11:24 UTC (rev 294429)
@@ -0,0 +1,36 @@
+--TEST--
+Bug #49847 (exec() fails on lines larger then 4095 bytes)
+--FILE--
+
+--EXPECT--
+array(1) {
+ [0]=>
+ string(4098) "
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 03 Feb 2010 18:08:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=294428 Log: - merge info Changed paths: _U php/php-src/branches/PHP_5_3_2/ _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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293974 /php/php-src/trunk:284726 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,292719,292765 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293400 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293400 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 -- 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/Zend/ zend_variables.c zend_variables.h
pajoye Wed, 03 Feb 2010 18:07:25 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294427
Log:
- Fixed bug #50519 (segfault in garbage collection when using set_error_handler
an..
Bug: http://bugs.php.net/50519 (Closed) segfault in garbage collection when
using set_error_handler and DomDocument
Changed paths:
U php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c
U php/php-src/branches/PHP_5_3_2/Zend/zend_variables.h
Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c
===
--- php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c2010-02-03
17:55:57 UTC (rev 294426)
+++ php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c2010-02-03
18:07:25 UTC (rev 294427)
@@ -151,13 +151,6 @@
}
-#if ZEND_DEBUG
-ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue)
-{
- zval_copy_ctor(zvalue);
-}
-
-
ZEND_API void _zval_dtor_wrapper(zval *zvalue)
{
TSRMLS_FETCH();
@@ -167,6 +160,13 @@
}
+#if ZEND_DEBUG
+ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue)
+{
+ zval_copy_ctor(zvalue);
+}
+
+
ZEND_API void _zval_internal_dtor_wrapper(zval *zvalue)
{
zval_internal_dtor(zvalue);
Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_variables.h
===
--- php/php-src/branches/PHP_5_3_2/Zend/zend_variables.h2010-02-03
17:55:57 UTC (rev 294426)
+++ php/php-src/branches/PHP_5_3_2/Zend/zend_variables.h2010-02-03
18:07:25 UTC (rev 294427)
@@ -50,26 +50,25 @@
ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC);
ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC);
ZEND_API void _zval_internal_ptr_dtor(zval **zvalue ZEND_FILE_LINE_DC);
+ZEND_API void _zval_dtor_wrapper(zval *zvalue);
#define zval_copy_ctor(zvalue) _zval_copy_ctor((zvalue) ZEND_FILE_LINE_CC)
#define zval_dtor(zvalue) _zval_dtor((zvalue) ZEND_FILE_LINE_CC)
#define zval_ptr_dtor(zval_ptr) _zval_ptr_dtor((zval_ptr) ZEND_FILE_LINE_CC)
#define zval_internal_dtor(zvalue) _zval_internal_dtor((zvalue)
ZEND_FILE_LINE_CC)
#define zval_internal_ptr_dtor(zvalue) _zval_internal_ptr_dtor((zvalue)
ZEND_FILE_LINE_CC)
+#define zval_dtor_wrapper _zval_dtor_wrapper
#if ZEND_DEBUG
ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue);
-ZEND_API void _zval_dtor_wrapper(zval *zvalue);
ZEND_API void _zval_ptr_dtor_wrapper(zval **zval_ptr);
ZEND_API void _zval_internal_dtor_wrapper(zval *zvalue);
ZEND_API void _zval_internal_ptr_dtor_wrapper(zval **zvalue);
#define zval_copy_ctor_wrapper _zval_copy_ctor_wrapper
-#define zval_dtor_wrapper _zval_dtor_wrapper
#define zval_ptr_dtor_wrapper _zval_ptr_dtor_wrapper
#define zval_internal_dtor_wrapper _zval_internal_dtor_wrapper
#define zval_internal_ptr_dtor_wrapper _zval_internal_ptr_dtor_wrapper
#else
#define zval_copy_ctor_wrapper _zval_copy_ctor_func
-#define zval_dtor_wrapper _zval_dtor_func
#define zval_ptr_dtor_wrapper _zval_ptr_dtor
#define zval_internal_dtor_wrapper _zval_internal_dtor
#define zval_internal_ptr_dtor_wrapper _zval_internal_ptr_dtor
--
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/
pajoye Wed, 03 Feb 2010 17:55:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=294426 Log: - merge info Changed paths: _U php/php-src/branches/PHP_5_3_2/ 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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293974 /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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293974 /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/ext/gd/libgd/ gd_png.c
pajoye Wed, 03 Feb 2010 17:47:28 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294425
Log:
- Merge: use png_sig_cmp to support libpng 1.4, old is deprecated already in
older vers
Changed paths:
U php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd_png.c
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd_png.c
===
--- php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd_png.c2010-02-03
17:44:30 UTC (rev 294424)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd_png.c2010-02-03
17:47:28 UTC (rev 294425)
@@ -145,7 +145,7 @@
return NULL;
}
- if (!png_check_sig (sig, 8)) { /* bad signature */
+ if (png_sig_cmp(sig, 0, 8) != 0) { /* bad signature */
return NULL;
}
--
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/gd/ libgd/gdft.c tests/bug49600.phpt
pajoye Wed, 03 Feb 2010 17:41:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294423
Log:
- Merge #49600 (imageTTFText text shifted right)
Bug: http://bugs.php.net/49600 (No Feedback) imageTTFText text shifted right
Changed paths:
U php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gdft.c
A + php/php-src/branches/PHP_5_3_2/ext/gd/tests/bug49600.phpt
(from php/php-src/branches/PHP_5_3/ext/gd/tests/bug49600.phpt:r293268)
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gdft.c
===
--- php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gdft.c 2010-02-03 17:32:48 UTC
(rev 294422)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gdft.c 2010-02-03 17:41:00 UTC
(rev 294423)
@@ -1101,7 +1101,7 @@
/* now, draw to our target surface */
bm = (FT_BitmapGlyph) image;
- gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 +
((pen.x + 31) >> 6) + bm->left, y + y1 + ((pen.y + 31) >> 6) - bm->top);
+ gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 +
((pen.x + 31) >> 6), y + y1 + ((pen.y + 31) >> 6) - bm->top);
}
/* record current glyph index for kerning */
Copied: php/php-src/branches/PHP_5_3_2/ext/gd/tests/bug49600.phpt (from rev
293268, php/php-src/branches/PHP_5_3/ext/gd/tests/bug49600.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/gd/tests/bug49600.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/tests/bug49600.phpt 2010-02-03
17:41:00 UTC (rev 294423)
@@ -0,0 +1,32 @@
+--TEST--
+Bug #49600 (imageTTFText text shifted right)
+--SKIPIF--
+
+--FILE--
+ 1
+ || abs($x[2] - $y[2]) > 1
+ || abs($x[4] - $y[4]) > 1
+ || abs($x[6] - $y[6]) > 1 ) {
+ echo "FAILED: \n";
+ var_dump($x);
+ var_dump($y);
+ exit;
+}
+}
+echo 'OK';
+?>
+--EXPECTF--
+OK
\ No newline at end of file
--
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/filter/tests/bug50632.phpt
johannes Thu, 28 Jan 2010 01:45:47 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294133
Log:
merge r293144 - Added test case for bug #50632 (iliaa)
Bug: http://bugs.php.net/50632 (Closed) Return default value if var is undefined
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
A + php/php-src/branches/PHP_5_3_2/ext/filter/tests/bug50632.phpt
(from
php/php-src/branches/PHP_5_3/ext/filter/tests/bug50632.phpt:r293144)
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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293974
/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,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293974
/php/php-src/trunk:284726
Copied: php/php-src/branches/PHP_5_3_2/ext/filter/tests/bug50632.phpt (from rev
293144, php/php-src/branches/PHP_5_3/ext/filter/tests/bug50632.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/filter/tests/bug50632.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/filter/tests/bug50632.phpt
2010-01-28 01:45:47 UTC (rev 294133)
@@ -0,0 +1,11 @@
+--TEST--
+bug 50632, filter_input() does not return default value if the variable does
not exist
+--SKIPIF--
+
+--FILE--
+
FILTER_REQUIRE_SCALAR, 'options' => array('default' => 23)));
+var_dump($foo);
+?>
+--EXPECT--
+int(23)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
