clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-04 08:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,112 Commits 494 Branches 1,367 Tags 816 MiB
6448916535
Commit Graph

79112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
krakjoe
0dc9be6f1e cleanup 2014-04-13 08:48:59 +01:00
krakjoe
8c23b038cd fix moar 2014-04-13 08:43:19 +01:00
krakjoe
4387723ef7 fix argc/argv 2014-04-13 08:34:16 +01:00
krakjoe
65984df220 merge master 2014-04-13 08:09:53 +01:00
krakjoe
ef86b57f3b Merge branch 'master' of https://github.com/krakjoe/phpdbg into lexer 
Conflicts:
	phpdbg_prompt.c
 2014-04-13 08:06:42 +01:00
krakjoe
2fde2ada50 fix addr parameters 2014-04-13 08:06:21 +01:00
Matteo Beccati
7fd9898a2d Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir 2014-04-13 08:53:21 +02:00
Ferenc Kovacs
aefc8f22b3 Fix bug #66568: the second arg for unserialize is optional. 2014-04-13 02:49:35 +02:00
Ferenc Kovacs
51cbb85ea9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix typo
 2014-04-13 01:57:15 +02:00
Ferenc Kovacs
2876bde634 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo
 2014-04-13 01:56:47 +02:00
Ferenc Kovacs
5a0da281e5 fix typo 2014-04-13 01:55:55 +02:00
Bob Weinand
3db29ee439 Added support for command line arg passing 
"phpdbg -- arg" in shell
"run arg" in phpdbg prompt
 2014-04-13 00:27:46 +02:00
Bob Weinand
53b1dce587 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-12 23:54:57 +02:00
Bob Weinand
9302be3754 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-12 23:54:29 +02:00
Bob Weinand
edd90e5ae3 Made usage of php_hash_environment useful by updating instead of just adding argc 2014-04-12 23:53:21 +02:00
Bob Weinand
86a7731763 Fixed frame number order 2014-04-12 22:08:02 +02:00
Bob Weinand
48bcaf2e72 Retain full compability for all micro versions since PHP 5.4 2014-04-12 18:00:33 +02:00
Bob Weinand
096e40a027 Fixed tests for recent constant array changes 2014-04-11 20:13:24 +02:00
Bob Weinand
99d1a1bb3f Shut up, my lovely compiler; I do not like your warnings 2014-04-11 19:33:56 +02:00
Bob Weinand
35b895fdf0 Removed useless void* parameter and replaced with zend_bool on zval_update_constant* functions 2014-04-11 19:18:58 +02:00
Bob Weinand
920c5508ef Updated NEWS 2014-04-11 18:30:14 +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
ad05d3898e Updated zend_vm_execute.h 2014-04-11 16:18:42 +02:00
Anatol Belski
5c87ed058b fix syntax error in vc++ 2014-04-11 13:08:46 +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
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
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
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
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
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
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
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
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