granicus.if.org Git

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

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

commit | commitdiff | tree

Stanislav Malyshev [Mon, 21 Apr 2014 00:22:08 +0000 (17:22 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

Conflicts:
ext/phar/phar_path_check.c

commit | commitdiff | tree

Danack [Thu, 13 Feb 2014 14:48:51 +0000 (14:48 +0000)]

Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

commit | commitdiff | tree

Andrew Kehrig [Mon, 24 Feb 2014 17:01:58 +0000 (12:01 -0500)]

Fix #50444: PDO-ODBC changes for 64-bit

This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 23:36:36 +0000 (16:36 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix a compiler warning in php_rand.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 23:35:49 +0000 (16:35 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix a compiler warning in php_rand.h

commit | commitdiff | tree

Rouven Weßling [Mon, 24 Feb 2014 13:45:42 +0000 (14:45 +0100)]

Fix a compiler warning in php_rand.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 23:24:15 +0000 (16:24 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix #66908: php-fpm reload leaks epoll_create() file descriptor

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 23:22:31 +0000 (16:22 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix #66908: php-fpm reload leaks epoll_create() file descriptor

commit | commitdiff | tree

Julio Pintos [Fri, 14 Mar 2014 19:47:30 +0000 (16:47 -0300)]

Fix #66908: php-fpm reload leaks epoll_create() file descriptor

This patch fixes descriptor leak which could lead to DoS once Max open files is reached

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 22:26:51 +0000 (15:26 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #65701: Do not use cache for file file copy

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 22:24:14 +0000 (15:24 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #65701: Do not use cache for file file copy

commit | commitdiff | tree

Boro Sitnikovski [Mon, 14 Apr 2014 08:02:11 +0000 (10:02 +0200)]

Fix bug #65701: Do not use cache for file file copy

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 14:08:42 +0000 (16:08 +0200)]

updated libs versions

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 14:04:15 +0000 (16:04 +0200)]

added some notes about the win build system

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 13:54:49 +0000 (15:54 +0200)]

UPGRADING note about bug #67072

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 13:54:17 +0000 (15:54 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
UPGRADING note about bug #67072
UPGRADING note about bug #67072

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 13:50:15 +0000 (15:50 +0200)]

UPGRADING note about bug #67072

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 13:44:18 +0000 (15:44 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
UPGRADING note about bug #67072

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 13:43:05 +0000 (15:43 +0200)]

UPGRADING note about bug #67072

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 13:17:12 +0000 (15:17 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
refixed the test related to bug #67072
Improved the fix for bug #67072, thanks Nikita

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 13:16:09 +0000 (15:16 +0200)]

refixed the test related to bug #67072

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 13:14:42 +0000 (15:14 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Improved the fix for bug #67072, thanks Nikita

commit | commitdiff | tree

Anatol Belski [Fri, 18 Apr 2014 13:13:32 +0000 (15:13 +0200)]

Improved the fix for bug #67072, thanks Nikita

commit | commitdiff | tree

Stanislav Malyshev [Fri, 18 Apr 2014 00:36:26 +0000 (17:36 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed test case for 5328d42

commit | commitdiff | tree

Tjerk Meesters [Fri, 18 Apr 2014 00:29:32 +0000 (08:29 +0800)]

Fixed test case for 5328d42

commit | commitdiff | tree

Bob Weinand [Thu, 17 Apr 2014 15:23:05 +0000 (17:23 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Bob Weinand [Thu, 17 Apr 2014 15:21:21 +0000 (17:21 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Levi Morrison [Thu, 17 Apr 2014 14:46:38 +0000 (08:46 -0600)]

These links to ~helly don't work anymore.

commit | commitdiff | tree

Anatol Belski [Thu, 17 Apr 2014 09:08:27 +0000 (11:08 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 17 Apr 2014 09:07:22 +0000 (11:07 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #67072 Echoing unserialized "SplFileObject" crash

commit | commitdiff | tree

Anatol Belski [Thu, 17 Apr 2014 09:06:55 +0000 (11:06 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 17 Apr 2014 09:05:21 +0000 (11:05 +0200)]

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: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: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: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: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: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: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: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: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: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

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

fix crash in MINFO when no mysqlnd plugins are loaded

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:34:32 +0000 (15:34 +0200)]

test fixes for ICU 53.1

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.4' into PHP-5.5

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

commit | commitdiff | tree

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

Fixed bug #67033 Remove reference to Windows 95

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix NEWS

commit | commitdiff | tree

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

MErge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix NEWS

commit | commitdiff | tree

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

fix NEWS

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 01:55:58 +0000 (18:55 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix #66021 (Blank line inside empty array/object)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 01:54:54 +0000 (18:54 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix #66021 (Blank line inside empty array/object)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 01:50:39 +0000 (18:50 -0700)]

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

* pull-request/518:
Fix #66021 (Blank line inside empty array/object)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 01:38:45 +0000 (18:38 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #64604

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 01:38:12 +0000 (18:38 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #64604

commit | commitdiff | tree

Ingo Walz [Sat, 23 Nov 2013 01:31:23 +0000 (02:31 +0100)]

Fixed bug #64604

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 01:13:24 +0000 (18:13 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 01:12:40 +0000 (18:12 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

commit | commitdiff | tree

Freek [Tue, 28 Jan 2014 10:47:14 +0000 (11:47 +0100)]

Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

commit | commitdiff | tree

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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

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

RSS Atom