]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Dmitry Stogov [Fri, 21 Feb 2014 08:06:46 +0000 (12:06 +0400)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated opcache version

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Fri, 21 Feb 2014 08:06:35 +0000 (12:06 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated opcache version

11 years agoUpdated opcache version
commit | commitdiff | tree
Dmitry Stogov [Fri, 21 Feb 2014 08:04:42 +0000 (12:04 +0400)]
Updated opcache version

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Dmitry Stogov [Fri, 21 Feb 2014 08:01:06 +0000 (12:01 +0400)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added function opcache_is_script_cached(). (Danack)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Fri, 21 Feb 2014 08:00:33 +0000 (12:00 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added function opcache_is_script_cached(). (Danack)

Conflicts:
NEWS

11 years agoAdded function opcache_is_script_cached(). (Danack)
commit | commitdiff | tree
Dmitry Stogov [Fri, 21 Feb 2014 07:59:14 +0000 (11:59 +0400)]
Added function opcache_is_script_cached(). (Danack)

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Fri, 21 Feb 2014 00:46:54 +0000 (17:46 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Improve OpenSSL compile flag compatibility, minor updates
  Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
  Improve server forward secrecy, refactor client SNI
  Add 'honor_cipher_order' server context option
  Add 'capture_session_meta' context option
  Disable TLS compression by default in both clients and servers
  Release ssl buffers
  Add openssl_get_cert_locations() function
  Explicitly set cert verify depth if not specified
  Strengthen default cipher list

11 years agoMerge branch 'improved-tls-defaults' of https://github.com/rdlowrey/php-src into...
commit | commitdiff | tree
Daniel Lowrey [Fri, 21 Feb 2014 00:35:44 +0000 (17:35 -0700)]
Merge branch 'improved-tls-defaults' of https://github.com/rdlowrey/php-src into PHP-5.6

* 'improved-tls-defaults' of https://github.com/rdlowrey/php-src:
  Improve OpenSSL compile flag compatibility, minor updates
  Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
  Improve server forward secrecy, refactor client SNI
  Add 'honor_cipher_order' server context option
  Add 'capture_session_meta' context option
  Disable TLS compression by default in both clients and servers
  Release ssl buffers
  Add openssl_get_cert_locations() function
  Explicitly set cert verify depth if not specified
  Strengthen default cipher list

11 years agoImprove OpenSSL compile flag compatibility, minor updates
commit | commitdiff | tree
Daniel Lowrey [Fri, 21 Feb 2014 00:20:40 +0000 (17:20 -0700)]
Improve OpenSSL compile flag compatibility, minor updates

11 years agoUse crypto method flags; add tlsv1.0 wrapper; add wrapper tests
commit | commitdiff | tree
Daniel Lowrey [Tue, 11 Feb 2014 15:12:01 +0000 (08:12 -0700)]
Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests

11 years agoImprove server forward secrecy, refactor client SNI
commit | commitdiff | tree
Daniel Lowrey [Tue, 11 Feb 2014 15:42:34 +0000 (08:42 -0700)]
Improve server forward secrecy, refactor client SNI

11 years agoAdd 'honor_cipher_order' server context option
commit | commitdiff | tree
Daniel Lowrey [Thu, 20 Feb 2014 03:39:57 +0000 (20:39 -0700)]
Add 'honor_cipher_order' server context option

11 years agoAdd 'capture_session_meta' context option
commit | commitdiff | tree
Daniel Lowrey [Tue, 11 Feb 2014 13:42:29 +0000 (06:42 -0700)]
Add 'capture_session_meta' context option

11 years agoDisable TLS compression by default in both clients and servers
commit | commitdiff | tree
Daniel Lowrey [Tue, 11 Feb 2014 13:27:32 +0000 (06:27 -0700)]
Disable TLS compression by default in both clients and servers

11 years agoRelease ssl buffers
commit | commitdiff | tree
Daniel Lowrey [Tue, 11 Feb 2014 13:24:34 +0000 (06:24 -0700)]
Release ssl buffers

11 years agoAdd openssl_get_cert_locations() function
commit | commitdiff | tree
Daniel Lowrey [Tue, 11 Feb 2014 12:57:15 +0000 (05:57 -0700)]
Add openssl_get_cert_locations() function

11 years agoExplicitly set cert verify depth if not specified
commit | commitdiff | tree
Daniel Lowrey [Tue, 11 Feb 2014 12:39:02 +0000 (05:39 -0700)]
Explicitly set cert verify depth if not specified

11 years agoStrengthen default cipher list
commit | commitdiff | tree
Daniel Lowrey [Tue, 11 Feb 2014 12:26:08 +0000 (05:26 -0700)]
Strengthen default cipher list

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 23:23:36 +0000 (00:23 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed path separator in the tests

11 years agofixed path separator in the tests
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 23:23:01 +0000 (00:23 +0100)]
fixed path separator in the tests

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Sara Golemon [Thu, 20 Feb 2014 20:10:40 +0000 (12:10 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add more tests for __debugInfo() and fix leak

11 years agoAdd more tests for __debugInfo() and fix leak
commit | commitdiff | tree
Sara Golemon [Thu, 20 Feb 2014 19:55:27 +0000 (11:55 -0800)]
Add more tests for __debugInfo() and fix leak

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 18:06:32 +0000 (19:06 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch for 5.6+

11 years agoupdated libmagic.patch for 5.6+
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 18:05:59 +0000 (19:05 +0100)]
updated libmagic.patch for 5.6+

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 18:01:45 +0000 (19:01 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch in 5.4/5

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 18:01:09 +0000 (19:01 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libmagic.patch in 5.4/5

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 18:00:36 +0000 (19:00 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch in 5.4/5

11 years agoupdated libmagic.patch in 5.4/5
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 18:00:05 +0000 (19:00 +0100)]
updated libmagic.patch in 5.4/5

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 17:55:21 +0000 (18:55 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed leak introduced after CVE/upgrade

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 17:55:05 +0000 (18:55 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed leak introduced after CVE/upgrade

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 17:54:35 +0000 (18:54 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed leak introduced after CVE/upgrade

11 years agofixed leak introduced after CVE/upgrade
commit | commitdiff | tree
Anatol Belski [Thu, 20 Feb 2014 17:53:53 +0000 (18:53 +0100)]
fixed leak introduced after CVE/upgrade

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Thu, 20 Feb 2014 16:50:14 +0000 (17:50 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Thu, 20 Feb 2014 16:49:45 +0000 (17:49 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Thu, 20 Feb 2014 16:48:38 +0000 (17:48 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoUse nicer output for characters < 32 and > 126 in exception strings
commit | commitdiff | tree
Bob Weinand [Thu, 20 Feb 2014 16:39:58 +0000 (17:39 +0100)]
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...

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Thu, 20 Feb 2014 03:20:01 +0000 (11:20 +0800)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into 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

11 years agoUpdate pgsql document
commit | commitdiff | tree
Yasuo Ohgaki [Thu, 20 Feb 2014 01:44:18 +0000 (10:44 +0900)]
Update pgsql document

11 years agoMerge branch 'PHP-5.6'
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

11 years agosome 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

11 years agoFixes #66714: imageconvolution breakage in 5.5.9
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.

11 years agoMerge branch 'PHP-5.6'
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)

11 years agoMerge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6
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)

11 years agoMerge branch 'PHP-5.6'
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)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoSkip failing tests when EC unavailable (RHEL)
commit | commitdiff | tree
Daniel Lowrey [Wed, 19 Feb 2014 10:57:37 +0000 (03:57 -0700)]
Skip failing tests when EC unavailable (RHEL)

11 years agoMerge branch 'PHP-5.6'
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

11 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Wed, 19 Feb 2014 10:28:55 +0000 (11:28 +0100)]
updated NEWS

11 years agoMerge branch 'PHP-5.6'
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

11 years agoupdated libmagic.patch
commit | commitdiff | tree
Anatol Belski [Wed, 19 Feb 2014 10:20:24 +0000 (11:20 +0100)]
updated libmagic.patch

11 years agoMerge branch 'PHP-5.6'
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

11 years agoremove 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

11 years agoMerge branch 'PHP-5.6'
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

11 years agoexpose correct libmagic version
commit | commitdiff | tree
Anatol Belski [Wed, 19 Feb 2014 09:48:52 +0000 (10:48 +0100)]
expose correct libmagic version

11 years agoMerge branch 'PHP-5.6'
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

11 years agofixed 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

11 years agoMerge branch 'PHP-5.6'
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

11 years agoupdated 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

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoupdated libmagic.patch
commit | commitdiff | tree
Anatol Belski [Tue, 18 Feb 2014 18:08:16 +0000 (19:08 +0100)]
updated libmagic.patch

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMErge branch 'PHP-5.4' into PHP-5.5
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

11 years agoupdate news with CVE
commit | commitdiff | tree
Stanislav Malyshev [Tue, 18 Feb 2014 16:36:51 +0000 (08:36 -0800)]
update news with CVE

11 years ago5.5.11-dev next
commit | commitdiff | tree
Julien Pauli [Tue, 18 Feb 2014 15:45:48 +0000 (16:45 +0100)]
5.5.11-dev next

11 years ago5.5.11 next for NEWS
commit | commitdiff | tree
Julien Pauli [Tue, 18 Feb 2014 15:40:19 +0000 (16:40 +0100)]
5.5.11 next for NEWS

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoSet fileinfo version to 1.0.5 (as in php 5.4, no diff)
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)

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Tue, 18 Feb 2014 12:57:28 +0000 (13:57 +0100)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Tue, 18 Feb 2014 12:56:58 +0000 (13:56 +0100)]
NEWS

11 years agoFixed Bug #66731 file: infinite recursion
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

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years ago5.4.27 now
commit | commitdiff | tree
Stanislav Malyshev [Tue, 18 Feb 2014 05:19:25 +0000 (21:19 -0800)]
5.4.27 now

11 years agoupdate NEWS
commit | commitdiff | tree
Stanislav Malyshev [Tue, 18 Feb 2014 05:16:48 +0000 (21:16 -0800)]
update NEWS

11 years agoMerge branch 'PHP-5.6'
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

11 years agoAdd __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);

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoFixed 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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Mon, 17 Feb 2014 17:04:14 +0000 (19:04 +0200)]
Merge branch 'PHP-5.6'

11 years agoremove dead code
commit | commitdiff | tree
Andrey Hristov [Mon, 17 Feb 2014 17:04:01 +0000 (19:04 +0200)]
remove dead code

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Mon, 17 Feb 2014 16:37:59 +0000 (18:37 +0200)]
Merge branch 'PHP-5.6'

11 years agoMove code out, that handles the actual structure to be used for the decoded
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

11 years agoMerge branch 'PHP-5.6'
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)

11 years agoUpdated NEWS for #65753
commit | commitdiff | tree
Julien Pauli [Mon, 17 Feb 2014 10:16:32 +0000 (11:16 +0100)]
Updated NEWS for #65753

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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)

11 years agoUpdated NEWS for #65753
commit | commitdiff | tree
Julien Pauli [Mon, 17 Feb 2014 10:13:38 +0000 (11:13 +0100)]
Updated NEWS for #65753

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoUpdated NEWS for #65753
commit | commitdiff | tree
Julien Pauli [Mon, 17 Feb 2014 10:05:34 +0000 (11:05 +0100)]
Updated NEWS for #65753

11 years agoExport 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)

11 years agoExport 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)

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