clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,574 Commits 491 Branches 1,363 Tags 837 MiB
f6841d250a
Commit Graph

75574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anatol Belski
acfed1c4c7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix dll export
 2014-04-24 10:52:22 +02:00
Anatol Belski
03be983398 fix dll export 2014-04-24 10:51:42 +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
6bad228b4e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
 2014-04-20 16:23:43 -07:00
Julio Pintos
49341e992a 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
 2014-04-20 16:21:49 -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
3586d14b61 UPGRADING note about bug #67072 2014-04-18 15:50:15 +02:00
Anatol Belski
fae4f64865 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  UPGRADING note about bug #67072
 2014-04-18 15:44:18 +02:00
Anatol Belski
53c68811ba UPGRADING note about bug #67072 2014-04-18 15:43:05 +02:00
Anatol Belski
d963cf94a5 refixed the test related to bug #67072 2014-04-18 15:16:09 +02: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
Tjerk Meesters
5e988a888a Fixed test case for 5328d42 2014-04-17 17:36:03 -07: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
de6f297e7c updated NEWS 2014-04-17 11:06:55 +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
ba03830241 updated UPGRADING 2014-04-16 20:47:17 +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
228a3537d3 updated NEWS 2014-04-16 14:15:26 +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
Anatol Belski
9eb726b3ab Fixed bug #67079 Missing MIME types for XML/XSL files 2014-04-16 09:47:49 +02:00
Stanislav Malyshev
6bf7c10b20 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.29 is next

Conflicts:
	configure.in
	main/php_version.h
 2014-04-15 17:15:21 -07:00
Stanislav Malyshev
1d34d82231 5.4.29 is next 2014-04-15 16:51:38 -07:00
Julien Pauli
b8d029435d 5.5.12RC1 setup 2014-04-15 17:57:27 +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
Stanislav Malyshev
56f9727305 ws fix 2014-04-14 13:16:53 -07:00
Andrey Hristov
22acea99ff Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2014-04-14 23:11:29 +03:00
Stanislav Malyshev
5b8c4b8de5 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
 2014-04-14 10:46:52 -07:00
Stanislav Malyshev
ed4de188dd Fix null byte in LDAP bindings 2014-04-14 10:46:46 -07:00