mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
81,340 Commits 500 Branches 1,381 Tags 797 MiB
666cb333f7
Commit Graph

81340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
666cb333f7 Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
 2015-01-26 22:51:37 +01:00
Bob Weinand
3f57663b57 Add NEWS entry 2015-01-26 22:50:16 +01:00
Bob Weinand
b8461eb9ac Fix call after close if multiple filters are attached 2015-01-26 22:47:35 +01:00
Keyur Govande
168877bc78 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).

Conflicts:
	ext/mysqlnd/config9.m4
 2015-01-26 21:32:32 +00:00
Keyur Govande
d065a2fc1b Add NEWS 2015-01-26 21:29:57 +00:00
Keyur Govande
4c6918ec17 Patch commit d9f85373e3 by moving the float_to_double function to 
a header file.
 2015-01-26 21:20:29 +00:00
Keyur Govande
b34f8ef599 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-26 21:20:29 +00:00
Keyur Govande
1933b556b9 Patch commit d9f85373e3 by moving the float_to_double function to 
a header file.
 2015-01-26 21:19:00 +00:00
Keyur Govande
e51980f4e6 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-26 21:19:00 +00:00
Ferenc Kovacs
49cc1d4e84 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix some factual errors in the process
 2015-01-22 21:28:41 +01:00
Ferenc Kovacs
f014785eeb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix some factual errors in the process
 2015-01-22 21:28:21 +01:00
Ferenc Kovacs
61ad5e24ea fix some factual errors in the process 2015-01-22 21:27:38 +01:00
Remi Collet
b318e54fac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  move CVE to the right version
 2015-01-22 13:06:50 +01:00
Remi Collet
2955993947 move CVE to the right version 2015-01-22 13:06:15 +01:00
Anatol Belski
093a23d1c4 Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs 
The fix for bug #67647 applies here, too.
 2015-01-22 12:26:50 +01:00
Anatol Belski
c9d0894ec5 Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly 2015-01-22 11:48:11 +01:00
Anatol Belski
60c2621b2a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  simplify error handling for dirs as magic
 2015-01-22 10:17:14 +01:00
Anatol Belski
43652d386a simplify error handling for dirs as magic 2015-01-22 10:16:13 +01:00
Anatol Belski
a2e83332b9 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2015-01-22 10:04:33 +01:00
Anatol Belski
a97ca0a452 updated NEWS 2015-01-22 10:01:16 +01:00
Anatol Belski
d0e75bdc59 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68827 Double free with disabled ZMM
  Fixed segfault while running with moodle
 2015-01-22 10:00:10 +01:00
Joshua Rogers
91aa340180 Fixed bug #68827 Double free with disabled ZMM 2015-01-22 09:59:13 +01:00
Xinchen Hui
d0928b7f97 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-22 16:39:03 +08:00
Xinchen Hui
251745c012 Fixed segfault while running with moodle 2015-01-22 16:38:34 +08:00
Rasmus Lerdorf
e242f871df Slightly modify and merge PR#105 from @MegaManSec 2015-01-21 11:40:27 -08:00
Anatol Belski
24157f396c fix timelib build configuration 2015-01-21 16:22:23 +01:00
Anatol Belski
bd52f4a833 make timelib_config.h inclusion configurable 2015-01-21 13:48:38 +01:00
Julien Pauli
bb2380edb7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-01-21 11:13:55 +01:00
Julien Pauli
88f2321a25 Updated NEWS 2015-01-21 11:10:20 +01:00
Anatol Belski
9c88a214a4 backported the timelib cleanups to 5.6 2015-01-21 11:03:16 +01:00
Xinchen Hui
57ff5a4e6f Merge branch 'PHP-5.5' into PHP-5.6 2015-01-21 11:18:08 +08:00
Xinchen Hui
20e5911d82 Fixed test fails 2015-01-21 11:17:49 +08:00
Ferenc Kovacs
ea44ccbd62 fix NEWS 2015-01-21 01:19:31 +01:00
Derick Rethans
1d09926e33 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-20 21:44:25 +00:00
Derick Rethans
8e19705a93 Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat) 2015-01-20 21:44:19 +00:00
Stanislav Malyshev
73a5958e67 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix year
 2015-01-20 13:27:51 -08:00
Stanislav Malyshev
cca3c8a985 fix year 2015-01-20 13:27:38 -08:00
Stanislav Malyshev
b2a254fe2d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  format
  add CVE
 2015-01-20 11:59:35 -08:00
Stanislav Malyshev
53b3db43ca Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  format
 2015-01-20 11:57:50 -08:00
Stanislav Malyshev
04dcc705de update NEWS 2015-01-20 11:57:39 -08:00
Stanislav Malyshev
b3b155ffe2 format 2015-01-20 11:57:17 -08:00
Stanislav Malyshev
295b42b76e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add CVE
 2015-01-20 11:55:04 -08:00
Stanislav Malyshev
547f62ed2a add CVE 2015-01-20 11:54:45 -08:00
Stanislav Malyshev
c9162147f2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add protection against nulls
 2015-01-20 11:47:06 -08:00
Stanislav Malyshev
a3cb69d63e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add protection against nulls
 2015-01-20 11:46:39 -08:00
Stanislav Malyshev
ef4896d956 add protection against nulls 2015-01-20 11:46:10 -08:00
Stanislav Malyshev
e18ec95687 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	ext/standard/var_unserializer.c
 2015-01-20 10:40:39 -08:00
Stanislav Malyshev
e2744c51b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	configure.in
	main/php_version.h
 2015-01-20 10:40:11 -08:00
Stanislav Malyshev
8825311ce1 5.4.38 next 2015-01-20 10:38:33 -08:00
Julien Pauli
b5e2661fb6 Updated NEWS 2015-01-20 15:09:59 +01:00