1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Commit Graph

82805 Commits

Author SHA1 Message Date
Dmitry Stogov
f3106998b0 Improved error message 2014-08-18 21:47:30 +04:00
Dmitry Stogov
0f5bad93fd Fixed bug #67856 (Leak when using array_reduce with by-ref function) 2014-08-18 21:08:50 +04:00
Ferenc Kovacs
29a8701389 Merge branch 'PHP-5.6'
* PHP-5.6:
  improve the grammar for my recent UPGRADING note
2014-08-18 18:48:06 +02:00
Ferenc Kovacs
d07f49118a improve the grammar for my recent UPGRADING note 2014-08-18 18:47:07 +02:00
Nikita Popov
26a9dc3e04 Fix bug #67858: Leak when $php_errormsg already set 2014-08-18 18:14:19 +02:00
Ferenc Kovacs
eda5d30be9 Merge branch 'PHP-5.6'
* PHP-5.6:
  mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING see the discussion on the mailing list and in the pull request for details: https://github.com/php/php-src/pull/733
2014-08-18 17:04:17 +02:00
Ferenc Kovacs
003c2c1005 mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING
see the discussion on the mailing list and in the pull request for details:
https://github.com/php/php-src/pull/733
2014-08-18 16:59:03 +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
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
Tjerk Meesters
87afa6bdc9 Fixes missing Reflector interface constraints being enforced by the engine 2014-08-16 17:34:56 +08: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
Keyur Govande
48dc203408 Fix another failing test 2014-08-15 23:26:21 +00:00
Keyur Govande
7c4b5d9187 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Conflicts:
	ext/mysqli/tests/table.inc
2014-08-15 23:13:36 +00:00
Keyur Govande
0407bdf252 Add NEWS 2014-08-15 23:08:29 +00:00
Keyur Govande
7bfe9bf951 Merge branch 'pull-request/772' into PHP-5.4
* pull-request/772:
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
2014-08-15 23:06:55 +00:00
Dmitry Stogov
b1c2e14954 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed version checking
  Fixed version check
2014-08-15 16:13:00 +04:00
Xinchen Hui
bde56debe5 Better version checking 2014-08-15 18:41:01 +08:00
Xinchen Hui
7af24dcb47 Better version checking 2014-08-15 18:39:45 +08:00
Xinchen Hui
617b1759c4 Better version checking 2014-08-15 18:38:31 +08:00
Xinchen Hui
0583b3bd6a Fixed version checking 2014-08-15 18:28:41 +08:00
Xinchen Hui
7ace092abf Fixed version check 2014-08-15 18:21:23 +08:00
Dmitry Stogov
f281e0cf53 Fixed PHP6 unicode related tests 2014-08-15 13:35:52 +04:00
Dmitry Stogov
29893a88e7 Fixed PHP6 unicode related tests 2014-08-15 13:22:13 +04:00
Dmitry Stogov
e3de409eac Fixed PHP6 unicode related tests 2014-08-15 13:08:53 +04:00
Xinchen Hui
d1b48a8b02 Merge branch 'master' of https://git.php.net/repository/php-src
Conflicts:
	ext/mysqli/mysqli_api.c
2014-08-15 16:58:22 +08:00
Xinchen Hui
101c055396 Add copyright header 2014-08-15 16:47:54 +08:00
Xinchen Hui
e2522b4f1d Remove old version PHP supports 2014-08-15 16:40:07 +08:00
Xinchen Hui
89b8c7b3ee Fixed build after version number bumped 2014-08-15 16:39:51 +08:00
Dmitry Stogov
b01b971ec0 Parameters with duplicate names are not allowed anymore in PHP7. 2014-08-15 11:46:04 +04:00
Dmitry Stogov
3bd32efb3e Behavoir of func_get_arg() and func_get_args() was changed in PHP7.
Now they show current values of variables corresponded to passed arguments instead of originally passed values.
2014-08-15 11:39:50 +04:00
Dmitry Stogov
0d57a7bf34 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Update Version Number :)
  Fixed initializing
  Unused variable

Conflicts:
	main/php_version.h
2014-08-15 11:13:42 +04:00
Dmitry Stogov
d9f3eac12f Bump version to 7.0.0-dev 2014-08-15 11:10:41 +04:00