Commit Graph

87245 Commits

Author SHA1 Message Date
Bob Weinand
773c8b0c09 Fix missing ZVAL_DEREF() 2015-01-10 22:29:00 +01:00
Xinchen Hui
84f2311bc9 Fixed #68779 (Incorrect sizeof) 2015-01-10 10:58:22 -05:00
Rasmus Lerdorf
dbd02ad23b Fix bug #68784 2015-01-09 18:09:44 -08:00
Rasmus Lerdorf
50c721a623 These tests all assume that IPV6 is available. 2015-01-09 17:24:48 -08:00
Rasmus Lerdorf
16d779a833 Adding a note here for my future self so I won't
need to look into this again
2015-01-09 16:36:21 -08:00
Rasmus Lerdorf
deca940406 We can't output absolute S and T values for the
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
2015-01-09 16:27:09 -08:00
Nikita Popov
e9068cefb4 Make empty list() check stricter
Now also includes list()s with just commas in it.
2015-01-09 18:27:06 +01:00
Nikita Popov
41a249fef6 Fix bug #68775 2015-01-09 17:59:41 +01:00
Julien Pauli
32f761d7f8 Updated NEWS 2015-01-09 16:26:10 +01:00
Julien Pauli
fb069be475 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated NEWS
  Fix bug #68260
2015-01-09 16:25:14 +01:00
Julien Pauli
287217a3a3 Updated NEWS 2015-01-09 16:25:02 +01:00
Julien Pauli
138b6442d4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #68260
2015-01-09 16:24:32 +01:00
Julien Pauli
dc810543cf Fix bug #68260 2015-01-09 16:24:14 +01:00
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