clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,232 Commits 493 Branches 1,366 Tags 848 MiB
d51fb69c01
Commit Graph

87232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guilherme Blanco
d51fb69c01 Removed parsing support traits to have extends and implements. 2015-01-09 15:45:02 +01:00
Guilherme Blanco
f48c232740 Decoupled class declaration statement into more granular pieces. 2015-01-09 15:45:01 +01:00
Francois Laupretre
63346f4c4b Fix README.PARAMETER_PARSING_API 2015-01-09 14:52:23 +01:00
krakjoe
b99dd1e895 Merge branch 'master' of git://git.php.net/php-src 2015-01-09 07:48:29 +00:00
krakjoe
159c331844 optimization for bug report #68679 2015-01-09 07:45:21 +00:00
Xinchen Hui
7142dd76ff Update NEWs 2015-01-09 11:54:41 +08:00
Xinchen Hui
aa5b3b0e4a Merge branch 'PHP-5.6' 2015-01-09 11:54:01 +08:00
Xinchen Hui
0547edb5c2 Fixed bug (try block removed while combined with xdebug) 2015-01-09 11:53:47 +08:00
Dmitry Stogov
7b4808a647 Fixed bug #68636 (setlocale no longer returns current value per category). 2015-01-09 01:41:13 +03:00
Adam Harvey
ed8ebd6ce4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Calling crypt() with a salt of *0 should always return *1.

Conflicts:
	configure.in
	main/php_version.h
 2015-01-08 19:17:53 +00:00
Adam Harvey
16b6f6c7f4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Calling crypt() with a salt of *0 should always return *1.
  5.5.22 now

Conflicts:
	configure.in
	main/php_version.h
 2015-01-08 19:16:32 +00:00
Adam Harvey
8b0f105761 Calling crypt() with a salt of *0 should always return *1. 2015-01-08 19:13:23 +00:00
Anatol Belski
e383f05e2f Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
 2015-01-08 18:11:46 +01:00
Anatol Belski
2e79820c0e fix test 2015-01-08 18:11:15 +01:00
Xinchen Hui
777c39f404 Fixed #68677 2015-01-08 16:32:20 +08:00
Xinchen Hui
7ebdc8d70d Fixed #68692 2015-01-08 16:29:33 +08:00
Xinchen Hui
f3ea1b0b6a Fixed #68694 2015-01-08 16:28:32 +08:00
Xinchen Hui
d7fd940691 Fixed #68704 2015-01-08 16:26:20 +08:00
Xinchen Hui
1b4f7c3a77 Fixed #68711 2015-01-08 16:20:20 +08:00
Xinchen Hui
e3012d0f6c Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-08 16:09:41 +08:00
Xinchen Hui
124fb22a13 Fixed bug #68739 #68740 #68741 2015-01-08 16:09:02 +08:00
Keyur Govande
961da40809 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add NEWS
  Add NEWS
  Patch commit d9f85373e3 by moving the float_to_double function to a header file.
  Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
  5.5.22 now

Conflicts:
	ext/mysqli/mysqli_api.c
 2015-01-07 23:23:26 +00:00
Keyur Govande
39f8960b17 Add NEWS 2015-01-07 22:52:27 +00:00
Keyur Govande
90144c0d08 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add NEWS
  Patch commit d9f85373e3 by moving the float_to_double function to a header file.
  Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
  5.5.22 now

Conflicts:
	configure.in
	main/php_version.h
 2015-01-07 22:50:55 +00:00
Keyur Govande
9bbd55ddc7 Add NEWS 2015-01-07 22:45:23 +00:00
Keyur Govande
3062cf1b42 Patch commit d9f85373e3 by moving the float_to_double function to 
a header file.
 2015-01-07 22:45:23 +00:00
Keyur Govande
f2eadb93b9 Fix for bugs #68114 (Build fails on OS X due to undefined symbols) 
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).

The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
 2015-01-07 22:45:23 +00:00
Nikita Popov
3e826c9736 Fix the same leak with %= 2015-01-07 23:21:12 +01:00
Nikita Popov
98c2ceacf8 Fix leak for compound shift self-assign error cases 2015-01-07 23:13:45 +01:00
Julien Pauli
3f1d1892c9 5.5.22 now 2015-01-07 10:42:53 +01:00
Ferenc Kovacs
8c9415e5d7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  PHP-5.6.6 is next

Conflicts:
	configure.in
	main/php_version.h
 2015-01-06 23:00:11 +01:00
Ferenc Kovacs
b0a26ab8f8 PHP-5.6.6 is next 2015-01-06 22:58:22 +01:00
Remi Collet
1b5e87862f Merge branch 'PHP-5.6' 
* PHP-5.6:
  cleanup old unused typedef
 2015-01-06 11:07:10 +01:00
Remi Collet
0ba32e5cf9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  cleanup old unused typedef
 2015-01-06 11:06:53 +01:00
Remi Collet
8404f8ac2a cleanup old unused typedef 2015-01-06 11:06:25 +01:00
Adam Harvey
a607a1db1d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Handle NULL strings in sapi_cli_server_register_variable().
  Allow CLI server test scripts to specify the name of the router file.

Conflicts:
	sapi/cli/php_cli_server.c
 2015-01-06 01:29:40 +00:00
Adam Harvey
27ff425b78 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Handle NULL strings in sapi_cli_server_register_variable().
  Allow CLI server test scripts to specify the name of the router file.

Conflicts:
	sapi/cli/tests/php_cli_server.inc
 2015-01-06 01:27:37 +00:00
Adam Harvey
448ef30f75 Handle NULL strings in sapi_cli_server_register_variable(). 
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
 2015-01-06 01:23:27 +00:00
Adam Harvey
0cc2810498 Allow CLI server test scripts to specify the name of the router file. 
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
 2015-01-06 01:22:59 +00:00
Levi Morrison
bb7ceb046e Fix bug #55416 
Remove extra, unnecessary warning when the callback fails for
array_map, array_reduce and array_filter
 2015-01-05 17:27:25 -07:00
Anatol Belski
a26ecbd572 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix ACLs tests, make it create dir where it has to, not file
 2015-01-05 19:20:33 +01:00
Anatol Belski
4756207e7e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix ACLs tests, make it create dir where it has to, not file
 2015-01-05 19:20:07 +01:00
Anatol Belski
339139f876 fix ACLs tests, make it create dir where it has to, not file 2015-01-05 19:19:24 +01:00
Anatol Belski
923394c509 fix ACLs setup for tests 2015-01-05 19:14:44 +01:00
Remi Collet
e7cdf9df7c Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #68751 listen.allowed_clients is broken
 2015-01-05 17:36:26 +01:00
Remi Collet
480044a0ea NEWS 2015-01-05 17:35:36 +01:00
Remi Collet
eb1a1d5feb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug #68751 listen.allowed_clients is broken
 2015-01-05 17:35:14 +01:00
Remi Collet
4bb580adb1 NEWS 2015-01-05 17:34:45 +01:00
Remi Collet
1b6d076244 Fix bug #68751 listen.allowed_clients is broken 2015-01-05 17:33:57 +01:00
Nikita Popov
1266515e19 Fix uses of zval_add_ref and add comment on usage 
zval_add_ref should be used as a copy ctor, after the value was
already copied.

In particular when used with hash insertions, it should be applied
to the return value of the insert function.
 2015-01-05 17:02:11 +01:00