1
0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Commit Graph

73029 Commits

Author SHA1 Message Date
Keyur Govande
cdacda720c Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/push/php-src:
  Fix tests after laruence unserialize change
  Fix get_property_ptr_ptr declaration in simplexml
  Update NEWS
  Fixed confused exception message while user threw exception
  Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
  Fix date
  use NEWS only
  Fixed bug #61025 (__invoke() visibility not honored)
2013-03-11 00:05:49 +00:00
Nikita Popov
9490118fdb Fix tests after laruence unserialize change 2013-03-09 20:21:33 +01:00
Nikita Popov
a59b211b2d Fix get_property_ptr_ptr declaration in simplexml
A new parameter was added to the API and simplexml wasn't adjusted,
thus causing crashes.
2013-03-09 20:15:00 +01:00
Xinchen Hui
9d816ba1d3 Update NEWS 2013-03-09 23:11:48 +08:00
Xinchen Hui
1be745ce1b Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/standard/var_unserializer.c
2013-03-09 23:10:48 +08:00
Xinchen Hui
7197f0ffcc Fixed confused exception message while user threw exception 2013-03-09 23:08:14 +08:00
Xinchen Hui
f52b2e6a65 Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
2013-03-09 23:00:58 +08:00
Xinchen Hui
af5ada3871 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-09 11:38:32 +08:00
Xinchen Hui
6fece94369 Fix date 2013-03-09 11:37:41 +08:00
David Soria Parra
6824dc6b33 use NEWS only 2013-03-08 11:12:35 +01:00
Xinchen Hui
01049ca7ae Fixed bug #61025 (__invoke() visibility not honored) 2013-03-08 10:34:17 +08:00
Keyur Govande
5543035a70 Merge branch 'pull-request/300' into PHP-5.5
* pull-request/300:
  Support for CLI process title (https://wiki.php.net/rfc/cli_process_title)
2013-03-07 23:51:37 +00:00
Ralph Schindler
ac73ca6db4 Fix for https://bugs.php.net/bug.php?id=62649 2013-03-07 23:20:11 +01:00
Carson McDonald
0c11cab919 Typo fix: recieved to received 2013-03-07 23:05:05 +01:00
Keyur Govande
a0a995cff3 Support for CLI process title (https://wiki.php.net/rfc/cli_process_title)
A new commit into branch 5.5
2013-03-07 18:54:34 +00:00
David Soria Parra
e98271f588 News for next beta 2013-03-07 12:14:48 +01:00
David Soria Parra
d0ca2430da Do another Alpha instead of Beta because of ZO+ RFC being voted on 2013-03-07 12:14:26 +01:00
David Soria Parra
4923bb579a NEWS for the next beta 2013-03-06 23:51:27 +01:00
David Soria Parra
b6ae7cba1e NEWS for PHP 5.5.0 Beta 1 2013-03-06 22:39:54 +01:00
Anatol Belski
8589dfb6cc simplified the previous fix for #64359 2013-03-06 16:48:51 +01:00
Anatol Belski
371000a877 Fixed bug #64359 strftime crash with VS2012 2013-03-06 12:37:57 +01:00
Stanislav Malyshev
9ed7eab514 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix NEWS
2013-03-06 00:45:26 -08:00
Stanislav Malyshev
38847482c8 fix NEWS 2013-03-06 00:44:43 -08:00
Xinchen Hui
082741814a skip if no IPv6 support 2013-03-05 17:18:13 +08:00
Xinchen Hui
e5d0dc24d2 Fix tests temporary
seems IPV6_PKTINFO are not avaiable in some OS
2013-03-05 16:56:00 +08:00
Xinchen Hui
1978dae309 Skip test on Apple 2013-03-05 14:02:28 +08:00
Xinchen Hui
3f67d5ae43 Revert "Fixed Bug #64340 (sockets tests failed) Patch by Reeze"
build break, will only leave the test script fix first

This reverts commit f2246f352f.
2013-03-05 13:58:20 +08:00
Pierre Joye
0404c38615 - fix path 2013-03-04 14:14:09 +01:00
Pierre Joye
e9a2642c89 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-04 14:06:09 +01:00
Pierre Joye
5001f40e82 - add noisy php logo for autocrop with threshold test 2013-03-04 12:05:59 +01:00
Anatol Belski
2635408a0d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed PCRE locale crash in Windows/TS
2013-03-04 09:15:17 +01:00
Anatol Belski
4e46a87392 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed PCRE locale crash in Windows/TS
2013-03-04 09:14:14 +01:00
Stephen A. Zarkos
b6fdb60ecf Fixed PCRE locale crash in Windows/TS 2013-03-04 09:09:45 +01:00
Pierre Joye
2024ff3b61 - add test for imagecropauto 2013-03-04 07:26:07 +01:00
Stanislav Malyshev
b65d4d1cfc Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  rename NEWS back
  updated NEWS
2013-03-03 13:24:00 -08:00
Stanislav Malyshev
2578f7bcc0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  rename NEWS back
  updated NEWS
2013-03-03 13:20:57 -08:00
Stanislav Malyshev
656fcb67f1 rename NEWS back 2013-03-03 13:18:58 -08:00
Anatol Belski
a5b6a0a25b Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:23:06 +01:00
Anatol Belski
d95faef1a1 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:22:35 +01:00
Anatol Belski
fe2612d71e Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
* 'PHP-5.3' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:21:45 +01:00
Anatol Belski
555d584a40 updated NEWS 2013-03-03 19:16:36 +01:00
Anatol Belski
b89c326578 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  This commit was manufactured by cvs2svn to create tag 'NEWS'.
2013-03-03 19:15:37 +01:00
Anatol Belski
00ecc12c0f updated NEWS 2013-03-03 19:14:50 +01:00
Anatol Belski
faf14e9b2e Merge commit 'NEWS' into PHP-5.4
* commit 'NEWS':
  This commit was manufactured by cvs2svn to create tag 'NEWS'.
2013-03-03 19:14:17 +01:00
Anatol Belski
e1023affc1 updated NEWS 2013-03-03 19:13:38 +01:00
Derick Rethans
1e1de1554f Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files. 2013-03-03 13:10:24 -05:00
Anatol Belski
1cda84a986 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  merged PCRE 8.32
2013-03-03 19:10:12 +01:00
Derick Rethans
47ac3ec1f4 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-03 13:10:07 -05:00
Derick Rethans
6c2564766f Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files. 2013-03-03 13:09:52 -05:00
Derick Rethans
206cce0d8b Merge branch 'PHP-5.3' into PHP-5.4 2013-03-03 13:09:31 -05:00