Commit Graph

78755 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
7446766dab add missing skip to the output, so we actually skip this test 2014-04-07 16:57:52 +02: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
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
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
Anatol Belski
a0beddf5e9 Fixed bug #66084 simplexml_load_string() mangles empty node name 2014-04-05 09:46:24 +02:00
Stanislav Malyshev
38e084d312 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  cleanup NEWS
2014-04-03 15:57:08 -07:00
Stanislav Malyshev
c1f273908e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  cleanup NEWS
2014-04-03 15:56:46 -07:00
Stanislav Malyshev
7e5de3a1ce cleanup NEWS 2014-04-03 15:54:00 -07:00
Michael Wallner
b628c36a85 NEWS 2014-04-03 10:41:45 +02:00
Michael Wallner
55005c8638 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix Bug #66736 	fpassthru broken
2014-04-03 10:41:24 +02:00
Michael Wallner
60ef357ffc NEWS 2014-04-03 10:40:42 +02:00
Michael Wallner
bbd25ca01f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix Bug #66736 	fpassthru broken
2014-04-03 10:40:20 +02:00
Michael Wallner
d08b4dbf23 Fix Bug #66736 fpassthru broken 2014-04-03 10:40:06 +02:00
Michael Wallner
1c2bcec68a NEWS 2014-04-03 09:09:51 +02:00
Michael Wallner
5d42ce838c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix bug #66182 	exit in stream filter produces segfault
2014-04-03 09:09:24 +02:00
Michael Wallner
f17fe2cabc NEWS 2014-04-03 09:09:15 +02:00
Michael Wallner
ba4fddd2da Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #66182 	exit in stream filter produces segfault
2014-04-03 09:08:35 +02:00
Michael Wallner
7ab5c593f7 Fix bug #66182 exit in stream filter produces segfault
Unfortunately, a segv caused by exit cannot be tested reliably.
2014-04-03 09:07:35 +02:00
Michael Wallner
06e6d42ee3 NEWS 2014-04-02 15:39:07 +02:00
Michael Wallner
68c57f8149 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:38:35 +02:00
Michael Wallner
9eb0c634d4 NEWS 2014-04-02 15:38:22 +02:00
Michael Wallner
f453917f62 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:37:50 +02:00
Michael Wallner
1ec83d44a1 Fixed bug #61019 (Out of memory on command stream_get_contents) 2014-04-02 15:36:39 +02:00
Michael Wallner
c4a3f67708 NEWS 2014-04-02 11:14:34 +02:00
Michael Wallner
80d58ca8cd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
2014-04-02 11:13:42 +02:00