granicus.if.org Git

Use nicer output for characters < 32 and > 126 in exception strings
Using question marks might confuse more than it helps.
Users are wondering what happened to their string...

commit | commitdiff | tree

Xinchen Hui [Thu, 20 Feb 2014 03:20:01 +0000 (11:20 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Xinchen Hui [Thu, 20 Feb 2014 03:19:52 +0000 (11:19 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 20 Feb 2014 01:44:18 +0000 (10:44 +0900)]

Update pgsql document

commit | commitdiff | tree

Anatol Belski [Thu, 20 Feb 2014 01:08:07 +0000 (02:08 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
some missing pieces for __debugInfo

commit | commitdiff | tree

Anatol Belski [Thu, 20 Feb 2014 01:07:34 +0000 (02:07 +0100)]

some missing pieces for __debugInfo

commit | commitdiff | tree

Brad Daily [Wed, 19 Feb 2014 21:24:15 +0000 (15:24 -0600)]

Fixes #66714: imageconvolution breakage in 5.5.9

5.5.9 included some GD fixes related to #66356. One of those fixes changed the
above section of imageconvolution, but the variable was mistyped.

commit | commitdiff | tree

Daniel Lowrey [Wed, 19 Feb 2014 11:19:30 +0000 (04:19 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Add tests for Bug #65538
Fix Bug #65538 (cafile now supports stream wrappers)

commit | commitdiff | tree

Daniel Lowrey [Wed, 19 Feb 2014 11:17:33 +0000 (04:17 -0700)]

Merge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6

* 'bug-65538' of https://github.com/rdlowrey/php-src:
Add tests for Bug #65538
Fix Bug #65538 (cafile now supports stream wrappers)

commit | commitdiff | tree

Daniel Lowrey [Wed, 19 Feb 2014 11:03:16 +0000 (04:03 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Skip failing tests when EC unavailable (RHEL)

commit | commitdiff | tree

Daniel Lowrey [Wed, 19 Feb 2014 11:01:57 +0000 (04:01 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Skip failing tests when EC unavailable (RHEL)

commit | commitdiff | tree

Daniel Lowrey [Wed, 19 Feb 2014 11:01:08 +0000 (04:01 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Skip failing tests when EC unavailable (RHEL)

Conflicts:
ext/openssl/openssl.c

commit | commitdiff | tree

Daniel Lowrey [Wed, 19 Feb 2014 10:57:37 +0000 (03:57 -0700)]

Skip failing tests when EC unavailable (RHEL)

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 10:29:15 +0000 (11:29 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 10:28:55 +0000 (11:28 +0100)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 10:20:53 +0000 (11:20 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 10:20:24 +0000 (11:20 +0100)]

updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 10:02:19 +0000 (11:02 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
remove PHP_API_VERSION < 20100412 check

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 10:01:42 +0000 (11:01 +0100)]

remove PHP_API_VERSION < 20100412 check

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 09:49:15 +0000 (10:49 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
expose correct libmagic version

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 09:48:52 +0000 (10:48 +0100)]

expose correct libmagic version

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 09:05:01 +0000 (10:05 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fixed tests in ext/fileinfo

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 09:04:29 +0000 (10:04 +0100)]

fixed tests in ext/fileinfo

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 09:03:19 +0000 (10:03 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated to libmagic-5.17

commit | commitdiff | tree

Anatol Belski [Wed, 19 Feb 2014 09:02:36 +0000 (10:02 +0100)]

updated to libmagic-5.17

commit | commitdiff | tree

Anatol Belski [Tue, 18 Feb 2014 18:09:20 +0000 (19:09 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Tue, 18 Feb 2014 18:09:04 +0000 (19:09 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Tue, 18 Feb 2014 18:08:45 +0000 (19:08 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Tue, 18 Feb 2014 18:08:16 +0000 (19:08 +0100)]

updated libmagic.patch

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 16:49:15 +0000 (08:49 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  update news with CVE
  5.5.11-dev next
  5.5.11 next for NEWS

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 16:48:52 +0000 (08:48 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news with CVE
  5.5.11-dev next
  5.5.11 next for NEWS

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 16:47:43 +0000 (08:47 -0800)]

MErge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
update news with CVE

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 16:36:51 +0000 (08:36 -0800)]

update news with CVE

commit | commitdiff | tree

Julien Pauli [Tue, 18 Feb 2014 15:45:48 +0000 (16:45 +0100)]

5.5.11-dev next

commit | commitdiff | tree

Julien Pauli [Tue, 18 Feb 2014 15:40:19 +0000 (16:40 +0100)]

5.5.11 next for NEWS

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:58:48 +0000 (13:58 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
  NEWS
  NEWS
  Fixed Bug #66731 file: infinite recursion

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:58:36 +0000 (13:58 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
  NEWS
  NEWS
  Fixed Bug #66731 file: infinite recursion

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:57:53 +0000 (13:57 +0100)]

Set fileinfo version to 1.0.5 (as in php 5.4, no diff)

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:57:28 +0000 (13:57 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:57:10 +0000 (13:57 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #66731 file: infinite recursion

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:56:58 +0000 (13:56 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:54:33 +0000 (13:54 +0100)]

Fixed Bug #66731 file: infinite recursion

Upstream commit (available in file-5.17)

https://github.com/glensc/file/commit/3c081560c23f20b2985c285338b52c7aae9fdb0f
https://github.com/glensc/file/commit/cc9e74dfeca5265ad725acc926ef0b8d2a18ee70

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 05:22:56 +0000 (21:22 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
5.4.27 now
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 05:22:24 +0000 (21:22 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
5.4.27 now
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 05:22:03 +0000 (21:22 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.27 now
update NEWS

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 05:19:25 +0000 (21:19 -0800)]

5.4.27 now

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 05:16:48 +0000 (21:16 -0800)]

update NEWS

commit | commitdiff | tree

Sara Golemon [Tue, 18 Feb 2014 03:37:55 +0000 (19:37 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Add __debugInfo() magic method

commit | commitdiff | tree

Sara Golemon [Tue, 18 Feb 2014 03:13:00 +0000 (19:13 -0800)]

Add __debugInfo() magic method

class Foo {
  private $val = 'Random, meaningless data';

  public function count() { return 42; }

  public function __debugInfo() {
    return ['count' => $this->count()];
  }
}

$f = new Foo;
var_dump($f);

commit | commitdiff | tree

Daniel Lowrey [Tue, 18 Feb 2014 00:39:43 +0000 (19:39 -0500)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed broken build when EC unavailable

commit | commitdiff | tree

Daniel Lowrey [Tue, 18 Feb 2014 00:38:49 +0000 (19:38 -0500)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed broken build when EC unavailable

commit | commitdiff | tree

Daniel Lowrey [Tue, 18 Feb 2014 00:38:30 +0000 (19:38 -0500)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed broken build when EC unavailable

commit | commitdiff | tree

Daniel Lowrey [Mon, 17 Feb 2014 23:55:39 +0000 (18:55 -0500)]

Fixed broken build when EC unavailable

commit | commitdiff | tree

Andrey Hristov [Mon, 17 Feb 2014 17:04:14 +0000 (19:04 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Andrey Hristov [Mon, 17 Feb 2014 17:04:01 +0000 (19:04 +0200)]

remove dead code

commit | commitdiff | tree

Andrey Hristov [Mon, 17 Feb 2014 16:37:59 +0000 (18:37 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Andrey Hristov [Mon, 17 Feb 2014 16:37:08 +0000 (18:37 +0200)]

Move code out, that handles the actual structure to be used for the decoded
data. Will make it easier to add different structures

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 10:16:48 +0000 (11:16 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Updated NEWS for #65753
Export JsonSerializable Interface (bug #65753)

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 10:16:32 +0000 (11:16 +0100)]

Updated NEWS for #65753

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 10:13:54 +0000 (11:13 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS for #65753
  Updated NEWS for #65753
  Export JsonSerializable Interface (bug #65753)

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 10:13:38 +0000 (11:13 +0100)]

Updated NEWS for #65753

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 10:09:31 +0000 (11:09 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Updated NEWS for #65753

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 10:05:34 +0000 (11:05 +0100)]

Updated NEWS for #65753

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 09:25:40 +0000 (10:25 +0100)]

Export JsonSerializable Interface (bug #65753)

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 09:25:40 +0000 (10:25 +0100)]

Export JsonSerializable Interface (bug #65753)

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 09:36:13 +0000 (10:36 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Export JsonSerializable Interface (bug #65753)

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 09:25:40 +0000 (10:25 +0100)]

Export JsonSerializable Interface (bug #65753)

commit | commitdiff | tree

Anatol Belski [Mon, 17 Feb 2014 09:21:59 +0000 (10:21 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
simplify the metadata part

commit | commitdiff | tree

Anatol Belski [Mon, 17 Feb 2014 09:20:36 +0000 (10:20 +0100)]

simplify the metadata part

commit | commitdiff | tree

Scott MacVicar [Mon, 17 Feb 2014 06:51:20 +0000 (22:51 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  imagettftext() uses the last charactermap it found and not the one you want
  [libxml] Unit test for libxml_disable_entity_loader()
  Add pgsql related change information to NEWS and UPGRADING

commit | commitdiff | tree

Scott MacVicar [Mon, 17 Feb 2014 05:53:19 +0000 (21:53 -0800)]

imagettftext() uses the last charactermap it found and not the one you want

Summary:
This caused issues when you picked a font with multiple maps, it wouldn't
pick the unicode version but instead pick the last one it saw. Change so
we cache on a per encoding level. There was even a todo list item in the code.

In an ideal world we can probably iterate through at font write time.

Test Plan:
See said unit test, it's Apache Licensed font included

commit | commitdiff | tree

Scott MacVicar [Sun, 5 Jan 2014 10:11:05 +0000 (02:11 -0800)]

[libxml] Unit test for libxml_disable_entity_loader()

Summary:
Test to make sure libxml_disable_entity_loader() is behaving.

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 17 Feb 2014 00:59:58 +0000 (09:59 +0900)]

Add pgsql related change information to NEWS and UPGRADING

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 16 Feb 2014 21:38:36 +0000 (06:38 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Imprement FR #25854 Return value for pg_insert should be resource instead of bool

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 16 Feb 2014 21:36:54 +0000 (06:36 +0900)]

Imprement FR #25854 Return value for pg_insert should be resource instead of bool

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 16 Feb 2014 21:35:15 +0000 (06:35 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Implement FR #41146 - Add "description" with exteneded flag pg_meta_data(). pg_meta_data(resource $conn, string $table [, bool extended]) It also made pg_meta_data() return "is enum" always.

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 16 Feb 2014 21:19:47 +0000 (06:19 +0900)]

Implement FR #41146 - Add "description" with exteneded flag pg_meta_data().
pg_meta_data(resource $conn, string $table [, bool extended])
It also made pg_meta_data() return "is enum" always.

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 16 Feb 2014 21:19:47 +0000 (06:19 +0900)]

Implement FR #41146 - Add "description" with exteneded flag pg_meta_data().
pg_meta_data(resource $conn, string $table [, bool extended])
It also made pg_meta_data() return "is enum" always.

commit | commitdiff | tree

Daniel Lowrey [Sun, 16 Feb 2014 15:38:39 +0000 (08:38 -0700)]

Add tests for Bug #65538

commit | commitdiff | tree

Anatol Belski [Sun, 16 Feb 2014 16:15:40 +0000 (17:15 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated pgsql/config.w32

commit | commitdiff | tree

Anatol Belski [Sun, 16 Feb 2014 16:13:56 +0000 (17:13 +0100)]

updated pgsql/config.w32

keep track with the latest changes for postgles 9.3 compatibility

commit | commitdiff | tree

Daniel Lowrey [Sat, 15 Feb 2014 21:31:40 +0000 (14:31 -0700)]

Fix Bug #65538 (cafile now supports stream wrappers)