granicus.if.org Git

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67072 Echoing unserialized "SplFileObject" crash

Conflicts:
ext/standard/var_unserializer.c

commit | commitdiff | tree

Anatol Belski [Thu, 17 Apr 2014 08:48:14 +0000 (10:48 +0200)]

Fixed bug #67072 Echoing unserialized "SplFileObject" crash

The actual issue lays in the unserializer code which doesn't honor
the unserialize callback. By contrast, the serialize callback is
respected. This leads to the situation that even if a class has
disabled the serialization explicitly, user could still construct
a vulnerable string which would result bad things when trying
to unserialize.

This conserns also the classes implementing Serializable as well
as some core classes disabling serialize/unserialize callbacks
explicitly (PDO, SimpleXML, SplFileInfo and co). As of now, the
flow is first to call the unserialize callback (if available),
then call __wakeup. If the unserialize callback returns with no
success, no object is instantiated. This makes the scheme used
by internal classes effective, to disable unserialize just assign
zend_class_unserialize_deny as callback.

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 18:49:35 +0000 (20:49 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated UPGRADING
updated UPGRADING

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 18:49:21 +0000 (20:49 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated UPGRADING

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 18:48:31 +0000 (20:48 +0200)]

updated UPGRADING

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 18:47:17 +0000 (20:47 +0200)]

