granicus.if.org Git

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

Daniel Lowrey [Mon, 25 Aug 2014 16:16:38 +0000 (18:16 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
ext/openssl/xp_ssl.c

commit | commitdiff | tree

Daniel Lowrey [Mon, 25 Aug 2014 15:28:09 +0000 (17:28 +0200)]

Bug #67850: Build when OpenSSL compiled without SSLv3 support

commit | commitdiff | tree

Lior Kaplan [Sun, 24 Aug 2014 21:30:40 +0000 (00:30 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>

commit | commitdiff | tree

Lior Kaplan [Sun, 24 Aug 2014 21:30:01 +0000 (00:30 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>

commit | commitdiff | tree

Lior Kaplan [Sun, 24 Aug 2014 21:29:05 +0000 (00:29 +0300)]

Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>

commit | commitdiff | tree

Ferenc Kovacs [Sat, 23 Aug 2014 22:09:31 +0000 (00:09 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
this test depends on the simplexml ext, not just on xml

commit | commitdiff | tree

Ferenc Kovacs [Sat, 23 Aug 2014 22:09:00 +0000 (00:09 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
this test depends on the simplexml ext, not just on xml

commit | commitdiff | tree

Ferenc Kovacs [Sat, 23 Aug 2014 22:08:09 +0000 (00:08 +0200)]

this test depends on the simplexml ext, not just on xml

commit | commitdiff | tree

Tjerk Meesters [Sat, 23 Aug 2014 01:18:02 +0000 (09:18 +0800)]

Fixed #67694: Regression in session_regenerate_id()

commit | commitdiff | tree

Michael Wallner [Thu, 21 Aug 2014 20:44:34 +0000 (22:44 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages

commit | commitdiff | tree

Michael Wallner [Thu, 21 Aug 2014 20:42:14 +0000 (22:42 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix bug #67865

commit | commitdiff | tree

Michael Wallner [Thu, 21 Aug 2014 20:41:36 +0000 (22:41 +0200)]

fix bug #67865

commit | commitdiff | tree

Julien Pauli [Thu, 21 Aug 2014 09:34:38 +0000 (11:34 +0200)]

updated NEWS to fit last release

commit | commitdiff | tree

Remi Collet [Thu, 21 Aug 2014 07:12:16 +0000 (09:12 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Thu, 21 Aug 2014 07:09:21 +0000 (09:09 +0200)]

Fix bug #67878 program_prefix not honoured in man pages

- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment

commit | commitdiff | tree

Remi Collet [Thu, 21 Aug 2014 07:11:18 +0000 (09:11 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Thu, 21 Aug 2014 07:09:21 +0000 (09:09 +0200)]

Fix bug #67878 program_prefix not honoured in man pages

- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment

commit | commitdiff | tree

Anatol Belski [Thu, 21 Aug 2014 07:09:29 +0000 (09:09 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
avoid clash when stdint.h was included after win32/php_stdint.h

commit | commitdiff | tree

Anatol Belski [Thu, 21 Aug 2014 07:08:44 +0000 (09:08 +0200)]

avoid clash when stdint.h was included after win32/php_stdint.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:44:33 +0000 (14:44 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:42:48 +0000 (14:42 -0700)]

fix test

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:43:22 +0000 (14:43 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:42:48 +0000 (14:42 -0700)]

fix test

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:17:20 +0000 (15:17 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:17:05 +0000 (15:17 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:16:53 +0000 (15:16 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:10:54 +0000 (15:10 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixed variable corruption under win x64

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:10:02 +0000 (15:10 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed variable corruption under win x64

commit | commitdiff | tree

Anatol Belski [Sat, 11 May 2013 00:47:48 +0000 (02:47 +0200)]

fixed variable corruption under win x64

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:34:57 +0000 (01:34 +0300)]

Add NEWS entry for bug #67730

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:18:15 +0000 (01:18 +0300)]

Add CVE ID for bug #67539

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:16:04 +0000 (01:16 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add NEWS entry for bug #67492
  Add NEWS entry for bug #67730
  Add NEWS entry for bug #67730
  Add CVE ID for bug #67539

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:10:38 +0000 (01:10 +0300)]

Add NEWS entry for bug #67492

Included in 5.5.14 with commit d9c5a1d

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:05:22 +0000 (01:05 +0300)]

Add NEWS entry for bug #67730

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:01:23 +0000 (01:01 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 21:54:19 +0000 (00:54 +0300)]

Add NEWS entry for bug #67730

Included in 5.4.32 with commit 706aefb

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 21:51:37 +0000 (00:51 +0300)]

Add CVE ID for bug #67539

commit | commitdiff | tree

Sara Golemon [Tue, 19 Aug 2014 20:22:14 +0000 (13:22 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Switch use of strtok() to gd_strtok_r()

commit | commitdiff | tree

Sara Golemon [Tue, 19 Aug 2014 20:17:56 +0000 (13:17 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Switch use of strtok() to gd_strtok_r()

Conflicts:
NEWS

commit | commitdiff | tree

Sara Golemon [Tue, 19 Aug 2014 19:46:53 +0000 (12:46 -0700)]

Switch use of strtok() to gd_strtok_r()

strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.

I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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: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:41:42 +0000 (08:41 +0200)]

NEWS

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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:44 +0000 (20:27 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

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

Ferenc Kovacs [Mon, 18 Aug 2014 16:47:07 +0000 (18:47 +0200)]

improve the grammar for my recent UPGRADING note

commit | commitdiff | tree

Ferenc Kovacs [Mon, 18 Aug 2014 14:59:03 +0000 (16:59 +0200)]

mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING
see the discussion on the mailing list and in the pull request for details:
https://github.com/php/php-src/pull/733

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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:51:15 +0000 (15:51 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
typofixes

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:49:07 +0000 (23:49 +0000)]

Update NEWS

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update NEWS
  Fix another failing test
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Conflicts:
ext/mysqli/tests/mysqli_change_user.phpt

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

Stanislav Malyshev [Fri, 15 Aug 2014 01:16:33 +0000 (18:16 -0700)]

add NEWS for 5.6 too

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:22:06 +0000 (17:22 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #67716 - Segfault in cdf.c
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:08:37 +0000 (17:08 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test

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:12 +0000 (17:05 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  split the glob() test to test different basedir
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()

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:25:22 +0000 (17:25 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

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