granicus.if.org Git - php/log

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

projects / php / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 08:34:09 +0000 (01:34 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 08:33:45 +0000 (01:33 -0700)]

Merge tag 'PHP-5.4.32' into PHP-5.4

5.4.32

* tag 'PHP-5.4.32':
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 07:40:27 +0000 (00:40 -0700)]

5.4.32

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:40:58 +0000 (08:40 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:40:30 +0000 (08:40 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:40:18 +0000 (08:40 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:33:49 +0000 (08:33 +0200)]

Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597

Incomplete fix for CVE-2014-4049

Check possible buffer overflow
- pass real buffer end to dn_expand calls
- check buffer len before each read

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 06:04:24 +0000 (23:04 -0700)]

fix potentially missing NUL termination

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 05:49:10 +0000 (22:49 -0700)]

Fix bug #67730 - Null byte injection possible with imagexxx functions

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 05:37:25 +0000 (22:37 -0700)]

Fixed bug #67717 - segfault in dns_get_record

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 19:27:33 +0000 (20:27 +0100)]

Merge branch 'datetimebugs' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 17:46:56 +0000 (18:46 +0100)]

BFN.

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 17:31:26 +0000 (18:31 +0100)]

Fixed bug #67109: First uppercase letter breaks date string parsing.

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 17:22:14 +0000 (18:22 +0100)]

Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10.

commit | commitdiff | tree

