Commit Graph

68934 Commits

Author SHA1 Message Date
Xinchen Hui
1a527397cc better fix & this test pass now 2012-08-15 01:25:31 +08:00
Xinchen Hui
6bafbb9abf Merge branch 'PHP-5.3' into PHP-5.4 2012-08-15 01:08:19 +08:00
Xinchen Hui
8848778a59 Merge fix e7535e06e6 to 5.3
thanks for reeze.xia@gmail.com notice this
2012-08-15 01:06:10 +08:00
Xinchen Hui
3ba07c2ca3 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-15 00:47:08 +08:00
Xinchen Hui
bec5e10155 update NEWS 2012-08-15 00:46:56 +08:00
Xinchen Hui
a5a409ebff Fixed bug (segfault due to retval is not initialized) 2012-08-15 00:44:47 +08:00
Xinchen Hui
9be55beb91 Attempt to fix segfault due to retval is not initialized 2012-08-15 00:31:57 +08:00
Xinchen Hui
b2fe342d04 improve the fix 2012-08-15 00:25:06 +08:00
Xinchen Hui
da3660a4c4 Fixed bug (segfault due to PS(mod_user_implemented) not be reseted when closing handler call exit) 2012-08-15 00:15:34 +08:00
Nikita Popov
49e91151c0 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-14 17:37:10 +02:00
Nikita Popov
e1c610fb44 Fix exif test failure
There are two slightly different error messages for invalid pointers, so
make the pattern slightly less strict to account for both.
2012-08-14 17:33:38 +02:00
Xinchen Hui
8091256948 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-14 14:03:05 +08:00
Xinchen Hui
da14cdd6f3 Merge branch 'skip-memory-exhaust-tests' of https://github.com/reeze/php-src into PHP-5.3 2012-08-14 13:58:15 +08:00
Nikita Popov
f19351b503 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-13 22:06:18 +02:00
Nikita Popov
7aed239050 Ask for less random data in mcrypt_create_iv
Otherwise the RNG blocks and the test takes a lot of time to run (and
occasionally fails).
2012-08-13 22:01:19 +02:00
Nikita Popov
9bc1af1e58 Rename mcrypt_cbf -> mcrypt_cfb
Also fix ECB -> CFB in the initialization vector size call (not that it
makes a difference, they have the same size).
2012-08-13 22:01:03 +02:00
Xinchen Hui
212cfb95d1 more test script for #62328 2012-08-13 11:03:35 +08:00
Xinchen Hui
be818e7ea7 Update NEWS 2012-08-12 20:59:33 +08:00
Xinchen Hui
dda0565b53 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-12 20:58:45 +08:00
Xinchen Hui
4970926e45 Fixed bug #62763 (register_shutdown_function and extending class) 2012-08-12 20:58:09 +08:00
Xinchen Hui
786670f536 Update NEWS 2012-08-12 12:00:16 +08:00
Xinchen Hui
7b307fb930 Fixed bug #62328 (implementing __toString and a cast to string fails)
__toString should has a high priority
2012-08-12 11:50:28 +08:00
Xinchen Hui
d4f9bbfae2 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-11 16:00:00 +08:00
Xinchen Hui
e1180b4f1a Fixed bug #62795 (Zip extension version not defined) 2012-08-11 15:59:06 +08:00
Reeze Xia
0239437903 Skip tests reply on Zend MM turned on
Those two tests have expect memory exhausted fatal error
2012-08-11 00:34:37 +08:00
Xinchen Hui
5ae7540abd Merge branch 'PHP-5.3' into PHP-5.4 2012-08-11 00:24:12 +08:00
Xinchen Hui
7130887719 Fix test, from PR 158 2012-08-11 00:22:52 +08:00
Rob Richards
c5a611b257 Merge branch 'PHP-5.3' into PHP-5.4
# By Daniel Veillard
* PHP-5.3:
  Update to work with libxml 2.9.0
2012-08-09 14:24:50 -04:00
Daniel Veillard
c4b26cc1b0 Update to work with libxml 2.9.0 2012-08-09 14:02:33 -04:00
Stanislav Malyshev
c98a51a169 Merge branch 'bug40459' into PHP-5.4
* bug40459:
  News for bug#40459
  fix bug #40459 - make all stream funcs that create object call ctor
2012-08-09 00:10:31 -07:00
Stanislav Malyshev
128a4bbb0d News for bug#40459 2012-08-07 23:03:33 -07:00
Stanislav Malyshev
4db70fd406 fix bug #40459 - make all stream funcs that create object call ctor 2012-08-07 22:59:12 -07:00
Anatoliy Belsky
55b82abe00 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too.
2012-08-06 14:12:04 +02:00
Matt Ficken
ed793b2a3f Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too. 2012-08-06 14:07:42 +02:00
Stanislav Malyshev
01e414bb6f Add #51363 2012-08-05 21:00:04 -07:00
Lonny Kapelushnik
45f3322905 var_export outputs an E_WARNING when recursion is detected 2012-08-05 20:56:06 -07:00
Ryusuke SEKIYAMA
81c6a060a2 Added Bison 2.5.1 to bison_version_list 2012-08-05 20:48:42 -07:00
Brett Bieber
82bc8821f9 Minor spelling corrections 2012-08-05 20:43:22 -07:00
Stanislav Malyshev
a65cff9151 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix for #62460
2012-08-05 20:31:29 -07:00
Stanislav Malyshev
a239658b9e fix for #62460 2012-08-05 20:31:08 -07:00
Stanislav Malyshev
2dbd3ac8cd Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62460 (php binaries installed as binary.dSYM)
  (empty merge for 5.4)
2012-08-05 20:23:53 -07:00
Reeze Xia
07ee764e57 Fixed bug #62460 (php binaries installed as binary.dSYM)
See http://marc.info/?l=php-cvs&m=125961714419896
Mac OS X 10.7&10.8 affected too.
2012-08-05 20:22:07 -07:00
Xinchen Hui
346b3ff094 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-05 12:46:55 +08:00
Xinchen Hui
228c288686 Fix 126 tests failed of phar when --enable-zend-multibyte 2012-08-05 12:40:59 +08:00
Xinchen Hui
7ca0291b94 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-04 11:29:04 +08:00
Xinchen Hui
d289efb457 Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	Zend/zend_API.h
2012-08-04 11:14:03 +08:00
Xinchen Hui
f4a315fce2 This becomes useless, since we have set that in the INIT macro 2012-08-04 11:03:21 +08:00
Xinchen Hui
03a1fcabf3 Fixed bug #62744 (dangling pointers made by zend_disable_class)
the test will be added while commit the fix for #62737
2012-08-04 10:41:26 +08:00
Xinchen Hui
d1f0662e4d Fixed bug #62725 (Calling exit() in a shutdown function does not return the exit value)
The fix is make 5.4 behavior consistent with 5.3
2012-08-02 23:03:38 +08:00
Xinchen Hui
170ee90bf9 Fixed bug that can not get default value of parameter if it's not optional 2012-08-02 22:28:04 +08:00