delta/php-git.git, branch php-5.5.26 git.php.net: repository/php-src.git Fix wrong merge 2015-06-10T12:26:49+00:00 Julien Pauli jpauli@php.net 2015-06-10T12:15:14+00:00 fa6f9e100476fbdd65495524616a0373edb24f87 






Updated NEWS
2015-06-10T09:05:02+00:00

Julien Pauli
jpauli@php.net

2015-06-10T09:05:02+00:00

bf72e139010bc308fceb6efbc0ee3b104f1312db












Fixed bug #68776
2015-06-10T09:04:40+00:00

Yasuo Ohgaki
yohgaki@php.net

2015-05-13T00:18:46+00:00

4bf3f646eea270d93ef6b9ebcf285c77a70a733b












Fixed Buf #68812 Unchecked return value.
2015-06-10T09:02:00+00:00

George Wang
gwang@php.net

2015-06-08T19:38:59+00:00

4bfa8694a523cc2e450210fde9ccc6fd3a672b0a












fix test description
2015-06-10T09:00:34+00:00

Remi Collet
remi@php.net

2015-06-09T07:12:59+00:00

3d70b1147cb526ca81c3c24af793f49813731487












fix test
2015-06-10T08:59:37+00:00

Stanislav Malyshev
stas@php.net

2015-06-10T00:11:33+00:00

928dce708ce18daa9c191f6ab4b6ab861a218e8f












Fix bug #69646	OS command injection vulnerability in escapeshellarg
2015-06-10T08:59:13+00:00

Stanislav Malyshev
stas@php.net

2015-06-01T05:53:35+00:00

e22f22e6ae83298454576f80b1a91373e7a21ce2












Fix #69719 - more checks for nulls in paths
2015-06-10T08:58:47+00:00

Stanislav Malyshev
stas@php.net

2015-06-01T05:47:52+00:00

58e590aac6839ace470650c58bf418e5fa637eb3

Conflicts:
	ext/dom/document.c
	ext/gd/gd.c





Conflicts:
	ext/dom/document.c
	ext/gd/gd.c







Fixed NEWS
2015-06-09T16:18:31+00:00

Julien Pauli
jpauli@php.net

2015-06-09T16:18:31+00:00

b16842e5a211e7649214dcc61f6a9305efebe349












Update PCRE version (bug #69689)
2015-06-09T08:30:41+00:00

Stanislav Malyshev
stas@php.net

2015-05-31T04:17:16+00:00

11928db0d3d2f8c4387822ca1bcf95243512dc53