mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-13 14:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
90,575 Commits 505 Branches 1,389 Tags 785 MiB
103bf7eda0
Commit Graph

90575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferenc Kovacs
0d7f22c157 add missing NEWS entries 2015-06-10 09:36:53 +02:00
Ferenc Kovacs
2b8ba3e9f8 add missing NEWS entries 2015-06-10 09:35:38 +02:00
Stanislav Malyshev
d4407e1cb9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add NEWS
  Fixed bug #68776
  fix test
  update NEWS
  Fix bug #69646	OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
	ext/dom/document.c
	ext/gd/gd.c
	ext/standard/exec.c
 2015-06-09 21:39:59 -07:00
Stanislav Malyshev
563462fbf8 Fixed bug #69646 (OS command injection vulnerability in escapeshellarg) 2015-06-09 21:37:17 -07:00
Stanislav Malyshev
60a2742fd2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add NEWS
 2015-06-09 21:35:41 -07:00
Stanislav Malyshev
c2d4704744 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add NEWS
 2015-06-09 21:35:31 -07:00
Stanislav Malyshev
f1ffb4b1ad add NEWS 2015-06-09 21:35:18 -07:00
Stanislav Malyshev
c095af584c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68776
 2015-06-09 21:34:06 -07:00
Stanislav Malyshev
e10af61862 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68776
 2015-06-09 21:33:38 -07:00
Yasuo Ohgaki
9d168b863e Fixed bug #68776 2015-06-09 21:32:54 -07:00
Stanislav Malyshev
1346c3df42 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
  update NEWS
 2015-06-09 17:12:25 -07:00
Stanislav Malyshev
6b53b7cd84 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  fix test
  update NEWS
 2015-06-09 17:12:11 -07:00
Stanislav Malyshev
eee8b6c33f fix test 2015-06-09 17:11:33 -07:00
Stanislav Malyshev
539738c438 update NEWS 2015-06-09 16:23:05 -07:00
Stanislav Malyshev
8b1919ed73 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69646	OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.
 2015-06-09 15:32:27 -07:00
Stanislav Malyshev
4e2fb47092 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69646	OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
	ext/dom/document.c
	ext/gd/gd.c
 2015-06-09 15:31:27 -07:00
Ferenc Kovacs
e4aa5c0510 fix typo 2015-06-09 23:14:11 +02:00
Stanislav Malyshev
8036758491 Fix bug #69646 OS command injection vulnerability in escapeshellarg 2015-06-09 10:52:38 -07:00
Stanislav Malyshev
f7d7befae8 Fix #69719 - more checks for nulls in paths 2015-06-09 10:52:38 -07:00
Ferenc Kovacs
7ec3016e29 fix hard-coded path in test 2015-06-09 16:42:02 +02:00
Ferenc Kovacs
2d962af4c0 prepare for 7.0.0alpha1 2015-06-09 14:20:55 +02:00
Ferenc Kovacs
b6005f72fc Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix NEWS
 2015-06-09 13:57:41 +02:00
Ferenc Kovacs
8574290d9b fix NEWS 2015-06-09 13:57:28 +02:00
Ferenc Kovacs
901ff81196 Merge branch 'PHP-5.6' 
* PHP-5.6:
  these will be part of 5.6.11
 2015-06-09 13:41:25 +02:00
Ferenc Kovacs
72d0796d66 these will be part of 5.6.11 2015-06-09 13:41:00 +02:00
Ferenc Kovacs
7a9facd8c6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing NEWS entry
 2015-06-09 13:32:11 +02:00
Ferenc Kovacs
632c5d6250 add missing NEWS entry 2015-06-09 13:31:45 +02:00
Julien Pauli
3601b61f3d Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.5.27 now
 2015-06-09 10:36:20 +02:00
Julien Pauli
0bfb454acb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.27 now

Conflicts:
	configure.in
	main/php_version.h
 2015-06-09 10:35:42 +02:00
Julien Pauli
5f7c1917e3 5.5.27 now 2015-06-09 10:33:29 +02:00
Remi Collet
531c306fe6 fix test description 2015-06-09 09:18:54 +02:00
Remi Collet
1ad58ce12e Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test description
  Fixed Buf #68812 Unchecked return value.
  Fixed Buf #68812 Unchecked return value.
 2015-06-09 09:14:05 +02:00
Remi Collet
5eecc6bcde Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test description
  Fixed Buf #68812 Unchecked return value.
 2015-06-09 09:13:19 +02:00
Remi Collet
b347f2c47a fix test description 2015-06-09 09:12:59 +02:00
Lior Kaplan
d8d5dc5d32 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Upgrade bundled sqlite to 3.8.10.2
 2015-06-08 23:22:03 +03:00
George Wang
81ab4b12aa Fixed Buf #68812 Unchecked return value. 2015-06-08 15:47:11 -04:00
George Wang
eb15ec385e Fixed Buf #68812 Unchecked return value. 2015-06-08 15:46:56 -04:00
George Wang
6bb24823d0 Fixed Buf #68812 Unchecked return value. 2015-06-08 15:46:40 -04:00
Lior Kaplan
b861a4a4d2 NEWS entry for: Upgrade bundled sqlite to 3.8.10.2 
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
 2015-06-08 22:39:00 +03:00
George Wang
78d1228ef6 Fixed Buf #68812 Unchecked return value. 2015-06-08 15:38:59 -04:00
Lior Kaplan
79528c5e24 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Upgrade bundled sqlite to 3.8.10.2
 2015-06-08 22:37:02 +03:00
Lior Kaplan
f5bf7b6b27 NEWS entry for: Upgrade bundled sqlite to 3.8.10.2 
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
 2015-06-08 22:32:29 +03:00
Lior Kaplan
eb7c33b204 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
  Upgrade bundled sqlite to 3.8.10.2
  Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41
  Add CVE to #68598
 2015-06-08 22:29:35 +03:00
Lior Kaplan
b5d1530e4f Upgrade bundled sqlite to 3.8.10.2 
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
 2015-06-08 22:29:10 +03:00
Lior Kaplan
33a9f01d36 NEWS entry for: Upgrade bundled sqlite to 3.8.10.2 
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
 2015-06-08 22:23:22 +03:00
Lior Kaplan
7ced40e24e Upgrade bundled sqlite to 3.8.10.2 
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
 2015-06-08 22:17:06 +03:00
Lior Kaplan
4cc46b2a99 Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41 2015-06-08 22:12:42 +03:00
Lior Kaplan
90a8ea9827 Add CVE to #68598 2015-06-08 22:04:42 +03:00
Anatol Belski
c8cf54719f Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed test related to fix for bug #67805
 2015-06-08 13:28:53 +02:00
Anatol Belski
18b3508c3c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed test related to fix for bug #67805
 2015-06-08 13:28:23 +02:00