Lior Kaplan [Sun, 17 Aug 2014 18:33:41 +0000 (21:33 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Correct typo in comments: 'initialized'

commit | commitdiff | tree

Lior Kaplan [Sun, 17 Aug 2014 18:32:53 +0000 (21:32 +0300)]

Correct typo in comments: 'initialized'

commit | commitdiff | tree

Lior Kaplan [Sun, 17 Aug 2014 12:48:22 +0000 (15:48 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
typofixes

commit | commitdiff | tree

Veres Lajos [Tue, 12 Aug 2014 21:00:23 +0000 (22:00 +0100)]

typofixes

commit | commitdiff | tree

Keyur Govande [Fri, 15 Aug 2014 23:38:14 +0000 (23:38 +0000)]

Update NEWS

commit | commitdiff | tree

Keyur Govande [Fri, 15 Aug 2014 23:26:21 +0000 (23:26 +0000)]

Fix another failing test

commit | commitdiff | tree

Keyur Govande [Fri, 15 Aug 2014 23:13:36 +0000 (23:13 +0000)]

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

commit | commitdiff | tree

Keyur Govande [Fri, 15 Aug 2014 23:08:29 +0000 (23:08 +0000)]

Add NEWS

commit | commitdiff | tree

Keyur Govande [Fri, 15 Aug 2014 23:06:55 +0000 (23:06 +0000)]

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.

commit | commitdiff | tree

Remi Collet [Fri, 15 Aug 2014 00:19:03 +0000 (17:19 -0700)]

Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

Stanislav Malyshev [Fri, 15 Aug 2014 00:21:37 +0000 (17:21 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

Stanislav Malyshev [Fri, 15 Aug 2014 00:19:51 +0000 (17:19 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

Remi Collet [Fri, 15 Aug 2014 00:19:03 +0000 (17:19 -0700)]

Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

Remi Collet [Fri, 15 Aug 2014 00:19:03 +0000 (17:19 -0700)]

Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

Stanislav Malyshev [Fri, 15 Aug 2014 00:07:45 +0000 (17:07 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Fri, 15 Aug 2014 00:07:28 +0000 (17:07 -0700)]

fix test

commit | commitdiff | tree

Stanislav Malyshev [Fri, 15 Aug 2014 00:05:03 +0000 (17:05 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
split the glob() test to test different basedir

commit | commitdiff | tree

Anatol Belski [Tue, 20 Aug 2013 11:39:30 +0000 (13:39 +0200)]

split the glob() test to test different basedir

commit | commitdiff | tree

Stanislav Malyshev [Thu, 14 Aug 2014 23:59:14 +0000 (16:59 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()

commit | commitdiff | tree

Anatol Belski [Mon, 19 Aug 2013 12:21:16 +0000 (14:21 +0200)]

fixed glob() edge case on windows, ref bug #47358

commit | commitdiff | tree

Pierre Joye [Tue, 8 Jan 2013 14:02:04 +0000 (15:02 +0100)]

- fix bug #47358, glob returns error, should be empty array()

Conflicts:
ext/standard/dir.c

commit | commitdiff | tree

Keyur Govande [Thu, 14 Aug 2014 18:20:26 +0000 (18:20 +0000)]

Fix failing tests

commit | commitdiff | tree

Keyur Govande [Thu, 14 Aug 2014 18:19:56 +0000 (18:19 +0000)]

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.

commit | commitdiff | tree

Johannes Schlüter [Thu, 14 Aug 2014 15:22:25 +0000 (17:22 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Thu, 14 Aug 2014 15:13:44 +0000 (17:13 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Thu, 14 Aug 2014 15:08:02 +0000 (17:08 +0200)]

Update Git rules

commit | commitdiff | tree

Johannes Schlüter [Thu, 14 Aug 2014 15:05:20 +0000 (17:05 +0200)]

Back to -dev (with EOL notice in NEWS)

commit | commitdiff | tree

Johannes Schlüter [Wed, 13 Aug 2014 19:22:50 +0000 (21:22 +0200)]

It's 2014 already, fix copyright year where user visible

Left out all file headers

commit | commitdiff | tree

Johannes Schlüter [Wed, 13 Aug 2014 16:36:10 +0000 (18:36 +0200)]

PHP 5.3.29

commit | commitdiff | tree

Tjerk Meesters [Wed, 13 Aug 2014 12:57:10 +0000 (20:57 +0800)]

Some changes were lost in the merge commit of #66091

commit | commitdiff | tree

Tjerk Meesters [Wed, 13 Aug 2014 12:16:22 +0000 (20:16 +0800)]

Updated NEWS for #66091

commit | commitdiff | tree

Tjerk Meesters [Wed, 13 Aug 2014 12:12:42 +0000 (20:12 +0800)]

Fixed #66091

commit | commitdiff | tree

Tjerk Meesters [Wed, 13 Aug 2014 12:12:42 +0000 (20:12 +0800)]

Fixed #66091

commit | commitdiff | tree

Anatol Belski [Tue, 12 Aug 2014 09:51:42 +0000 (11:51 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 12 Aug 2014 09:50:55 +0000 (11:50 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated NEWS
backported the fix for bug #41577

commit | commitdiff | tree

Anatol Belski [Tue, 12 Aug 2014 09:50:26 +0000 (11:50 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 12 Aug 2014 09:49:46 +0000 (11:49 +0200)]

backported the fix for bug #41577

commit | commitdiff | tree

Ferenc Kovacs [Tue, 12 Aug 2014 08:37:44 +0000 (10:37 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it

commit | commitdiff | tree

Ferenc Kovacs [Tue, 12 Aug 2014 08:34:54 +0000 (10:34 +0200)]

fix the failing date tests introduced with the latest timezonedb update
Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it

commit | commitdiff | tree

Xinchen Hui [Mon, 11 Aug 2014 09:46:56 +0000 (17:46 +0800)]

Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)

commit | commitdiff | tree

Xinchen Hui [Mon, 11 Aug 2014 09:44:42 +0000 (17:44 +0800)]

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

commit | commitdiff | tree

Anatol Belski [Thu, 7 Aug 2014 17:50:25 +0000 (19:50 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix TS build

commit | commitdiff | tree

Anatol Belski [Thu, 7 Aug 2014 17:49:59 +0000 (19:49 +0200)]

fix TS build

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 16:39:42 +0000 (12:39 -0400)]

Update NEWS

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 16:38:04 +0000 (12:38 -0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 16:37:50 +0000 (12:37 -0400)]

Update NEWS

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 15:51:42 +0000 (11:51 -0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Bug #41631: Observe socket read timeouts in SSL streams

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 15:47:42 +0000 (11:47 -0400)]

Bug #41631: Observe socket read timeouts in SSL streams

commit | commitdiff | tree

Anatol Belski [Thu, 7 Aug 2014 13:21:42 +0000 (15:21 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
wrap int8_t and int16_t with #ifdef to avoid possible clashes

commit | commitdiff | tree

Anatol Belski [Thu, 7 Aug 2014 13:20:17 +0000 (15:20 +0200)]

wrap int8_t and int16_t with #ifdef to avoid possible clashes

commit | commitdiff | tree

Derick Rethans [Thu, 7 Aug 2014 09:22:10 +0000 (10:22 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Thu, 7 Aug 2014 09:22:09 +0000 (10:22 +0100)]

- Updated to version 2014.6 (2014f)

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 14:02:17 +0000 (17:02 +0300)]

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

Conflicts:
NEWS
configure.in
main/php_version.h

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 12:28:06 +0000 (15:28 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 12:27:56 +0000 (15:27 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
configure.in
main/php_version.h

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 12:27:29 +0000 (15:27 +0300)]

Add EXPECTF

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 11:52:55 +0000 (14:52 +0300)]

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

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 11:52:12 +0000 (14:52 +0300)]

Fix handling of multi-result sets with PS...used to clean not only
the result set but the whole PS.

commit | commitdiff | tree

Julien Pauli [Wed, 6 Aug 2014 08:20:31 +0000 (10:20 +0200)]

5.5.17 now

commit | commitdiff | tree

Stanislav Malyshev [Wed, 6 Aug 2014 04:26:11 +0000 (21:26 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.33-dev now

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 6 Aug 2014 04:24:55 +0000 (21:24 -0700)]

5.4.33-dev now

commit | commitdiff | tree

Stanislav Malyshev [Wed, 6 Aug 2014 04:03:35 +0000 (21:03 -0700)]

5.4.32 RC1

commit | commitdiff | tree

Michael Wallner [Tue, 5 Aug 2014 13:47:52 +0000 (15:47 +0200)]

BFN

commit | commitdiff | tree

Michael Wallner [Tue, 5 Aug 2014 13:46:52 +0000 (15:46 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #67724

commit | commitdiff | tree

Michael Wallner [Tue, 5 Aug 2014 13:44:43 +0000 (15:44 +0200)]

Fixed Bug #67724

(chained zlib filters silently fail with large amounts of data)

Use the same buffer size zlib uses internally to avoid
Z_DATA_ERROR on massively compressed data

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 09:08:54 +0000 (11:08 +0200)]

typo

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 09:08:41 +0000 (11:08 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
typo

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 09:08:30 +0000 (11:08 +0200)]

typo

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:48:29 +0000 (10:48 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:47:54 +0000 (10:47 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:46:53 +0000 (10:46 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:42:39 +0000 (10:42 +0200)]

Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

Upstream https://bitbucket.org/libgd/gd-libgd/commits/463c3bd09bfe8e924e19acad7a2a6af16953a704

Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image

commit | commitdiff | tree

Anatol Belski [Mon, 4 Aug 2014 07:57:59 +0000 (09:57 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
backport the fix for bug #67739

commit | commitdiff | tree

Anatol Belski [Mon, 4 Aug 2014 07:57:08 +0000 (09:57 +0200)]

backport the fix for bug #67739

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:08:17 +0000 (00:08 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add test

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:08:08 +0000 (00:08 -0700)]

add test

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:05:56 +0000 (00:05 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67705 (extensive backtracking in rule regular expression)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:01:57 +0000 (00:01 -0700)]

Fix bug #67705 (extensive backtracking in rule regular expression)

commit | commitdiff | tree

Andrey Hristov [Thu, 31 Jul 2014 18:27:51 +0000 (21:27 +0300)]

Fix wrong lenght size

commit | commitdiff | tree

Johannes Schlüter [Thu, 31 Jul 2014 13:40:51 +0000 (15:40 +0200)]

PHP 5.3.29RC1

commit | commitdiff | tree

Stanislav Malyshev [Sun, 27 Jul 2014 09:40:27 +0000 (02:40 -0700)]

Fix missing type checks in various functions

commit | commitdiff | tree

Peter Cowburn [Thu, 31 Jul 2014 13:33:55 +0000 (14:33 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Bug #51096 - Remove unnecessary ? for first/last day of

Conflicts:
ext/date/lib/parse_date.c

commit | commitdiff | tree

Peter Cowburn [Thu, 31 Jul 2014 13:30:39 +0000 (14:30 +0100)]

Merge branch 'pull-request/754' into PHP-5.4

commit | commitdiff | tree

Peter Cowburn [Thu, 31 Jul 2014 13:21:38 +0000 (14:21 +0100)]

Bug #51096 - Remove unnecessary ? for first/last day of

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 18:39:59 +0000 (18:39 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 18:36:09 +0000 (18:36 +0000)]

Update NEWS

Unnamed repository; edit this file 'description' to name the repository.