mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-14 06:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
79,385 Commits 505 Branches 1,389 Tags 786 MiB
38ec4d20bf
Commit Graph

79385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
38ec4d20bf Merge branch 'PHP-5.6' 2014-04-11 18:24:41 +02:00
Bob Weinand
ee2a7c7d41 Fixed disallowal of array usage in constants at run-time 
Added at the same time the possibility of array dereferencing
to complete the set of features (useful application of arrays in constants)
 2014-04-11 18:21:46 +02:00
Bob Weinand
53e71e47b9 Merge branch 'PHP-5.6' 2014-04-11 16:21:15 +02:00
Bob Weinand
ad05d3898e Updated zend_vm_execute.h 2014-04-11 16:18:42 +02:00
Anatol Belski
f0c95cb705 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix syntax error in vc++
 2014-04-11 13:28:13 +02:00
Anatol Belski
5c87ed058b fix syntax error in vc++ 2014-04-11 13:08:46 +02:00
Anatol Belski
3af4be482c Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
 2014-04-11 11:02:02 +02:00
Anatol Belski
4c32c8d549 updated NEWS 2014-04-11 11:01:42 +02:00
Anatol Belski
c5181ef6c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
 2014-04-11 11:01:01 +02:00
Anatol Belski
e08172e0d5 Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3 2014-04-11 11:00:10 +02:00
Bob Weinand
9663193bbc Merge branch 'PHP-5.6' 2014-04-11 10:11:58 +02:00
Bob Weinand
f7ac308950 Updated NEWS 2014-04-11 10:10:36 +02:00
Bob Weinand
f614fc6898 Fix bug #66015 by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
Andrey Hristov
6828437c11 Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	ext/mysqlnd/mysqlnd_result.c
 2014-04-10 18:22:01 +03:00
Andrey Hristov
d3f390a268 Here comes the news 2014-04-10 18:15:42 +03:00
Andrey Hristov
e02fdcf3f7 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-04-10 18:13:58 +03:00
Andrey Hristov
af5fa00c97 Fix the fix 2014-04-10 18:13:44 +03:00
Popa Adrian Marius
c2ce0df01b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Cleanup $ is not needed for git
 2014-04-10 17:43:45 +03:00
Popa Adrian Marius
4048872317 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Cleanup $ is not needed for git
 2014-04-10 17:43:29 +03:00
Popa Adrian Marius
1a0b80fe90 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Cleanup $ is not needed for git
 2014-04-10 17:43:09 +03:00
Popa Adrian Marius
1c3ed86211 Cleanup $ is not needed for git 2014-04-10 17:42:32 +03:00
Andrey Hristov
090c3e87c0 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
Conflicts:
	ext/mysqli/tests/mysqli_begin_transaction.phpt
 2014-04-10 16:49:13 +03:00
Andrey Hristov
63791d055a New result fetching mode for mysqlnd, which should use less memory but 
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
 2014-04-10 16:44:54 +03:00
Ferenc Kovacs
7b3e369740 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix typo
  fix typo
  fix typo
 2014-04-10 07:07:50 +02:00
Ferenc Kovacs
3204ad5858 fix typo 2014-04-10 07:07:11 +02:00
Ferenc Kovacs
5cc93aa9a6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix typo
  fix typo
 2014-04-10 07:06:53 +02:00
Ferenc Kovacs
b78d1b901c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo
 2014-04-10 07:06:14 +02:00
Ferenc Kovacs
49d46ad29e fix typo 2014-04-10 07:05:55 +02:00
Ferenc Kovacs
9540ced221 fix typo 2014-04-10 07:05:07 +02:00
Ferenc Kovacs
edbaa1fa5e Merge branch 'PHP-5.6' 
* PHP-5.6:
  add a NEWS block for beta2
  add missing entries to NEWS
 2014-04-10 06:23:23 +02:00
Ferenc Kovacs
08faf19d09 add a NEWS block for beta2 2014-04-10 06:22:43 +02:00
Ferenc Kovacs
ec6a0966bc add missing entries to NEWS 2014-04-10 06:21:31 +02:00
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