Commit Graph

83756 Commits

Author SHA1 Message Date
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Anatol Belski
1e8273964f more fixes to ext/standard 2014-08-18 20:57:21 +02:00
Anatol Belski
dc40a5c450 refix the dump stuff again 2014-08-18 20:57:00 +02:00
Anatol Belski
a5ffd245bd fixed splfixedarray 2014-08-18 19:55:05 +02:00
Anatol Belski
e49e163a9e fixes to date 2014-08-18 18:57:55 +02:00
Anatol Belski
b8324e6d63 further fixes to ext/standard 2014-08-18 16:50:54 +02:00
Anatol Belski
97e9d058f0 fixes to string functions 2014-08-18 15:39:38 +02:00
Anatol Belski
22dbb38d5e fix typo 2014-08-18 10:37:38 +02:00
Anatol Belski
59ec8329f4 renamed _z_param_long 2014-08-18 10:35:46 +02:00
Anatol Belski
483a800c98 Merge remote-tracking branch '64bit_ng/master'
Conflicts:
	Zend/zend_API.h
2014-08-18 10:34:29 +02:00
Anatol Belski
c586133d07 rename zval_get_long and fixes to some string functions 2014-08-18 08:39:39 +02:00
Dmitry Stogov
35189d2dd6 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Change to ext/reflection should be in its own category
2014-08-18 10:09:25 +04:00
Dmitry Stogov
f3dc4421ff Fixed parameter parsing 2014-08-18 10:08:48 +04:00
Tjerk Meesters
61e81c714d Change to ext/reflection should be in its own category 2014-08-18 13:07:34 +08:00
Dmitry Stogov
8b3c2cc47e Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Updated NEWS for d790ec
  Correct typo in comments: 'initialized'
  typofixes
  typofixes
  Fixes missing Reflector interface constraints being enforced by the engine
  Fixed version id
  Update NEWS
  Update NEWS
  Fix another failing test
  Add NEWS
  Better version checking
  Better version checking
  Better version checking
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
2014-08-18 09:05:16 +04:00
Tjerk Meesters
3e79907b0a Updated NEWS for d790ec 2014-08-18 06:54:50 +08:00
Anatol Belski
6ed220cbf3 fixed strspn 2014-08-17 22:56:26 +02:00
Anatol Belski
a3b0cafc01 more fixes to var_dump and co. 2014-08-17 22:34:18 +02:00
Anatol Belski
77eb6e7278 Merge branch 'master' of git.php.net:php-src
# By Veres Lajos (2) and Lior Kaplan (1)
# Via Lior Kaplan
* 'master' of git.php.net:php-src:
  Correct typo in comments: 'initialized'
  typofixes
  typofixes
2014-08-17 21:40:39 +02:00
Anatol Belski
f2182ab845 some more pure naming replacements 2014-08-17 21:16:27 +02:00
Anatol Belski
41115d3d9d regenerated parser files 2014-08-17 21:05:20 +02:00
Anatol Belski
025a7c304e fix THIS_HASHVAL 2014-08-17 21:04:52 +02:00
Lior Kaplan
741605da73 Merge branch 'PHP-5.6'
* PHP-5.6:
  Correct typo in comments: 'initialized'

Conflicts:
	ext/dom/php_dom.c
	ext/spl/php_spl.c
2014-08-17 21:37:22 +03:00
Lior Kaplan
f1d0e50ea8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Correct typo in comments: 'initialized'
2014-08-17 21:34:03 +03:00
Lior Kaplan
fac08a960b Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Correct typo in comments: 'initialized'
2014-08-17 21:33:41 +03:00
Lior Kaplan
1504f7d630 Correct typo in comments: 'initialized' 2014-08-17 21:32:53 +03:00
Veres Lajos
1e3452992f typofixes 2014-08-17 16:00:39 +03:00
Lior Kaplan
543d5eb495 Merge branch 'PHP-5.6'
* PHP-5.6:
  typofixes

Conflicts:
	ext/spl/php_spl.c
2014-08-17 15:53:33 +03:00
Lior Kaplan
56d02d564e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  typofixes
2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  typofixes
2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Anatol Belski
90d6f60bc1 mostly fixes to spl, but also some other 2014-08-17 13:31:39 +02:00
Anatol Belski
977cf1dc11 Merge branch 'master' of git.php.net:php-src
# By Tjerk Meesters
# Via Tjerk Meesters
* 'master' of git.php.net:php-src:
  Fixes missing Reflector interface constraints being enforced by the engine
2014-08-17 12:04:05 +02:00
Anatol Belski
864172d9a4 further fixes to ext/standard and zend 2014-08-16 17:31:40 +02:00
Anatol Belski
54906c760f increase the stack size for cli and cgi 2014-08-16 16:45:05 +02:00
Anatol Belski
5bb25776a0 further fixes on core 2014-08-16 15:34:04 +02:00
Anatol Belski
7534bf125a fix set_time_limit, substr and some more 2014-08-16 14:46:31 +02:00
Anatol Belski
1169de3e61 fix some cases with fast zpp 2014-08-16 14:00:02 +02:00
Anatol Belski
b7e7a89541 several fixes -
- param parsing Z_PARAM_STR vs Z_PARAM_STRING
- some functions for new params
- etc
2014-08-16 12:55:13 +02:00
Anatol Belski
cb25136f4e fix macros in the 5 basic extensions 2014-08-16 11:37:14 +02:00
Tjerk Meesters
87afa6bdc9 Fixes missing Reflector interface constraints being enforced by the engine 2014-08-16 17:34:56 +08:00
Anatol Belski
f790043e30 Merge branch 'master' of git.php.net:php-src
# By Keyur Govande (6) and Xinchen Hui (4)
# Via Keyur Govande (5) and Xinchen Hui (2)
* 'master' of git.php.net:php-src:
  Fixed version id
  Update NEWS
  Update NEWS
  Fix another failing test
  Add NEWS
  Better version checking
  Better version checking
  Better version checking
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
2014-08-16 11:16:56 +02:00
Anatol Belski
8ee2a4a9b5 first shot on merging the core fro the int64 branch 2014-08-16 11:16:11 +02:00
Xinchen Hui
d790eceb01 Fixed version id 2014-08-16 16:44:02 +08:00
Xinchen Hui
c8250fa3e3 Merge branch 'master' of https://git.php.net/repository/php-src 2014-08-16 16:43:57 +08:00
Keyur Govande
bbd107f7b3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Update NEWS
2014-08-15 23:49:17 +00:00
Keyur Govande
c6d9bf2946 Update NEWS 2014-08-15 23:49:07 +00:00
Keyur Govande
603e3ddfc0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Update NEWS
  Fix another failing test
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
2014-08-15 23:47:31 +00:00
Keyur Govande
032dee4982 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update NEWS
  Fix another failing test
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Conflicts:
	ext/mysqli/tests/mysqli_change_user.phpt
2014-08-15 23:47:06 +00:00
Keyur Govande
6279246d2c Update NEWS 2014-08-15 23:38:14 +00:00