clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,101 Commits 494 Branches 1,367 Tags 810 MiB
0107b2afe8
Commit Graph

75101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ard Biesheuvel
4cd2b7212f Fix non-specialized executor build 
Removed a couple of calls to FREE_OP2() that were left behind in
the handlers for break and continue opcodes after commit 7628da98
 2013-06-20 17:26:05 +02:00
Johannes Schlüter
3e6b312b55 Merge branch 'PHP-5.5' 2013-06-20 11:57:56 +02:00
Johannes Schlüter
94e7549719 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-20 11:57:10 +02:00
Johannes Schlüter
b5978e239e Merge branch 'PHP-5.3' into PHP-5.4 2013-06-20 11:52:29 +02:00
Johannes Schlüter
e4ee921b7e Update git rules (5.5 is stable, 5.3 sec only) 2013-06-20 11:51:21 +02:00
Remi Collet
a964c5def8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  skip test for bug #64936 when tokenizer not built
 2013-06-20 08:43:11 +02:00
Remi Collet
60afd3fce4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  skip test for bug #64936 when tokenizer not built
 2013-06-20 08:42:30 +02:00
Remi Collet
9be591bdb5 skip test for bug #64936 when tokenizer not built 2013-06-20 08:42:07 +02:00
David Soria Parra
f77e3be102 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final
 2013-06-19 22:14:08 +02:00
David Soria Parra
83fc53acb9 Bump version 2013-06-19 22:11:52 +02:00
David Soria Parra
c1b8fbc112 Update credits 2013-06-19 22:03:18 +02:00
David Soria Parra
8547628fec Merge NEWS from PHP 5.4 branch 2013-06-19 21:54:34 +02:00
David Soria Parra
2bac1ff137 Reorder NEWS for PHP 5.5.0 final 2013-06-19 21:50:05 +02:00
Pierre Joye
d5b1111fb0 Merge branch 'PHP-5.5' 
* PHP-5.5:
  add notes about opcache windows issue and migration from APC
 2013-06-19 17:59:30 +02:00
Pierre Joye
0a6ec7a2c9 add notes about opcache windows issue and migration from APC 2013-06-19 17:57:08 +02:00
Anatol Belski
d9f538bc68 Merge branch 'PHP-5.5' 
* PHP-5.5:
  added some tests based on bug #64395
 2013-06-19 16:25:08 +02:00
Anatol Belski
2873b5b6eb added some tests based on bug #64395 2013-06-19 16:24:30 +02:00
Johannes Schlüter
96c1e0440b Merge branch 'PHP-5.5' 2013-06-19 15:09:45 +02:00
Johannes Schlüter
c6b8d992ba Merge branch 'PHP-5.4' into PHP-5.5 2013-06-19 15:09:33 +02:00
Johannes Schlüter
0e55d3a12a Merge branch 'PHP-5.3' into PHP-5.4 2013-06-19 15:09:04 +02:00
Johannes Schlüter
f0eaa02f6f This will be PHP 5.3.28 2013-06-19 15:08:02 +02:00
Remi Collet
04b2f8d53e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Related to bug #65047 (Test skip on client / server version)
 2013-06-19 12:27:12 +02:00
Remi Collet
fb68e0fe63 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Related to bug #65047 (Test skip on client / server version)
 2013-06-19 12:26:53 +02:00
Remi Collet
67bde2f8ac Related to bug #65047 (Test skip on client / server version) 
bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)

bug_49985.phpt
Make result "locale" independent
 2013-06-19 12:26:21 +02:00
Matteo Beccati
77032bcd9c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test
 2013-06-19 11:53:21 +02:00
Matteo Beccati
9b8259cdfa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test
 2013-06-19 11:53:05 +02:00
Matteo Beccati
c666239265 Fixed bug #65047 (Test skip on client / server version) 2013-06-19 11:48:03 +02:00
Matteo Beccati
25e9aa6b0a Remove broken client version checking 2013-06-19 11:48:03 +02:00
Matteo Beccati
5edd530511 Clean up leftover file after the test 2013-06-19 11:48:03 +02:00
Stanislav Malyshev
07a38ea80c Merge branch 'PHP-5.5' 
* PHP-5.5:
  sync NEWS
 2013-06-18 23:09:36 -07:00
Stanislav Malyshev
7b08c7f4e7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  sync NEWS
 2013-06-18 23:09:29 -07:00
Stanislav Malyshev
e2bb74ab4f sync NEWS 2013-06-18 23:06:20 -07:00
Stanislav Malyshev
a984dd4eb4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  5.4.18 next
 2013-06-18 22:59:34 -07:00
Stanislav Malyshev
59d4d41efb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.18 next

Conflicts:
	configure.in
	main/php_version.h
 2013-06-18 22:59:26 -07:00
Stanislav Malyshev
dda3f404ec 5.4.18 next 2013-06-18 22:58:11 -07:00
Xinchen Hui
ce1cb1f7a6 Merge branch 'PHP-5.5' 2013-06-19 11:17:55 +08:00
Xinchen Hui
bb9928c343 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-19 11:17:44 +08:00
Xinchen Hui
2ce4bd7f2d Fix test typo 2013-06-19 11:15:52 +08:00
Nikita Popov
42729c1baf Merge branch 'PHP-5.5' 2013-06-17 23:49:08 +02:00
Nikita Popov
86434be946 Fix bug #65051: count() off by one inside unset() 
nNumOfElements was incremented after the pDestructor code, so any
code in the dtor would get a wrong number of elements.

Right now the bucket deletion code is replicated in four places,
it should probably be moved off into one function (or rather,
zend_hash_apply_deleter should be used everywhere). The codes are
subtly different though in that the HANDLE_UNBLOCK_INTERRUPTIONS()
happens in different places. In particular it seems odd that in
some cases interruptions stay blocked during the destructor call.
 2013-06-17 23:44:13 +02:00
Nikita Popov
ae91084067 Remove unnecessary NULL checks from zend_hash 
Our memory allocation functions (including the persistent ones)
are infallible, so no need to check for NULL.
 2013-06-17 18:51:59 +02:00
Nikita Popov
ca660c2f77 Update NEWS, UPGRADING and UPGRADING.INTERNALS 2013-06-17 18:27:22 +02:00
Nikita Popov
7713b8c2ac GMP improvements 
As per RFC https://wiki.php.net/rfc/operator_overloading_gmp
 2013-06-17 17:59:12 +02:00
Nikita Popov
3823321c5c Implement internal operator overloading 
As pre RFC https://wiki.php.net/rfc/operator_overloading_gmp
 2013-06-17 17:48:13 +02:00
Stanislav Malyshev
1143f58a70 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Merge branch 'pull-request/320'
  Merge branch 'pull-request/320'
 2013-06-17 01:07:28 -07:00
Stanislav Malyshev
d587efb7ee Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Merge branch 'pull-request/320'
 2013-06-17 01:06:28 -07:00
Stanislav Malyshev
af5e2eaf8d Merge branch 'pull-request/320' 
* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test
 2013-06-17 01:06:20 -07:00
Stanislav Malyshev
6b896fa57f Merge branch 'pull-request/320' 
* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test
 2013-06-17 01:06:01 -07:00
Stanislav Malyshev
a434251322 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724
 2013-06-17 00:42:36 -07:00
Stanislav Malyshev
a080611e48 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724
 2013-06-17 00:42:21 -07:00