Stanislav Malyshev
aa22e80b1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
2015-03-22 21:03:46 -07:00
Trevor Suarez
c2e22556ba
Adding a new createFromImmutable method to the DateTime class to mirror the current DateTime::createFromMutable()
2015-03-22 20:54:25 -07:00
Juan Basso
3e7f47cb03
Renamed test case to match with reported bug
2015-03-22 20:34:59 -07:00
Juan Basso
4076a4d2a9
Fixed serialization of non string values on __sleep
...
Returning just N; (null) on the __sleep makes the number of fields/values be incomplete and corrupting the generated value from serialize, making impossible to unserialize it.
Conflicts:
ext/standard/var.c
2015-03-22 20:31:40 -07:00
Stanislav Malyshev
c6384a7908
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
2015-03-22 18:54:48 -07:00
Masaki Kagaya
1badfd8171
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
2015-03-22 18:52:42 -07:00
Stanislav Malyshev
fce9a856e7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bacport fix bug #68741 - Null pointer dereference
Check that the type is correct
2015-03-22 18:32:16 -07:00
Stanislav Malyshev
723ffe2e89
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bacport fix bug #68741 - Null pointer dereference
Check that the type is correct
2015-03-22 18:30:56 -07:00
Stanislav Malyshev
968fbc6acf
Bacport fix bug #68741 - Null pointer dereference
2015-03-22 18:30:05 -07:00
Stanislav Malyshev
fb83c76dee
Check that the type is correct
2015-03-22 18:17:47 -07:00
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
