Stanislav Malyshev
a444900c8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix memory leak in TSRM
2014-05-08 01:00:51 -07:00
Stanislav Malyshev
0cc18fdfba
Fix memory leak in TSRM
2014-05-08 01:00:34 -07:00
Ferenc Kovacs
8e2d396b52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test (it requires ext/hash)
2014-05-07 00:55:05 +02:00
Dmitry Stogov
8517001b25
Fixed test (it requires ext/hash)
2014-05-07 00:52:49 +02:00
Ferenc Kovacs
579898e338
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
2014-05-07 00:38:32 +02:00
Dmitry Stogov
f880013c4d
Fixed tests (they might fail from time to time because of session GC)
2014-05-07 00:37:56 +02:00
Adam Harvey
eb46096608
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use the right path for the suggested PHP invocation in ext_skel.
2014-05-01 11:22:46 -07:00
Adam Harvey
941c39bd06
Use the right path for the suggested PHP invocation in ext_skel.
...
Fixes bug #67160 (ext_skel outputs incorrect information).
2014-05-01 11:22:20 -07:00
Michael Wallner
b79301d11f
fix test locality inconsitency
2014-04-30 13:01:59 +02:00
Michael Wallner
54fee59598
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:27:58 +02:00
Ferenc Kovacs
35d213c9ce
put this test back to XFAIL, as it was before, since it is still leaking memory
2014-04-29 15:58:00 +02:00
Anatol Belski
3fbacdc6e8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:46:03 +02:00
Anatol Belski
2d625b5f81
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:40:44 +02:00
Popa Adrian Marius
a827fa9cd8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:13:44 +03:00
Popa Adrian Marius
bb422cb60e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:13:11 +03:00
Popa Adrian Marius
dbcd6304bb
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:12:52 +03:00
Anatol Belski
1c7f4d2b4b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2014-04-25 17:40:19 +02:00
Anatol Belski
d3dcd61623
fixed test
2014-04-25 17:39:53 +02:00
Anatol Belski
cc9f02751b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:24:58 +02:00
Anatol Belski
c1aa9baf29
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:23:26 +02:00
Stanislav Malyshev
f6841d250a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add a test case previously broken by a bad fix
Revert "Fixed bug #64604 "
2014-04-24 23:59:32 -07:00
Stanislav Malyshev
03c703b8bd
add a test case previously broken by a bad fix
2014-04-24 23:58:38 -07:00
Stanislav Malyshev
a328803803
Revert "Fixed bug #64604 "
...
This reverts commit b05c088a3a
.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
2014-04-24 23:50:45 -07:00
Anatol Belski
db960e82b4
updated libmagic.patch
2014-04-24 20:13:47 +02:00
Anatol Belski
d7bb09cc1d
backport this piece from 5.6, related to the #66307 fix
2014-04-24 19:50:23 +02:00
Anatol Belski
03fa5501a8
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-04-24 19:30:34 +02:00
Stanislav Malyshev
aca526a13b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
2014-04-22 16:57:17 -07:00
Jakub Zelenka
61499bf282
Fix accepting ill-formed UTF-8 characters
...
Conflicts:
ext/phar/phar_path_check.c
2014-04-22 16:55:58 -07:00
Stanislav Malyshev
dafb2af705
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
2014-04-20 17:22:21 -07:00
Danack
ea4cee93c8
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
2014-04-20 17:19:20 -07:00
Stanislav Malyshev
8b903f24d5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix a compiler warning in php_rand.h
2014-04-20 16:35:49 -07:00
Rouven Weßling
68283c9f4a
Fix a compiler warning in php_rand.h
2014-04-20 16:35:36 -07:00
Stanislav Malyshev
5addf223d5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:25:03 -07:00
Boro Sitnikovski
a18cec1b86
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:22:44 -07:00
Anatol Belski
7c400dc867
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improved the fix for bug #67072 , thanks Nikita
2014-04-18 15:14:42 +02:00
Anatol Belski
c2acdbdd3d
Improved the fix for bug #67072 , thanks Nikita
2014-04-18 15:13:32 +02:00
Bob Weinand
0ec122b804
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-17 17:21:21 +02:00
Levi Morrison
6e1e98d7b8
These links to ~helly don't work anymore.
2014-04-17 17:20:24 +02:00
Anatol Belski
dc407c2402
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
2014-04-17 11:05:21 +02:00
Anatol Belski
5328d42899
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.
2014-04-17 10:48:14 +02:00
Anatol Belski
947b20bc67
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
correct the bug #67081 fix
2014-04-16 15:08:08 +02:00
Anatol Belski
7a5f1663c6
correct the bug #67081 fix
2014-04-16 15:06:57 +02:00
Anatol Belski
444690eca8
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
2014-04-16 14:14:52 +02:00
Anatol Belski
5224614f23
Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
2014-04-16 14:13:45 +02:00
Stanislav Malyshev
b727934591
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test - on CI somebody could create a process in the meantime
2014-04-14 15:45:53 -07:00
Stanislav Malyshev
eea75e7146
Fix test - on CI somebody could create a process in the meantime
2014-04-14 15:44:23 -07:00
Anatol Belski
793f67e852
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix windows build
2014-04-14 23:30:14 +02:00
Anatol Belski
24b72e7a27
fix windows build
2014-04-14 23:29:38 +02:00
Stanislav Malyshev
8bc82718ae
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
2014-04-14 13:35:24 -07:00
Chuan Ma
a186312832
Fix #66942 : openssl_seal() memory leak
...
Fix #66952 : memory leak in openssl_open()
2014-04-14 13:24:14 -07:00