updated UPGRADING

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 13:08:46 +0000 (15:08 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
correct the bug #67081 fix

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 13:08:34 +0000 (15:08 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
correct the bug #67081 fix

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 13:08:08 +0000 (15:08 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
correct the bug #67081 fix

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 13:06:57 +0000 (15:06 +0200)]

correct the bug #67081 fix

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 12:16:56 +0000 (14:16 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 12:16:36 +0000 (14:16 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 12:15:52 +0000 (14:15 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 12:15:26 +0000 (14:15 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 12:14:52 +0000 (14:14 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 12:13:45 +0000 (14:13 +0200)]

Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 07:50:24 +0000 (09:50 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated NEWS
Fixed bug #67079 Missing MIME types for XML/XSL files

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 07:49:48 +0000 (09:49 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 07:48:31 +0000 (09:48 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #67079 Missing MIME types for XML/XSL files

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 07:47:49 +0000 (09:47 +0200)]

Fixed bug #67079 Missing MIME types for XML/XSL files

commit | commitdiff | tree

Stanislav Malyshev [Wed, 16 Apr 2014 00:18:24 +0000 (17:18 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
5.4.29 is next
5.5.12RC1 setup

commit | commitdiff | tree

Stanislav Malyshev [Wed, 16 Apr 2014 00:17:39 +0000 (17:17 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
5.4.29 is next
5.5.12RC1 setup

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 16 Apr 2014 00:15:21 +0000 (17:15 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.29 is next

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 15 Apr 2014 23:51:38 +0000 (16:51 -0700)]

5.4.29 is next

commit | commitdiff | tree

Anatol Belski [Tue, 15 Apr 2014 17:29:32 +0000 (10:29 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute

commit | commitdiff | tree

Anatol Belski [Tue, 15 Apr 2014 17:26:49 +0000 (10:26 -0700)]

Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute

commit | commitdiff | tree

Julien Pauli [Tue, 15 Apr 2014 15:57:27 +0000 (17:57 +0200)]

5.5.12RC1 setup

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 22:48:33 +0000 (15:48 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix test - doesn't seem to produce warning
Fix test - on CI somebody could create a process in the meantime

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 22:47:53 +0000 (15:47 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix test - on CI somebody could create a process in the meantime

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 22:47:06 +0000 (15:47 -0700)]

fix test - doesn't seem to produce warning

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 22:45:53 +0000 (15:45 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix test - on CI somebody could create a process in the meantime

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 22:43:32 +0000 (15:43 -0700)]

Fix test - on CI somebody could create a process in the meantime

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 21:35:51 +0000 (23:35 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix windows build

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 21:34:50 +0000 (23:34 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix windows build

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 21:30:14 +0000 (23:30 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix windows build

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 21:29:38 +0000 (23:29 +0200)]

fix windows build

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 20:38:44 +0000 (13:38 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #66942: openssl_seal() memory leak
  ws fix
  Fix #66942: openssl_seal() memory leak
  ws fix

commit | commitdiff | tree

Chuan Ma [Tue, 25 Mar 2014 03:24:41 +0000 (23:24 -0400)]

Fix #66942: openssl_seal() memory leak

Fix #66952: memory leak in openssl_open()

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 20:16:53 +0000 (13:16 -0700)]

ws fix

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 20:36:25 +0000 (13:36 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix #66942: openssl_seal() memory leak
ws fix

commit | commitdiff | tree

Chuan Ma [Tue, 25 Mar 2014 03:24:41 +0000 (23:24 -0400)]

Fix #66942: openssl_seal() memory leak

Fix #66952: memory leak in openssl_open()

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 20:16:53 +0000 (13:16 -0700)]

ws fix

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 20:35:00 +0000 (13:35 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix #66942: openssl_seal() memory leak
ws fix

Conflicts:
ext/openssl/openssl.c

commit | commitdiff | tree

Chuan Ma [Tue, 25 Mar 2014 03:24:41 +0000 (23:24 -0400)]

Fix #66942: openssl_seal() memory leak

Fix #66952: memory leak in openssl_open()

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 20:16:53 +0000 (13:16 -0700)]

ws fix

commit | commitdiff | tree

Andrey Hristov [Mon, 14 Apr 2014 20:11:29 +0000 (23:11 +0300)]

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

commit | commitdiff | tree

Andrey Hristov [Mon, 14 Apr 2014 20:11:16 +0000 (23:11 +0300)]

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

commit | commitdiff | tree

Andrey Hristov [Mon, 14 Apr 2014 20:11:01 +0000 (23:11 +0300)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 17:53:09 +0000 (10:53 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]

Fix null byte in LDAP bindings

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]

Fix bug #66171: better handling of symlinks

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 17:51:34 +0000 (10:51 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]

Fix null byte in LDAP bindings

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]

Fix bug #66171: better handling of symlinks

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 17:46:52 +0000 (10:46 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]

Fix null byte in LDAP bindings

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]

Fix bug #66171: better handling of symlinks

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]

Fix null byte in LDAP bindings

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]

Fix bug #66171: better handling of symlinks

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 15:45:18 +0000 (17:45 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix crash in MINFO when no mysqlnd plugins are loaded

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 15:44:47 +0000 (17:44 +0200)]

fix crash in MINFO when no mysqlnd plugins are loaded

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 14:45:18 +0000 (16:45 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
backported some ext/intl tests from 5.6 into 5.4

commit | commitdiff | tree

Andrey Hristov [Mon, 14 Apr 2014 14:44:21 +0000 (17:44 +0300)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Andrey Hristov [Mon, 14 Apr 2014 14:44:13 +0000 (17:44 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
ext/mysqli/tests/mysqli_change_user_old.phpt

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 14:42:51 +0000 (16:42 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
backported some ext/intl tests from 5.6 into 5.4

commit | commitdiff | tree

Andrey Hristov [Mon, 14 Apr 2014 14:35:01 +0000 (17:35 +0300)]

Add test

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 14:34:08 +0000 (16:34 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
backported some ext/intl tests from 5.6 into 5.4

Conflicts:
ext/intl/tests/collator_get_sort_key_variant2.phpt
ext/intl/tests/locale_get_display_name3.phpt

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 14:31:18 +0000 (16:31 +0200)]

backported some ext/intl tests from 5.6 into 5.4

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 13:35:01 +0000 (15:35 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
test fixes for ICU 53.1

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 13:34:32 +0000 (15:34 +0200)]

test fixes for ICU 53.1

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 07:34:02 +0000 (09:34 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #67033 Remove reference to Windows 95