Stanislav Malyshev
|
40037f1474
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix #68760: Fix freeing null segfault. Added test for behaviour.
Conflicts:
ext/sqlite3/tests/bug68760.phpt
|
2015-03-22 16:46:30 -07:00 |
|
Danack
|
0c27a8eb61
|
Fix #68760: Fix freeing null segfault. Added test for behaviour.
|
2015-03-22 16:46:02 -07:00 |
|
Danack
|
1ec430d4ed
|
Fix #68760: Fix freeing null segfault. Added test for behaviour.
|
2015-03-22 16:44:06 -07:00 |
|
Anatol Belski
|
63d7cd7d5b
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
cosmetic fix to default odbcver
Remove extraneous strlen() call
|
2015-03-23 00:07:43 +01:00 |
|
Anatol Belski
|
a759c40872
|
cosmetic fix to default odbcver
|
2015-03-23 00:07:09 +01:00 |
|
Rasmus Lerdorf
|
d33636f764
|
Remove extraneous strlen() call
|
2015-03-21 08:29:12 -07:00 |
|
Rasmus Lerdorf
|
7fce3607ea
|
Remove extraneous strlen() call
|
2015-03-21 08:28:40 -07:00 |
|
Derick Rethans
|
a73d0b0fb3
|
- Updated to version 2015.2 (2015b)
|
2015-03-21 14:51:11 +01:00 |
|
Derick Rethans
|
d025f8e019
|
Empty merge
|
2015-03-21 14:51:10 +01:00 |
|
Derick Rethans
|
b98a486606
|
- Updated to version 2015.2 (2015b)
|
2015-03-21 14:51:09 +01:00 |
|
Ferenc Kovacs
|
b5d7bcf0db
|
this already had an entry
|
2015-03-20 14:40:58 +01:00 |
|
Ferenc Kovacs
|
95c3a4798f
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add pear to the travis build
|
2015-03-20 13:34:35 +01:00 |
|
Ferenc Kovacs
|
9ff99059b1
|
add pear to the travis build
|
2015-03-20 13:34:16 +01:00 |
|
Julien Pauli
|
d55b42bd61
|
Updated NEWS
|
2015-03-20 10:53:33 +01:00 |
|
Julien Pauli
|
b70ba86781
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
|
2015-03-20 10:45:54 +01:00 |
|
Julien Pauli
|
ceb4cb6976
|
Updated NEWS
|
2015-03-20 10:45:36 +01:00 |
|
Stanislav Malyshev
|
eebd7c66ee
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add CVEs
|
2015-03-19 23:05:49 -07:00 |
|
Stanislav Malyshev
|
72c19d8260
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add CVEs
|
2015-03-19 23:05:34 -07:00 |
|
Stanislav Malyshev
|
95b9c34f02
|
add CVEs
|
2015-03-19 22:54:48 -07:00 |
|
Lior Kaplan
|
a0927357a3
|
Add CVE ID for #68735
|
2015-03-19 18:25:01 +02:00 |
|
Lior Kaplan
|
b20b0ffe4e
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add CVE ID for #68735
|
2015-03-19 18:24:28 +02:00 |
|
Lior Kaplan
|
8f18444cd9
|
Add CVE ID for #68735
|
2015-03-19 18:23:34 +02:00 |
|
Dmitry Stogov
|
0c3de98368
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69152
|
2015-03-19 11:48:10 +03:00 |
|
Dmitry Stogov
|
9bdbc7490f
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #69152
|
2015-03-19 11:42:49 +03:00 |
|
Dmitry Stogov
|
51856a76f8
|
Fixed bug #69152
|
2015-03-19 11:36:01 +03:00 |
|
Lior Kaplan
|
56cda02e11
|
Add CVE to bug #69253
|
2015-03-19 02:44:45 +02:00 |
|
Lior Kaplan
|
9bbf9fedff
|
Align entries format
|
2015-03-19 02:42:35 +02:00 |
|
Lior Kaplan
|
c824de432d
|
Add CVE assigned to 5.6.6 bugs after the release
|
2015-03-19 02:40:22 +02:00 |
|
Lior Kaplan
|
df340b5d8e
|
Add CVE to bug #69248
|
2015-03-19 02:37:50 +02:00 |
|
Lior Kaplan
|
61d11d7e10
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Align entries format
Add CVE to bug #69248
Add CVE assigned to 5.5.22 bugs after the release
|
2015-03-19 02:36:28 +02:00 |
|
Lior Kaplan
|
6a4399a8d9
|
Align entries format
|
2015-03-19 02:35:20 +02:00 |
|
Lior Kaplan
|
3eba942eb2
|
Add CVE to bug #69248
|
2015-03-19 02:30:31 +02:00 |
|
Lior Kaplan
|
4680f08607
|
Add CVE assigned to 5.5.22 bugs after the release
|
2015-03-19 02:29:43 +02:00 |
|
Julien Pauli
|
c7dfd8a3a4
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
|
2015-03-18 11:34:56 +01:00 |
|
Julien Pauli
|
9744aded1a
|
Updated NEWS
|
2015-03-18 11:34:45 +01:00 |
|
Julien Pauli
|
6262db7341
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
|
2015-03-18 10:55:49 +01:00 |
|
Julien Pauli
|
5e4dd962e2
|
Updated NEWS
|
2015-03-18 10:55:32 +01:00 |
|
Stanislav Malyshev
|
58efcc7dd8
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.4.40 next
|
2015-03-17 22:39:21 -07:00 |
|
Stanislav Malyshev
|
de0cee2f39
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.40 next
Conflicts:
configure.in
main/php_version.h
|
2015-03-17 22:39:10 -07:00 |
|
Stanislav Malyshev
|
4c3b73b6df
|
5.4.40 next
|
2015-03-17 22:37:16 -07:00 |
|
Stanislav Malyshev
|
225cb973e5
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
Conflicts:
ext/zip/lib/zip_dirent.c
|
2015-03-17 22:03:24 -07:00 |
|
Stanislav Malyshev
|
210cfafc2b
|
update NEWS
|
2015-03-17 22:00:53 -07:00 |
|
Stanislav Malyshev
|
53eff4a369
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
|
2015-03-17 22:00:29 -07:00 |
|
Stanislav Malyshev
|
ef8fc4b53d
|
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
|
2015-03-17 21:59:56 -07:00 |
|
Stanislav Malyshev
|
749f82af02
|
oops, no idea how this got in
|
2015-03-17 17:13:50 -07:00 |
|
Stanislav Malyshev
|
14588c2499
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
|
2015-03-17 17:10:14 -07:00 |
|
Stanislav Malyshev
|
bf2f03ddb3
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
|
2015-03-17 17:10:05 -07:00 |
|
Stanislav Malyshev
|
890b3987ab
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
|
2015-03-17 17:09:47 -07:00 |
|
Stanislav Malyshev
|
c83dd84ad6
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
|
2015-03-17 17:08:13 -07:00 |
|
Stanislav Malyshev
|
fb04dcf6db
|
Fix bug #69248 - heap overflow vulnerability in regcomp.c
Merged from 70bc296560
|
2015-03-17 17:04:57 -07:00 |
|