clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,613 Commits 491 Branches 1,363 Tags 846 MiB
a444900c8d
Commit Graph

75613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wallner
60ef357ffc NEWS 2014-04-03 10:40:42 +02:00
Michael Wallner
bbd25ca01f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix Bug #66736 	fpassthru broken
 2014-04-03 10:40:20 +02:00
Michael Wallner
d08b4dbf23 Fix Bug #66736 fpassthru broken 2014-04-03 10:40:06 +02:00
Michael Wallner
f17fe2cabc NEWS 2014-04-03 09:09:15 +02:00
Michael Wallner
ba4fddd2da Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66182 	exit in stream filter produces segfault
 2014-04-03 09:08:35 +02:00
Michael Wallner
7ab5c593f7 Fix bug #66182 exit in stream filter produces segfault 
Unfortunately, a segv caused by exit cannot be tested reliably.
 2014-04-03 09:07:35 +02:00
Michael Wallner
9eb0c634d4 NEWS 2014-04-02 15:38:22 +02:00
Michael Wallner
f453917f62 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #61019 (Out of memory on command stream_get_contents)
 2014-04-02 15:37:50 +02:00
Michael Wallner
1ec83d44a1 Fixed bug #61019 (Out of memory on command stream_get_contents) 2014-04-02 15:36:39 +02:00
Michael Wallner
68556f3384 NEWS 2014-04-02 11:13:21 +02:00
Michael Wallner
af147ac9b7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64330
 2014-04-02 11:10:59 +02:00
Michael Wallner
91a9d24aa3 Fix bug #64330 
stream_socket_server() creates wrong Abstract Namespace UNIX sockets
 2014-04-02 11:09:26 +02:00
Anatol Belski
8e238148f9 updated NEWS 2014-04-01 10:12:56 +02:00
Anatol Belski
eb84d5d0a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
 2014-04-01 10:12:06 +02:00
Anatol Belski
f244513fc0 updated NEWS 2014-04-01 10:11:40 +02:00
Anatol Belski
fca1501ed6 added test for bug #53965 2014-04-01 10:08:08 +02:00
Anatol Belski
3cb056f523 Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://" 2014-04-01 10:07:18 +02:00
Remi Collet
60fb57d4f6 NEWS 2014-03-31 16:57:29 +02:00
Remi Collet
178eac6c98 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
 2014-03-31 16:57:12 +02:00
Remi Collet
fca331cae9 NEWS 2014-03-31 16:57:02 +02:00
Remi Collet
2c204a55af Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian) 
On little endian:
	map->p == php_magic_database
	map->magic[i] = pointer into the map

	map->p == NULL
	map->magic[i] = pointer to allocated memory

On big endian (ppc64, s390x, ...):
	map->p != php_magic_database and map->p != NULL
        map->magic[i] = pointer into a copy of the map

Trying to efree pointer in the later cause memory corruption
Thanks to dkatulek / Red Hat for the report.
 2014-03-31 16:50:47 +02:00
Anatol Belski
972c451c73 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update lib versions

Conflicts:
	win32/build/libs_version.txt
 2014-03-27 18:19:24 +01:00
Anatol Belski
1283722589 update lib versions 2014-03-27 18:18:06 +01:00
Andrey Hristov
84cd0f9911 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2014-03-26 13:57:13 +02:00
Andrey Hristov
89ea2650a1 Fix test 2014-03-26 13:56:58 +02:00
Derick Rethans
039cb10fa3 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-25 12:17:15 +00:00
Derick Rethans
170cf3ec00 - Updated to version 2014.2 (2014b) 2014-03-25 12:17:14 +00:00
Remi Collet
8b7b67a21b NEWS 2014-03-25 11:01:56 +01:00
Remi Collet
84b0ab6d8f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
 2014-03-25 11:01:20 +01:00
Remi Collet
3616db6d38 NEWS 2014-03-25 11:00:47 +01:00
Remi Collet
4374a52e9d Fixed bug #66946 extensive backtracking in awk rule regular expression 
CVE-2013-7345

Applied upstream patch:
ef2329cf71

Add the magicdata.patch to track patches applied to upstream data file.
 2014-03-25 11:00:33 +01:00
Remi Collet
1df558c6a0 Fixed bug #66946 extensive backtracking in awk rule regular expression 
CVE-2013-7345

Applied upstream patch:
ef2329cf71

Add the magicdata.patch to track patches applied to upstream data file.
 2014-03-25 10:58:50 +01:00
Anatol Belski
7477f5b387 fix disabling PGO for extensions, rel bug #65715 2014-03-25 06:44:54 +01:00
Anatol Belski
223f7d9a44 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  more fixes related to bug #65715
 2014-03-24 19:18:39 +01:00
Anatol Belski
6612e1ba6a more fixes related to bug #65715 2014-03-24 19:15:02 +01:00
Anatol Belski
8558640a6a updated NEWS 2014-03-24 10:29:39 +01:00
Anatol Belski
76066b304c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
 2014-03-24 10:28:48 +01:00
Anatol Belski
5efda763be updated NEWS 2014-03-24 10:28:21 +01:00
Anatol Belski
17a57ad980 Fixed bug #65715 php5embed.lib isn't provided anymore 2014-03-24 10:24:37 +01:00
Andrey Hristov
41b4b84dda Emit a warning in case of unallowed characters. Fix another place this 
code is used - reuse
 2014-03-20 16:23:40 +02:00
Andrey Hristov
059bc99d94 don't replace with ?, just skip it 2014-03-20 12:11:16 +02:00
Andrey Hristov
44fb74fad1 fix typo 2014-03-19 18:54:56 +02:00
Andrey Hristov
d63ed101ee Fix problem with mysqli_commt()/mysqli_rollback() 2014-03-19 18:32:19 +02:00
Julien Pauli
c4145619be 5.5.11RC1 preparation 2014-03-19 10:43:32 +01:00
Stanislav Malyshev
1ff28cd0ec Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  prep for 5.4.27 rc1

Conflicts:
	configure.in
	main/php_version.h
 2014-03-18 23:24:09 -07:00
Stanislav Malyshev
9b88bc494e prep for 5.4.27 rc1 2014-03-18 23:19:09 -07:00
Derick Rethans
2dfb8fbdf4 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-18 14:48:56 +00:00
Derick Rethans
b30304fb78 - Updated to version 2014.1 (2014a) 2014-03-18 14:48:55 +00:00
Andrey Hristov
2b811a5aec Add a test 2014-03-18 15:42:38 +02:00
Mateusz Kocielski
156cc39e21 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed off-by-one in php_url_parse_ex
 2014-03-18 08:57:30 +01:00