clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,454 Commits 494 Branches 1,367 Tags 802 MiB
0a13f8168d
Commit Graph

79454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferenc Kovacs
1b1dabcf60 Merge branch 'PHP-5.6' 
* PHP-5.6:
  abstract namespace for unix sockets is a linux only feature
 2014-04-09 19:04:35 +02:00
Ferenc Kovacs
cbcce72308 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  abstract namespace for unix sockets is a linux only feature
 2014-04-09 19:02:56 +02:00
Ferenc Kovacs
e00e4b9334 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  abstract namespace for unix sockets is a linux only feature
 2014-04-09 19:02:25 +02:00
Ferenc Kovacs
2c8aeda6dc abstract namespace for unix sockets is a linux only feature 2014-04-09 19:01:01 +02:00
Tjerk Meesters
939b2db87d Merge branch 'PHP-5.6' 2014-04-09 20:11:36 +08:00
Tjerk Meesters
16ae472769 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-09 20:11:07 +08:00
Tjerk Meesters
287790d5c8 Don't test for specific non-zero substr_compare() return value 2014-04-09 20:10:34 +08:00
Nikita Popov
21e01f2b70 Merge branch 'PHP-5.6' 2014-04-09 12:31:35 +02:00
Nikita Popov
ad2ef3d97e Add only_integer_keys option to zend_hash_reindex 
This allows to either do a full reindex, or only reindex the integer
keys.
 2014-04-09 12:31:21 +02:00
Nikita Popov
f485c84a14 Don't always separate splice replacement array 
Only perform separation when a typecast is done. Avoids doing a
full hash copy in many cases.
 2014-04-09 12:31:21 +02:00
Nikita Popov
22d3eb3117 Add zend_hash_splice 
This implements the original functionality of php_splice, but
as an in-place operation, thus avoiding copying the HT.

This is much faster (~10x) if the splice removes a small portion
of the array and doesn't insert many elements.
 2014-04-09 12:31:21 +02:00
Nikita Popov
1aa8719e32 Add zend_hash_reindex 
The implementation differs from the original in array.c in that it
rehashes the hashtable in the same loop. This is approximately two
times faster (not counting the rare case of a purely associative
array).
 2014-04-09 12:31:21 +02:00
Nikita Popov
eaf44ec397 Remove some usages of hashtable internals 2014-04-09 12:31:21 +02:00
Etienne Kneuss
6acfaa982b Merge branch 'PHP-5.6' 2014-04-09 11:52:11 +02:00
Etienne Kneuss
6006a3ed51 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-09 11:36:36 +02:00
Etienne Kneuss
a95a6e93ee Updated NEWS 2014-04-09 11:35:54 +02:00
Joshua Thijssen
e8d6c6587d fixed bug66702 : regexiterator's invert flag doesn't work as expected 2014-04-09 11:13:33 +02:00
Tjerk Meesters
419d98b291 Merge branch 'PHP-5.6' 2014-04-09 07:37:07 +08:00
Tjerk Meesters
2cdf38b7a0 Updated NEWS for #67043 2014-04-09 07:36:34 +08:00
Tjerk Meesters
2aba2494f5 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-09 07:34:49 +08:00
Tjerk Meesters
032921d80c Fixed bug 67043 2014-04-09 07:33:55 +08:00
Stanislav Malyshev
d349971bb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
 2014-04-08 09:39:34 -07:00
Popa Adrian Marius
002c8e8356 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
 2014-04-08 17:52:22 +03:00
Popa Adrian Marius
4141ceb795 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
 2014-04-08 17:51:54 +03:00
Popa Adrian Marius
0ea731fc83 cleanup 2014-04-08 17:51:06 +03:00
Popa Adrian Marius
cc20351134 Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret 2014-04-08 17:50:41 +03:00
Popa Adrian Marius
8abcd97333 cleanup old unsupported versions of Firebird 1.0.x 2014-04-08 17:36:38 +03:00
Popa Adrian Marius
88cd44aa62 cleanup 2014-04-08 15:29:32 +03:00
Popa Adrian Marius
6d7093cbbe Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret 2014-04-08 14:11:58 +03:00
Anatol Belski
1157f81b2f Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated libs versions
 2014-04-08 11:43:55 +02:00
Anatol Belski
ff5896a04c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libs versions
 2014-04-08 11:43:32 +02:00
Anatol Belski
7a71f5d112 updated libs versions 2014-04-08 11:42:58 +02:00
Anatol Belski
6c2f7bc2c4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed the test for ICI >= 52.1
 2014-04-07 17:41:47 +02:00
Anatol Belski
964f65484c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed the test for ICI >= 52.1
 2014-04-07 17:41:32 +02:00
Anatol Belski
040194d6a0 fixed the test for ICI >= 52.1 2014-04-07 17:40:56 +02:00
Bob Weinand
d58a7500a7 Merge branch 'PHP-5.6' 2014-04-07 17:16:48 +02:00
Bob Weinand
0e273217cf Fix Linux specific fail in error traces 
Linux apparently does not like memcpy in overlapping regions...
 2014-04-07 17:14:38 +02:00
Ferenc Kovacs
a6e56586c6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing skip to the output, so we actually skip this test
 2014-04-07 16:59:27 +02:00
Ferenc Kovacs
7446766dab add missing skip to the output, so we actually skip this test 2014-04-07 16:57:52 +02:00
Stanislav Malyshev
2000c8ed46 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix the test according to how new date code does it
  fix to work on different ICU versions
 2014-04-05 20:13:48 -07:00
Stanislav Malyshev
63e7b84593 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix the test according to how new date code does it
  fix to work on different ICU versions
 2014-04-05 20:13:24 -07:00
Stanislav Malyshev
ee1b807219 fix the test according to how new date code does it 2014-04-05 20:09:53 -07:00
Stanislav Malyshev
8b0d133b13 fix to work on different ICU versions 2014-04-05 19:30:55 -07:00
Stanislav Malyshev
ca31c8f4fe Merge branch 'PHP-5.6' 
* PHP-5.6:
  multibytes tests still fail, put them in XFAIL
 2014-04-05 18:35:18 -07:00
Stanislav Malyshev
cf910f351a multibytes tests still fail, put them in XFAIL 
clean up XFAIL from tests no longer failing
 2014-04-05 18:34:39 -07:00
Anatol Belski
d7f5f608ac Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #66084 simplexml_load_string() mangles empty node name
 2014-04-05 09:50:13 +02:00
Anatol Belski
12e222ee91 updated NEWS 2014-04-05 09:49:51 +02:00
Anatol Belski
a094f6d255 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #66084 simplexml_load_string() mangles empty node name
 2014-04-05 09:48:54 +02:00
Anatol Belski
a3d6f28312 updated NEWS 2014-04-05 09:48:20 +02:00
Anatol Belski
bbfda90d72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66084 simplexml_load_string() mangles empty node name
 2014-04-05 09:47:14 +02:00