granicus.if.org Git

]> granicus.if.org Git - php/log

Stanislav Malyshev [Sun, 1 Feb 2015 08:08:46 +0000 (00:08 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #64938: libxml_disable_entity_loader setting is shared between threads

commit | commitdiff | tree

Martin Jansen [Thu, 22 Jan 2015 19:58:15 +0000 (20:58 +0100)]

Fix bug #64938: libxml_disable_entity_loader setting is shared between threads

The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to also have
the loader disabled.

With this change the loader is explicitely enabled in the request init
phase.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 07:47:25 +0000 (23:47 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix group name handling

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 07:47:03 +0000 (23:47 -0800)]

fix group name handling

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 07:34:44 +0000 (23:34 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix TSRM

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 07:34:27 +0000 (23:34 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix TSRM

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 07:34:14 +0000 (23:34 -0800)]

fix TSRM

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 07:19:44 +0000 (23:19 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 07:19:23 +0000 (23:19 -0800)]

add NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 07:17:24 +0000 (23:17 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Added test and possible fix for https://bugs.php.net/bug.php?id=67068

commit | commitdiff | tree

Danack [Tue, 13 Jan 2015 01:24:19 +0000 (01:24 +0000)]

Added test and possible fix for https://bugs.php.net/bug.php?id=67068

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 05:48:40 +0000 (21:48 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 05:47:22 +0000 (21:47 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 05:46:56 +0000 (21:46 -0800)]

Use better constant since MAXHOSTNAMELEN may mean shorter name

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 05:30:58 +0000 (21:30 -0800)]

use right sizeof for memset

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 03:12:00 +0000 (19:12 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925)
Add mitigation for CVE-2015-0235 (bug #68925)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 02:59:18 +0000 (18:59 -0800)]

Add mitigation for CVE-2015-0235 (bug #68925)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 03:08:37 +0000 (19:08 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 1 Feb 2015 02:59:18 +0000 (18:59 -0800)]

Add mitigation for CVE-2015-0235 (bug #68925)

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 31 Jan 2015 20:14:56 +0000 (05:14 +0900)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed typo in comment

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 31 Jan 2015 20:14:27 +0000 (05:14 +0900)]

Fixed typo in comment

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 29 Jan 2015 06:27:08 +0000 (15:27 +0900)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Use bash rather than sh

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 29 Jan 2015 06:21:17 +0000 (15:21 +0900)]

Use bash rather than sh

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 29 Jan 2015 00:26:55 +0000 (09:26 +0900)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed Bug #68941 mod_files.sh is a bash-script

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 29 Jan 2015 00:23:10 +0000 (09:23 +0900)]

Fixed Bug #68941 mod_files.sh is a bash-script

commit | commitdiff | tree

Xinchen Hui [Wed, 28 Jan 2015 16:01:13 +0000 (00:01 +0800)]

Update News

commit | commitdiff | tree

Xinchen Hui [Wed, 28 Jan 2015 16:01:00 +0000 (00:01 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Wed, 28 Jan 2015 16:00:09 +0000 (00:00 +0800)]

Fixed bug #68901 (use after free)

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Jan 2015 14:25:45 +0000 (22:25 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Jan 2015 14:25:38 +0000 (22:25 +0800)]

fcgi_write in fpm returns ssizt_t, but it returns int in cgi

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Jan 2015 14:20:03 +0000 (22:20 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Jan 2015 14:19:11 +0000 (22:19 +0800)]

Revert previous unintentional change to this

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Jan 2015 14:13:30 +0000 (22:13 +0800)]

Update NEWs

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Jan 2015 14:13:04 +0000 (22:13 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Jan 2015 14:11:23 +0000 (22:11 +0800)]

Also Fixed #68571 in CGI SAPI, and some cleanup

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Jan 2015 14:04:23 +0000 (22:04 +0800)]

Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Mon, 26 Jan 2015 21:51:37 +0000 (22:51 +0100)]

Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

Conflicts:
NEWS

commit | commitdiff | tree

Bob Weinand [Mon, 26 Jan 2015 21:50:16 +0000 (22:50 +0100)]

Add NEWS entry

commit | commitdiff | tree

Bob Weinand [Mon, 26 Jan 2015 21:47:35 +0000 (22:47 +0100)]

Fix call after close if multiple filters are attached

commit | commitdiff | tree

Keyur Govande [Mon, 26 Jan 2015 21:32:32 +0000 (21:32 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add NEWS
  Patch commit d9f85373e32 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

commit | commitdiff | tree

Keyur Govande [Mon, 26 Jan 2015 21:29:57 +0000 (21:29 +0000)]

Add NEWS

commit | commitdiff | tree

Keyur Govande [Wed, 7 Jan 2015 21:13:57 +0000 (21:13 +0000)]

Patch commit d9f85373e32 by moving the float_to_double function to
a header file.

commit | commitdiff | tree

Keyur Govande [Tue, 6 Jan 2015 06:33:38 +0000 (06:33 +0000)]

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()

commit | commitdiff | tree

Keyur Govande [Wed, 7 Jan 2015 21:13:57 +0000 (21:13 +0000)]

Patch commit d9f85373e32 by moving the float_to_double function to
a header file.

commit | commitdiff | tree

Keyur Govande [Tue, 6 Jan 2015 06:33:38 +0000 (06:33 +0000)]

commit | commitdiff | tree

Ferenc Kovacs [Thu, 22 Jan 2015 20:28:41 +0000 (21:28 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix some factual errors in the process

commit | commitdiff | tree

Ferenc Kovacs [Thu, 22 Jan 2015 20:28:21 +0000 (21:28 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix some factual errors in the process

commit | commitdiff | tree

Ferenc Kovacs [Thu, 22 Jan 2015 20:27:38 +0000 (21:27 +0100)]

fix some factual errors in the process

commit | commitdiff | tree

Remi Collet [Thu, 22 Jan 2015 12:06:50 +0000 (13:06 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
move CVE to the right version

commit | commitdiff | tree

Remi Collet [Thu, 22 Jan 2015 12:06:15 +0000 (13:06 +0100)]

move CVE to the right version

commit | commitdiff | tree

Anatol Belski [Thu, 22 Jan 2015 11:26:50 +0000 (12:26 +0100)]

Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs

The fix for bug #67647 applies here, too.

commit | commitdiff | tree

Anatol Belski [Thu, 22 Jan 2015 10:48:11 +0000 (11:48 +0100)]

Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly

commit | commitdiff | tree

Anatol Belski [Thu, 22 Jan 2015 09:17:14 +0000 (10:17 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
simplify error handling for dirs as magic

commit | commitdiff | tree

Anatol Belski [Thu, 22 Jan 2015 09:16:13 +0000 (10:16 +0100)]

simplify error handling for dirs as magic

commit | commitdiff | tree

Anatol Belski [Thu, 22 Jan 2015 09:04:33 +0000 (10:04 +0100)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

commit | commitdiff | tree

Anatol Belski [Thu, 22 Jan 2015 09:01:16 +0000 (10:01 +0100)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)]

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

commit | commitdiff | tree

Joshua Rogers [Thu, 22 Jan 2015 08:59:13 +0000 (09:59 +0100)]

Fixed bug #68827 Double free with disabled ZMM

commit | commitdiff | tree

Xinchen Hui [Thu, 22 Jan 2015 08:39:03 +0000 (16:39 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Thu, 22 Jan 2015 08:38:34 +0000 (16:38 +0800)]

Fixed segfault while running with moodle

commit | commitdiff | tree

Rasmus Lerdorf [Wed, 21 Jan 2015 19:39:23 +0000 (11:39 -0800)]

Slightly modify and merge PR#105 from @MegaManSec

commit | commitdiff | tree

Anatol Belski [Wed, 21 Jan 2015 15:22:23 +0000 (16:22 +0100)]

fix timelib build configuration

commit | commitdiff | tree

Anatol Belski [Wed, 21 Jan 2015 12:48:38 +0000 (13:48 +0100)]

make timelib_config.h inclusion configurable

commit | commitdiff | tree

Julien Pauli [Wed, 21 Jan 2015 10:13:55 +0000 (11:13 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Updated NEWS

commit | commitdiff | tree

Julien Pauli [Wed, 21 Jan 2015 10:10:20 +0000 (11:10 +0100)]

Updated NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 21 Jan 2015 10:03:16 +0000 (11:03 +0100)]

backported the timelib cleanups to 5.6

commit | commitdiff | tree

Xinchen Hui [Wed, 21 Jan 2015 03:18:08 +0000 (11:18 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Wed, 21 Jan 2015 03:17:49 +0000 (11:17 +0800)]

Fixed test fails

commit | commitdiff | tree

Ferenc Kovacs [Wed, 21 Jan 2015 00:19:31 +0000 (01:19 +0100)]

fix NEWS

commit | commitdiff | tree

Derick Rethans [Tue, 20 Jan 2015 21:44:25 +0000 (21:44 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 20 Jan 2015 21:44:19 +0000 (21:44 +0000)]

Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 21:27:51 +0000 (13:27 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix year

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 21:27:38 +0000 (13:27 -0800)]

fix year

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 19:58:04 +0000 (11:58 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  format
  add CVE

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 19:57:50 +0000 (11:57 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
format

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 19:57:39 +0000 (11:57 -0800)]

update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 19:57:17 +0000 (11:57 -0800)]

format

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 19:55:04 +0000 (11:55 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add CVE

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 19:54:45 +0000 (11:54 -0800)]

add CVE

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 19:47:06 +0000 (11:47 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add protection against nulls

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 19:46:39 +0000 (11:46 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add protection against nulls

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 19:46:10 +0000 (11:46 -0800)]

add protection against nulls

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)]

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

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 18:40:11 +0000 (10:40 -0800)]

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

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 18:38:33 +0000 (10:38 -0800)]

5.4.38 next

commit | commitdiff | tree

Julien Pauli [Tue, 20 Jan 2015 14:09:59 +0000 (15:09 +0100)]

Updated NEWS

commit | commitdiff | tree

Julien Pauli [Tue, 20 Jan 2015 14:09:34 +0000 (15:09 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Updated NEWS
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.

commit | commitdiff | tree

Julien Pauli [Tue, 20 Jan 2015 14:09:13 +0000 (15:09 +0100)]

Updated NEWS