Ferenc Kovacs
7603abbc51
66550 will be part of 5.6.8
2015-04-15 20:05:57 +02:00
Ferenc Kovacs
4ae24d9250
remove the NEWS entry for the reverted feature
2015-04-15 19:48:13 +02:00
Xinchen Hui
bf393c89d8
Fixed res leak
2015-04-15 19:43:40 +02:00
Dmitry Stogov
f251b16fcc
Fixed recently introduced memory leak
2015-04-15 19:43:27 +02:00
Stanislav Malyshev
5904e1e55e
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
...
This reverts commit aa22e80b1a , reversing
changes made to 3e7f47cb03 .
Conflicts:
ext/date/php_date.c
2015-04-15 19:35:18 +02:00
Stanislav Malyshev
bef6df6a7e
Fix bug #66550 (SQLite prepared statement use-after-free)
2015-04-15 19:32:57 +02:00
Anatol Belski
c3771929b7
fix dir separator in test
2015-04-15 19:18:33 +02:00
Remi Collet
7dce9533e7
fix type in fix for #69085
...
(cherry picked from commit 085e9ddc26f37ce556b8fd787044746e726264b2)
2015-04-15 18:57:39 +02:00
Ferenc Kovacs
8c3093d660
add missing NEWS entry
2015-04-15 18:54:20 +02:00
Ferenc Kovacs
3592dce76d
update NEWS
2015-04-15 18:34:17 +02:00
Ferenc Kovacs
6922659b8b
update NEWS
2015-04-15 18:31:37 +02:00
Ferenc Kovacs
f44cd92cd2
5.6.8
2015-04-15 18:31:12 +02:00
Stanislav Malyshev
dc87efa848
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5: (27 commits)
fix non-standard C
update NEWS
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix test
fix type in fix for #69085
fix memory leak & add test
Fix tests
fix CVE num
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
...
Conflicts:
ext/standard/http_fopen_wrapper.c
2015-04-15 18:20:03 +02:00
Ferenc Kovacs
6787bfc37d
add missing NEWS entry
2015-04-15 18:19:41 +02:00
Ferenc Kovacs
bce433e422
update NEWS
2015-04-03 09:29:34 +02:00
Danack
e0e19a12be
Fixed bug #69281 (opcache_is_script_cached no longer works)
2015-04-03 09:27:48 +02:00
Ferenc Kovacs
a6601cb692
5.6.8RC1
2015-04-01 01:41:15 +02:00
Ferenc Kovacs
a5e68f72a7
5.6.9 is up next
2015-04-01 01:30:51 +02:00
Lior Kaplan
04c9271805
Add changelog entries for #68677 , #68739 & #68740
2015-04-01 01:55:35 +03:00
Lior Kaplan
c22543b3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68739 (Missing break / control flow in curl)
Fixed bug #68740 (NULL Pointer Dereference)
Fixed bug #68677 (Use After Free in OPcache)
2015-04-01 01:54:53 +03:00
Lior Kaplan
a32c8ba719
Fixed bug #68739 (Missing break / control flow).
...
Fixed bug #68740 (NULL Pointer Dereference).
Fixed bug #68677 (Use After Free).
2015-04-01 01:45:34 +03:00
Xinchen Hui
1add8401a3
Fixed bug #68739 (Missing break / control flow in curl)
...
(cherry picked from commit 124fb22a13 )
2015-04-01 01:24:26 +03:00
Xinchen Hui
059e774db0
Fixed bug #68740 (NULL Pointer Dereference)
...
(cherry picked from commit 124fb22a13 )
2015-04-01 01:24:26 +03:00
Xinchen Hui
0a8f28b432
Fixed bug #68677 (Use After Free in OPcache)
...
(cherry picked from commit 777c39f404 )
2015-04-01 01:24:16 +03:00
Derick Rethans
2d3868984c
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-31 16:35:10 +01:00
Derick Rethans
ffbd380e44
Fixed bug #69336 (Issues with "last day of <monthname>").
2015-03-31 16:35:03 +01:00
Julien Pauli
133c57198e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.25 now
2015-03-31 15:57:44 +02:00
Julien Pauli
97a1b34300
5.5.25 now
2015-03-31 15:51:47 +02:00
Derick Rethans
346c8f7331
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-31 11:09:23 +01:00
Derick Rethans
2c117a40a7
Export date_get_immutable_ce() so that extensions can make use of it too.
2015-03-31 11:08:56 +01:00
Lior Kaplan
0c1c7c7ecb
Align entries format
2015-03-31 09:26:34 +03:00
Lior Kaplan
b3d4790976
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
2015-03-31 09:24:56 +03:00
Lior Kaplan
96e33a7e98
Add CVE for bug #69207
2015-03-31 09:23:34 +03:00
Lior Kaplan
e5fd3fc99d
Align NEWS entries with 5.6.7
2015-03-31 09:20:29 +03:00
Lior Kaplan
90329a32dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Align entries format
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
Add CVE for bug #69207
2015-03-31 09:17:13 +03:00
Lior Kaplan
1bc77559f3
Align entries format
2015-03-31 09:14:06 +03:00
Lior Kaplan
8654fdd884
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
2015-03-31 09:12:05 +03:00
Lior Kaplan
639f92275a
Add CVE for bug #69207
2015-03-31 09:11:21 +03:00
Michael Wallner
b7389f0f07
BFN
2015-03-30 16:27:08 +02:00
Michael Wallner
a4490bb0a2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #64931
2015-03-30 16:25:47 +02:00
Michael Wallner
6480725007
Fixed bug #64931
...
phar_add_file is too restrive on filename
Check for any of '/', '\\', '\0' after ".phar".
2015-03-30 16:24:19 +02:00
Michael Wallner
a24aefaac2
BFN
2015-03-30 15:41:36 +02:00
Michael Wallner
3c22449649
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #65467
2015-03-30 15:41:03 +02:00
Michael Wallner
6de25c155e
Fixed Bug #65467
...
Call to undefined method cli_arg_typ_string
Use cli_arg_typ_filecontent instead.
2015-03-30 15:39:30 +02:00
Michael Wallner
64d9c98fa9
BFN
2015-03-30 14:43:02 +02:00
Michael Wallner
90a8b59e9c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bug #67761
2015-03-30 14:42:37 +02:00
Michael Wallner
8f7e378b9f
fix bug #67761
...
Phar::mapPhar fails for Phars inside a path containing ".tar".
Strengthen the silly .tar file extension check.
2015-03-30 14:41:30 +02:00
Michael Wallner
3a660bf3a5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug 64343
; Lesson learned: do not rebase on a merge commit
2015-03-30 13:48:57 +02:00
Michael Wallner
ef52e44053
Fixed bug 64343
...
PharData::extractTo fails for tarball created by BSD tar
Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.
2015-03-30 13:20:09 +02:00
Michael Wallner
f4264ebc64
Fixed bug 64343
...
PharData::extractTo fails for tarball created by BSD tar
Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.
2015-03-30 13:11:06 +02:00
Leigh
a04ab4b54b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add RAND_egd check for compiling against LibreSSL
2015-03-27 13:26:48 +01:00
Leigh
1b2d58a364
Add RAND_egd check for compiling against LibreSSL
2015-03-27 13:24:36 +01:00
Lior Kaplan
ebce0d5d5a
Add CVE for bug #68901
2015-03-25 19:32:25 +02:00
Lior Kaplan
67c5ad6b6a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add CVE for bug #68901
2015-03-25 19:31:05 +02:00
Lior Kaplan
bc0e5051e3
Add CVE for bug #68901
2015-03-25 19:26:40 +02:00
Xinchen Hui
d380d1cb1b
Fixed Bug #69297 (function_exists strange behavior with OPCache on disabled function)
...
is_callable returns true for disable_functions, but function_exists
return false for it.
2015-03-25 23:34:02 +08:00
Anatol Belski
7461c52248
updated NEWS
2015-03-25 13:14:42 +01:00
Anatol Belski
c9550e81da
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
fix dir separator in test
2015-03-25 13:13:42 +01:00
Anatol Belski
1b41dcf9c5
Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
2015-03-25 13:13:03 +01:00
Anatol Belski
8f9cb39cad
fix dir separator in test
2015-03-25 13:11:27 +01:00
Remi Collet
3924548bcb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
2015-03-25 10:33:31 +01:00
Remi Collet
1174b399ad
revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
2015-03-25 10:33:08 +01:00
Xinchen Hui
eb98366642
Fixed typo
2015-03-25 13:54:42 +08:00
Xinchen Hui
3ab1513ac9
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-25 13:54:30 +08:00
Xinchen Hui
23520d7957
Fixed typo
2015-03-25 13:54:12 +08:00
Xinchen Hui
3eb893396a
Update NEWS
2015-03-25 12:10:25 +08:00
Xinchen Hui
86bbacfd53
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-25 12:09:35 +08:00
Xinchen Hui
0e1024f25a
UPdate NEWS
2015-03-25 12:09:21 +08:00
Xinchen Hui
76c1ec5e96
Bug #69293 NEW segfault when using SoapClient::__setSoapHeader (bisected, regression)
...
This was a typo introduced in c8eaca013a
2015-03-25 12:07:25 +08:00
Anatol Belski
c2ec4f90d2
updated libs versions
2015-03-23 08:38:58 +01:00
Anatol Belski
8fe9715d05
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libs versions
2015-03-23 08:38:25 +01:00
Anatol Belski
a52385fc02
updated libs versions
2015-03-23 08:35:36 +01:00
Stanislav Malyshev
3342a248a2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed #68021 - get_browser() browser_name_regex
2015-03-22 22:13:08 -07:00
Tjerk Meesters
5b5742c016
Fixed #68021 - get_browser() browser_name_regex
...
Replaced expression delimiter with tilde (~) and escape where necessary.
2015-03-22 22:12:26 -07:00
Stanislav Malyshev
a1bca171d2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Print checking message for all ODBC drivers
Change default option of ODBC drivers to no to enable bulding standalone ODBC
Conflicts:
ext/odbc/config.m4
2015-03-22 22:04:41 -07:00
Lior Kaplan
6f5ed34d20
Print checking message for all ODBC drivers
...
This makes the output more readble in case no ODBC driver was selected
2015-03-22 22:03:38 -07:00
Lior Kaplan
7a41574239
Change default option of ODBC drivers to no to enable bulding standalone ODBC
2015-03-22 22:03:29 -07:00
Stanislav Malyshev
57f835e148
oops, forgot TSRMLS_CC
2015-03-22 21:55:34 -07:00
lesniewskister
c12e031530
Reduce downstream patches
...
As per http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/php/5.6/patches/patch-ext_gd_libgd_gdcache_h?rev=1.1&content-type=text/x-cvsweb-markup
2015-03-22 21:33:45 -07:00
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
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 https://github.com/garyhouston/regex/commit/70bc2965604b6b8aaf260049e64c708dddf85334
2015-03-17 17:04:57 -07:00
Stanislav Malyshev
8b14d3052f
add test for bug #68976
2015-03-17 17:03:46 -07:00
Stanislav Malyshev
dbd1d79b68
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add NEWS
2015-03-17 13:24:45 -07:00
Stanislav Malyshev
6264f81a21
add NEWS
2015-03-17 13:24:17 -07:00
Stanislav Malyshev
33a5532b66
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
2015-03-17 13:23:51 -07:00
Stanislav Malyshev
d5e523f52f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
2015-03-17 13:22:12 -07:00
Stanislav Malyshev
646572d6d3
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
2015-03-17 13:20:22 -07:00
Stanislav Malyshev
3d00867bba
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
2015-03-17 13:09:08 -07:00
Stanislav Malyshev
3dfccd7ba5
update news
2015-03-17 13:07:40 -07:00
Stanislav Malyshev
4a2e613730
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
2015-03-17 13:06:17 -07:00
Stanislav Malyshev
bfb669891e
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
2015-03-17 13:05:43 -07:00
Stanislav Malyshev
3477568b4e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix tests
Fix bug #69207 - move_uploaded_file allows nulls in path
2015-03-17 12:58:00 -07:00
Stanislav Malyshev
34418222d7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix tests
2015-03-17 12:56:37 -07:00
Stanislav Malyshev
9ba4db5e5d
fix tests
2015-03-17 12:55:35 -07:00
Stanislav Malyshev
e55e40ca66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #69207 - move_uploaded_file allows nulls in path
2015-03-17 12:48:37 -07:00
Stanislav Malyshev
1291d6bbee
Fix bug #69207 - move_uploaded_file allows nulls in path
2015-03-17 12:47:58 -07:00
Anatol Belski
f040b48358
updated NEWS
2015-03-17 09:21:38 +01:00
Anatol Belski
a6a58dddc3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65406 Enchant broker plugins are in the wrong place in windows
2015-03-17 09:20:54 +01:00
Anatol Belski
0f18a15e89
Fixed bug #65406 Enchant broker plugins are in the wrong place in windows
2015-03-17 09:20:16 +01:00
Julien Pauli
2a50877428
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix flaws in session module
2015-03-16 16:01:12 +01:00
Julien Pauli
4dba99c226
Fix flaws in session module
2015-03-16 16:00:46 +01:00
Anatol Belski
8f898c0706
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
backport af2b0669 into 5.5
2015-03-16 08:34:14 +01:00
Anatol Belski
293d6e629d
backport af2b0669 into 5.5
2015-03-16 08:32:39 +01:00
Anatol Belski
af2b066911
libxml-2.9.2 compatibility
2015-03-15 18:38:50 +01:00
Anatol Belski
2ac31872ac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2015-03-14 18:30:32 +01:00
Anatol Belski
c21c8f369d
fix test
2015-03-14 18:29:59 +01:00
Nikita Popov
846c8059e6
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-14 09:18:31 +01:00
Jeff Welch
1e51c5411e
Fix #69203 : FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127
2015-03-14 09:17:36 +01:00
Xinchen Hui
96bb3b838c
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-14 11:31:53 +08:00
Xinchen Hui
5b87d52041
Fixed typo
2015-03-14 11:31:12 +08:00
Xinchen Hui
669c7104c3
Update NEWS
2015-03-14 00:53:51 +08:00
Xinchen Hui
396bc00caa
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-14 00:53:32 +08:00
Xinchen Hui
ed59370f0a
Little improvement, update NEWs, added test
2015-03-14 00:52:53 +08:00
Xinchen Hui
1b5ad03f66
Merge branch 'bug69227' of https://github.com/Vektah/php-src into PHP-5.5
2015-03-14 00:42:36 +08:00
Nikita Popov
4b930e156f
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-13 16:25:21 +01:00
Nikita Popov
a9d73f0646
Fixed bug #69221
...
A generator iterator can be created from different zvals - use
the object handle to manage references instead.
2015-03-13 16:23:53 +01:00
Vektah
482500b455
Fix a leak
2015-03-13 15:54:30 +11:00
Vektah
950d3d6e9b
Fix bug #69227 and #65967
...
This patch fixes a use (in zend_gc.c) after free (in spl_observer.c).
See https://bugs.php.net/bug.php?id=69227
2015-03-13 15:02:05 +11:00
Anatol Belski
8cc8d4830a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
create the php prefix if doesn't exist
2015-03-12 15:21:33 +01:00
Anatol Belski
6b643f0741
create the php prefix if doesn't exist
2015-03-12 15:20:53 +01:00
Daniel Lowrey
c661121459
Don't block on crypto data inside stream_select()
2015-03-11 09:44:07 -06:00
Xinchen Hui
d4f727d0f8
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-11 08:20:03 +08:00
Xinchen Hui
675606f1a6
Improve test script for #69212
2015-03-11 08:19:34 +08:00
Daniel Lowrey
3f6b12795c
Fix bug# 69215 (Crypto servers should send client CA list)
2015-03-10 18:13:10 -06:00
Nikita Popov
49bd45a2c1
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-10 18:19:27 +01:00
Nikita Popov
bc9f2fb8df
Fixed bug #69212
2015-03-10 18:17:56 +01:00
Dmitry Stogov
b52a2940af
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
We don't cache custom strems with callbacks anymore
2015-03-10 19:30:32 +03:00
Dmitry Stogov
c814b3294a
We don't cache custom strems with callbacks anymore
2015-03-10 19:25:30 +03:00
Xinchen Hui
25050e3b00
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-10 17:18:47 +08:00
Xinchen Hui
f074870f4e
Typo
2015-03-10 17:18:39 +08:00
Xinchen Hui
b5589d3fb4
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-10 17:06:05 +08:00
Xinchen Hui
6f4af2da29
Fixed test
2015-03-10 17:05:47 +08:00
Xinchen Hui
0584b2df3f
Update NEWS
2015-03-10 15:38:34 +08:00
Xinchen Hui
abb09693ac
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-10 15:37:14 +08:00
Xinchen Hui
6a6c273893
Fixed bug #66609 (php crashes with __get() and ++ operator in some cases)
2015-03-10 15:36:42 +08:00
Xinchen Hui
f6762192d2
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-10 10:44:07 +08:00
Xinchen Hui
22894e74c2
Fix is reverted (test fails in all branches)
2015-03-10 10:43:05 +08:00
Daniel Lowrey
69691cc8ca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix crypto stream timeout regressions
2015-03-09 15:55:33 -06:00
Daniel Lowrey
bbfd4a5e62
Fix crypto stream timeout regressions
2015-03-09 15:53:26 -06:00
Xinchen Hui
4ca14f681e
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-09 17:23:04 +08:00
Xinchen Hui
9af1383a3f
Revert "Fix #63486 "
...
This reverts commit f4c96ffcb5 .
2015-03-09 17:22:56 +08:00
Xinchen Hui
711ee5e4e1
Update NEWs
2015-03-09 17:13:47 +08:00
Xinchen Hui
b0ec8dfd0d
Update news
2015-03-09 17:09:57 +08:00
Jeff Welch
66a2c528fe
Fix #69202 : FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used.
2015-03-09 17:08:35 +08:00
Stanislav Malyshev
0f333fa93c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added missing parentheses
Fix #67626
Fix #63486
Conflicts:
main/streams/userspace.c
2015-03-08 23:41:30 -07:00
Masaki Kagaya
934d6ed900
added missing parentheses
...
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
2015-03-08 23:40:56 -07:00
Julien Pauli
7d47d9fe23
Fix #67626
2015-03-08 23:40:55 -07:00
Julien Pauli
7684d72df8
Fix #63486
2015-03-08 23:40:55 -07:00
Masaki Kagaya
fa72f1ea86
added missing parentheses
...
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
2015-03-08 23:39:04 -07:00
Stanislav Malyshev
a8da0a9620
Merge branch 'pull-request/1104' into PHP-5.5
...
* pull-request/1104:
Fix #63486
2015-03-08 23:21:53 -07:00
Stanislav Malyshev
43b426fbc4
Merge branch 'pull-request/1106' into PHP-5.5
...
* pull-request/1106:
Fix #67626
2015-03-08 22:52:21 -07:00
Stanislav Malyshev
dcc031470a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Regression tests for SplFileInfo class setters
2015-03-08 17:13:25 -07:00
Stanislav Malyshev
a2a20d29a8
Merge branch 'pull-request/1134' into PHP-5.5
...
* pull-request/1134:
Regression tests for SplFileInfo class setters
2015-03-08 17:13:02 -07:00
Stanislav Malyshev
b0d1e23646
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add missing value for error_reporting directive
2015-03-08 17:05:51 -07:00
Stanislav Malyshev
d7931f8f66
Merge branch 'pull-request/1130' into PHP-5.5
...
* pull-request/1130:
Add missing value for error_reporting directive
2015-03-08 17:05:37 -07:00
Remi Collet
43da0d302b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix odbc build as shared
2015-03-08 07:36:35 +01:00
Remi Collet
89f86119d6
Fix odbc build as shared
...
Broken since a41aa46759
2015-03-08 07:34:51 +01:00
Daniel Lowrey
0928bad9ac
Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
2015-03-06 11:29:56 -07:00
Tjerk Meesters
469b5a9584
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68917 (parse_url fails on some partial urls)
2015-03-06 20:58:20 +08:00
Tjerk Meesters
d7fb52ea20
Fixed bug #68917 (parse_url fails on some partial urls)
2015-03-06 20:51:22 +08:00
Daniel Lowrey
e82878a200
Update test to run locally instead of remotely
2015-03-05 22:00:38 -07:00
Daniel Lowrey
10bc5fd4c4
Fixed bug ( #69195 Inconsistent stream crypto values across versions)
...
PHP 5.6.0 altered the semantics of the following constants:
- STREAM_CRYPTO_METHOD_SSLv23_CLIENT
- STREAM_CRYPTO_METHOD_SSLv23_SERVER
- STREAM_CRYPTO_METHOD_TLS_CLIENT
- STREAM_CRYPTO_METHOD_TLS_SERVER
Instead of representing the SSLv23_*() handshake methods the v23
constants were changed to allow only SSLv2 or SSLv3 connections.
Likewise, the TLS methods were modified from using only the TLSv1
handshake to allowing TLS1,1.1, and 1.2. This created a situation
in which users upgrading from previous versions faced a potential
security degradation if they did not update code to use different
constants. In the interest of compatibility across PHP versions
the original semantics have been restored with the following
caveat:
**IMPORTANT**
The SSLv23 client/server methods will no longer negotiate the use
of the insecure SSLv2 or SSLv3 protocols by default. Users wishing
to allow these protocols must explicitly add them to the method
bitmask via the appropriate flags.
2015-03-05 21:09:39 -07:00
Chris Wright
e7df9d710c
Fix stream_select() issue with OpenSSL buffer
...
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
2015-03-05 17:18:14 -07:00
Daniel Lowrey
ca24d19a89
Really fix zts this time
2015-03-05 14:09:25 -07:00
Ferenc Kovacs
33828f002d
re-arrange NEWS
2015-03-05 21:07:05 +01:00
Daniel Lowrey
c985ec737d
Fix ZTS
2015-03-05 12:19:15 -07:00
Daniel Lowrey
010f17534f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix ZTS build
2015-03-05 12:13:33 -07:00
Daniel Lowrey
e892f5382f
Fix ZTS build
2015-03-05 12:12:55 -07:00
Ferenc Kovacs
d4d05c8919
5.6.8 up next
2015-03-05 19:07:23 +01:00
Daniel Lowrey
5939de35a8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67403 (Add signatureType to openssl_x509_parse)
5.5.24 now
Conflicts:
configure.in
main/php_version.h
2015-03-05 10:21:32 -07:00
Daniel Lowrey
94140afa69
Fix bug #67403 (Add signatureType to openssl_x509_parse)
2015-03-05 10:09:06 -07:00
Julien Pauli
0f334a1265
5.5.24 now
2015-03-05 14:13:39 +01:00
Xinchen Hui
e8e5913e5e
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-05 21:06:07 +08:00
Xinchen Hui
869f8bd24b
Error also maybe happened here
2015-03-05 21:05:26 +08:00
Xinchen Hui
7bcdbcf98e
Revert commit to zend signal by mistake
2015-03-05 19:04:43 +08:00
Xinchen Hui
56f9dc2d59
Update NEWs
2015-03-05 18:40:25 +08:00
Xinchen Hui
168be6f250
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-05 18:40:06 +08:00
Xinchen Hui
f039225597
Fixed bug #69174 (leaks when unused inner class use traits precedence)
2015-03-05 18:39:50 +08:00
Rasmus Lerdorf
eaa1b3e614
This test fails with multibyte on because it spews
...
a conversion error on the bogus file
2015-03-05 00:45:42 -08:00
Daniel Lowrey
65a9a5ca12
Fixed bug #68265 (SAN match fails with trailing DNS dot)
2015-03-04 23:55:42 -07:00
Daniel Lowrey
1de1ff75f5
Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6
...
* 'PHP-5.6' of https://github.com/bjori/php-src :
hexadecimal is case*in*sensitive
2015-03-04 22:55:22 -07:00
Daniel Lowrey
5dcace058a
Fixed bug #68879 (IP Address fields in subjectAltNames not used)
2015-03-04 22:39:25 -07:00
Daniel Lowrey
ca766e0787
Fix broken test
2015-03-04 22:37:07 -07:00
Hannes Magnusson
3c2c029bfd
hexadecimal is case*in*sensitive
2015-03-04 16:03:45 -08:00
Daniel Lowrey
241f3c34b8
Fixed bug #68920 (use strict peer_fingerprint input checks)
2015-03-04 12:47:46 -07:00
Xinchen Hui
a29b64fc10
Fixed bug #69159 (Opcache causes problem when passing a variable variable to a function)
2015-03-04 14:48:41 +08:00
Xinchen Hui
6183408031
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-03 23:17:37 +08:00
nathan r. hruby
837eeefee9
Make killing a locker an ERROR event
...
At least in apache, killing a locker with SIGKILL from inside opcache prevents
the child process from emitting a corresponding log event to the access or
error logs, therefore requests are termed with no record. This makes is
incredibly difficult to debug problems espically on systems with high counts
of cache restarts. Since INFO level is far too noisy for production use,
switch the killing to a higher level so we can see it easier.
2015-03-03 23:16:45 +08:00
Reeze Xia
808e562f23
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:/php-src:
2015-03-03 16:28:01 +08:00
Reeze Xia
6cb3b941df
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Improve fix for bug 67741
Added type checks
Added type checks
2015-03-03 16:27:35 +08:00
Reeze Xia
304fb7a3d6
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:/php-src:
Added type checks
Added type checks
2015-03-03 16:27:04 +08:00
Reeze Xia
860fc3947f
Improve fix for bug 67741
...
Thanks to laruence.
2015-03-03 16:25:43 +08:00
Dmitry Stogov
c433f19a6b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added type checks
2015-03-03 10:46:55 +03:00
Dmitry Stogov
b3ac352253
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added type checks
2015-03-03 10:45:07 +03:00
Dmitry Stogov
c8eaca013a
Added type checks
2015-03-03 10:43:48 +03:00
Dmitry Stogov
5c03e05692
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Update NEWS
2015-03-03 10:20:21 +03:00
Dmitry Stogov
66c883c0fd
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Update NEWS
2015-03-03 10:19:54 +03:00
Dmitry Stogov
26827a0111
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added type checks
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
Check variable type before its usage as IS_ARRAY.
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-03-03 09:59:32 +03:00
Dmitry Stogov
035d80523f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added type checks
Conflicts:
ext/soap/soap.c
2015-03-03 09:52:21 +03:00
Dmitry Stogov
0c136a2abd
Added type checks
2015-03-03 09:44:46 +03:00
Reeze Xia
f353162ca2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
Check variable type before its usage as IS_ARRAY.
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
Conflicts:
NEWS
2015-03-03 14:37:06 +08:00
Reeze Xia
bb466d57ae
Update NEWS
2015-03-03 14:22:03 +08:00
Reeze Xia
4e2c87edb3
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
...
This also fixes bug #54081
2015-03-03 11:43:23 +08:00
Reeze Xia
34f09b6240
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
...
This also fixes bug #54081
2015-03-03 11:25:30 +08:00
Jeremy Mikola
dea7bc8786
Regression tests for SplFileInfo class setters
...
Adds tests for SplFileInfo class setters accepting either the base and child classes, and throwing an exception for unexpected classes.
Related: http://svn.php.net/viewvc?view=revision&revision=336017 and https://github.com/facebook/hhvm/pull/4917
2015-03-02 14:45:26 -05:00
Dmitry Stogov
fc1f24b7a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Check variable type before its usage as IS_ARRAY.
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-03-02 12:30:38 +03:00
Dmitry Stogov
d5248f67b5
Check variable type before its usage as IS_ARRAY.
2015-03-02 12:27:36 +03:00
Xinchen Hui
169ac35c66
Update NEWS
2015-03-01 23:17:57 +08:00
Xinchen Hui
672a396d4a
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/standard/var_unserializer.c
2015-03-01 23:17:41 +08:00
Xinchen Hui
caebb76131
Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize)
2015-03-01 23:16:15 +08:00
Lior Kaplan
1a35c959a9
Add missing value for error_reporting directive
2015-03-01 15:16:53 +02:00
Lior Kaplan
aaaa905912
Align entries format for 5.6.7
2015-03-01 11:36:01 +02:00
Lior Kaplan
041b472d6f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Align entries format for 5.5.23
2015-03-01 11:34:11 +02:00
Lior Kaplan
55f7747bff
Align entries format for 5.5.23
2015-03-01 11:32:09 +02:00
Reeze Xia
214350f4f4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bump header year
2015-03-01 15:08:20 +08:00
Reeze Xia
c98eb695b5
Bump header year
2015-03-01 15:03:21 +08:00
Reeze Xia
6ef477f947
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
2015-02-28 16:45:44 +08:00
Reeze Xia
8b0cf0d7fa
Update NEWS
2015-02-28 16:45:26 +08:00
Reeze Xia
1b240ff9e3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
2015-02-28 16:40:06 +08:00
Reeze Xia
f824f91ac9
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
...
This include:
- setcookie (missing "httponly")
- setrawcookie (missing "httponly")
- spl_autoload_register (missing 2 optional params)
- mktime (missing "is_dst")
- gmmktime (missing "is_dst")
2015-02-28 16:37:14 +08:00
Nikita Popov
b41b229d78
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 23:23:49 +01:00
Дмитрий Пацура
e9c6798721
Fix ARG_INFO for levenshtein
...
This can work with 2 parameters (require)
refs http://php.net/manual/ru/function.levenshtein.php
refs https://github.com/phalcon/zephir/issues/753
2015-02-27 23:23:24 +01:00
Xinchen Hui
4119879a39
Update NEWS
2015-02-27 23:33:23 +08:00
Xinchen Hui
86ba1a2444
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 23:32:59 +08:00
Xinchen Hui
997b7e5630
Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()).
2015-02-27 23:32:32 +08:00
Xinchen Hui
578903578c
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 12:03:00 +08:00
Xinchen Hui
4eb830b212
Reorder
2015-02-27 12:02:42 +08:00
Xinchen Hui
414bc8ee03
Update NEWs
2015-02-27 12:01:28 +08:00
Xinchen Hui
d377cb6207
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 12:01:05 +08:00
Xinchen Hui
ebfc49aa91
Fixed bug #69121 (Segfault in get_current_user when script owner is not in passwd with ZTS build)
2015-02-27 12:00:52 +08:00
Xinchen Hui
4b83d02b4b
Update News
2015-02-27 11:43:41 +08:00
Xinchen Hui
cfaf7c3b5f
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 11:42:57 +08:00
Xinchen Hui
3e82816ba1
Fixed bug #69125 (Array numeric string as key)
2015-02-27 11:42:36 +08:00
Xinchen Hui
2d1a3ecd27
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 11:11:45 +08:00
Taoguang Chen
e441d71baa
fix bug#68942's patch
...
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
2015-02-27 10:41:53 +08:00
George Wang
65810bf259
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-02-25 11:24:19 -05:00
George Wang
f13a88ac13
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-02-25 11:23:36 -05:00
George Wang
8584cc010a
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-02-25 10:48:19 -05:00
Xinchen Hui
9502d67a8e
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-25 20:49:17 +08:00
Xinchen Hui
34d397e267
better name
2015-02-25 20:49:07 +08:00
Xinchen Hui
d3615b5fb1
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/opcache/tests/bug69038.phpt
2015-02-25 20:13:47 +08:00
Xinchen Hui
d508ff9640
Improve fix for #69038
2015-02-25 20:07:02 +08:00
Xinchen Hui
d05575afd0
Update NEWs
2015-02-25 18:22:41 +08:00
Xinchen Hui
9641bac0f5
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-25 18:22:18 +08:00
Xinchen Hui
ffdc5728c8
Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage)
2015-02-25 18:21:59 +08:00
Julien Pauli
caacaee681
Updated NEWS
2015-02-23 11:23:48 +01:00
Julien Pauli
5256ffd4fe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
curl: add new proxy constants
2015-02-23 11:23:00 +01:00
Julien Pauli
1bfbb546f7
updated NEWS
2015-02-23 11:22:44 +01:00
Linus Unnebäck
63ab6d8249
curl: add new proxy constants
2015-02-23 11:19:36 +01:00
Julien Pauli
ee2f749a22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test fails for bug68557
2015-02-23 10:35:35 +01:00
Xinchen Hui
d5a1a3342b
Fixed test fails for bug68557
2015-02-23 10:35:16 +01:00
Jakub Zelenka
97d809a8a5
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/json/json.c
2015-02-22 20:35:03 +00:00
Jakub Zelenka
591dbcabe5
Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e)
2015-02-22 20:22:47 +00:00
Rasmus Lerdorf
7ea5b3f71c
NEWS entry
2015-02-22 08:32:32 -08:00
Rasmus Lerdorf
ffd2fda0f3
NEWS entry
2015-02-22 08:31:17 -08:00
Rasmus Lerdorf
a9ba407ce1
Fix bug #68166
...
We can't always efree here
php_escape_html_entities can return an interned_empty_string
2015-02-22 08:25:56 -08:00
Rasmus Lerdorf
e12b72d3f7
Fix bug #68166
...
We can't always efree here
php_escape_html_entities can return an interned_empty_string
2015-02-22 08:14:41 -08:00
Anatol Belski
98959f6220
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
2015-02-22 16:47:56 +01:00
Anatol Belski
871d51929b
updated NEWS
2015-02-22 16:47:44 +01:00
Anatol Belski
8f6a013c97
updated NEWS
2015-02-22 16:46:39 +01:00
Anatol Belski
e656932d0e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 16:26:52 +01:00
Anatol Belski
68afd75ecd
Merge branch 'pull-request/1112' into PHP-5.5
2015-02-22 16:26:02 +01:00
Grant Pannell
7988f703f8
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 23:34:55 +10:30
Anatol Belski
3cf2b7cc2b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
revisit fix for bug #65272
Conflicts:
ext/standard/file.c
2015-02-21 14:14:24 +01:00
Anatol Belski
6751f8b314
revisit fix for bug #65272
2015-02-21 14:10:59 +01:00
Julien Pauli
c4c3dca302
Fix #67626
2015-02-20 16:07:40 +01:00
Anatol Belski
b21d0848c9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
split test for bug #68557 for windows
2015-02-20 16:02:07 +01:00
Anatol Belski
3082177bee
split test for bug #68557 for windows
2015-02-20 16:01:34 +01:00
Julien Pauli
95be012dce
Updated NEWS
2015-02-20 15:44:18 +01:00
Julien Pauli
46e5f0c6bb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2015-02-20 15:43:53 +01:00
Julien Pauli
6393556a5d
Updated NEWS
2015-02-20 15:43:38 +01:00
Julien Pauli
13c3b78f1e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix #68557
2015-02-20 15:38:48 +01:00
Julien Pauli
c111d1cd70
fix #68557
2015-02-20 15:09:35 +01:00
Julien Pauli
f4c96ffcb5
Fix #63486
2015-02-20 13:38:35 +01:00
Dmitry Stogov
90421b0d5b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed type mismatch
2015-02-20 10:32:34 +03:00
Dmitry Stogov
9fb48edf3c
Fixed type mismatch
2015-02-20 10:31:24 +03:00
Ferenc Kovacs
97dd859c9c
update NEWS to match the actual stuff in 5.6.6
2015-02-18 20:10:28 +01:00
Ferenc Kovacs
d58e76fd69
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS to match the actual stuff in 5.5.22
2015-02-18 20:09:12 +01:00
Ferenc Kovacs
3d777c8068
update NEWS to match the actual stuff in 5.5.22
2015-02-18 20:08:46 +01:00
Ferenc Kovacs
73a9c701ad
update NEWS(add missing entry for the enchant fix, and reorder the entries a bit)
2015-02-18 19:52:00 +01:00
Ferenc Kovacs
3261995092
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix typo in bug#
add CVE
5.4.39 next
2015-02-18 19:49:23 +01:00
Ferenc Kovacs
24be46323b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo in bug#
add CVE
5.4.39 next
Conflicts:
configure.in
main/php_version.h
2015-02-18 19:48:50 +01:00
Ferenc Kovacs
c17a17e44b
fix typo in bug#
2015-02-18 19:47:07 +01:00
Ferenc Kovacs
c0a5905522
update NEWS
2015-02-18 19:39:58 +01:00
Ferenc Kovacs
920de2cbe8
fix email format
2015-02-18 19:20:13 +01:00
Ferenc Kovacs
941c1a5fa8
update NEWS
2015-02-18 16:33:32 +01:00
Ferenc Kovacs
4bae11b533
update 5.6.6 release date in NEWS
2015-02-18 16:32:57 +01:00
Ferenc Kovacs
68128efa4b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
2015-02-18 16:32:23 +01:00
Ferenc Kovacs
08b6fe9ef1
Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
2015-02-18 16:24:09 +01:00
Michael Wallner
6dfc7cbe61
BFN
2015-02-18 14:08:52 +01:00
Michael Wallner
ec7ba48e67
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2015-02-18 14:06:39 +01:00
Michael Wallner
83dda66aac
fix test
2015-02-18 14:06:32 +01:00
Michael Wallner
23e4af185a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2015-02-18 14:05:02 +01:00
Michael Wallner
8b6919c77c
fix test
2015-02-18 14:04:53 +01:00
Michael Wallner
0d2a2b98c9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
2015-02-18 13:59:32 +01:00
Michael Wallner
225af964c0
Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
2015-02-18 13:58:31 +01:00
Julien Pauli
f977a9f2be
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2015-02-18 12:41:47 +01:00
Julien Pauli
73c2e9153a
Updated NEWS
2015-02-18 12:40:38 +01:00
Remi Collet
c6a26cb39d
add CVE
2015-02-18 06:44:41 +01:00
Xinchen Hui
97f8c78b09
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
2015-02-17 21:17:06 +08:00
Xinchen Hui
ed1967c706
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
2015-02-17 21:16:53 +08:00
Xinchen Hui
e22759b1e5
Replace var is introduced
2015-02-17 21:16:37 +08:00
Stanislav Malyshev
0a331f49c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix TS build
2015-02-17 07:47:27 +01:00
Stanislav Malyshev
213725057e
fix TS build
2015-02-17 07:47:12 +01:00
Stanislav Malyshev
24f8a68d0a
5.4.39 next
2015-02-17 07:34:00 +01:00
Stanislav Malyshev
c538a2eb12
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
2015-02-17 06:58:24 +01:00
Stanislav Malyshev
2e8cd42974
update news
2015-02-17 06:58:14 +01:00
Stanislav Malyshev
78389b29f9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
Port for for bug #68552
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
- BFN
2015-02-17 06:57:50 +01:00
Stanislav Malyshev
cf7d8eabcc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Port for for bug #68552
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
- BFN
2015-02-17 06:53:48 +01:00
Stanislav Malyshev
29a4e710de
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
2015-02-17 06:53:27 +01:00
Stanislav Malyshev
bdfe457a2c
Port for for bug #68552
2015-02-17 06:53:02 +01:00
Stanislav Malyshev
7b18981830
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
...
Conflicts:
ext/date/php_date.c
2015-02-17 06:43:51 +01:00
Xinchen Hui
dec83ea4ac
Update NEWS
2015-02-17 11:36:44 +08:00
Xinchen Hui
1c0fa36c61
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-17 11:36:15 +08:00
Xinchen Hui
66d3095993
Fixed bug #69038 (switch(SOMECONSTANT) misbehaves)
2015-02-17 11:34:57 +08:00
Felipe Pena
82d347a477
- BFN
2015-02-17 01:14:05 -02:00
Felipe Pena
f6e9ed76ae
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
2015-02-17 01:08:48 -02:00
Felipe Pena
94742054a8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
Update NEWS
2015-02-17 01:08:07 -02:00
Felipe Pena
0c01fca444
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
Update NEWS
2015-02-17 00:28:28 -02:00
Felipe Pena
a331ae4630
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
Update NEWS
2015-02-17 00:28:11 -02:00
Felipe Pena
8f9ab04d93
- Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
2015-02-17 00:23:47 -02:00
Felipe Pena
abbc82f448
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fix merge
BFN
2015-02-16 13:09:52 -02:00
Felipe Pena
35a68c276d
- Fix merge
2015-02-16 13:09:40 -02:00
Felipe Pena
e08bef442c
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
2015-02-16 13:07:26 -02:00
Antony Dovgal
dbf7d525a5
BFN
2015-02-16 15:23:13 +03:00
Antony Dovgal
1d94cd4bfa
Merge branch 'pull-request/995' into PHP-5.5
...
* pull-request/995:
fix bug #68822 (request time is reset too early)
2015-02-16 15:20:39 +03:00
Antony Dovgal
c4664d1731
Merge branch 'pull-request/995' into PHP-5.6
...
* pull-request/995:
fix bug #68822 (request time is reset too early)
2015-02-16 15:15:11 +03:00
redfoxli
3664345aba
fix bug #68822 (request time is reset too early)
...
this caused wrong time in the logs
2015-02-16 15:10:09 +03:00
Xinchen Hui
8309988111
Fixed bug #68912 (Segmentation fault at openssl_spki_new)
2015-02-16 14:16:52 +08:00
Xinchen Hui
423a057023
Update NEWs
2015-02-15 23:00:34 +08:00
Xinchen Hui
edd16831b1
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-15 22:55:42 +08:00
Xinchen Hui
a620b79040
Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters)
2015-02-15 22:54:05 +08:00
Michael Wallner
4137956d0e
fix detection of mbstate_t with clang
...
AC_TRY_COMPILE expexts a function body
2015-02-15 09:25:03 +01:00
Xinchen Hui
1db720cd6d
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/pgsql/pgsql.c
2015-02-14 22:18:13 +08:00
Xinchen Hui
7667f8efc6
Fixed bug #68638 (pg_update() fails to store infinite values)
2015-02-14 22:17:01 +08:00
Xinchen Hui
40a94597ae
Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5
2015-02-14 22:03:53 +08:00
Yasuo Ohgaki
c0dd221a3a
Update NEWS
2015-02-14 05:41:04 +09:00
Yasuo Ohgaki
d0be36cf5b
Update NEWS
2015-02-14 05:40:51 +09:00
Yasuo Ohgaki
5b6269a253
Update NEWS
2015-02-14 05:34:57 +09:00
Yasuo Ohgaki
a54300b3f6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add NULL byte protection to exec, system and passthru
2015-02-14 05:27:44 +09:00
Yasuo Ohgaki
3ea76a768c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NULL byte protection to exec, system and passthru
2015-02-14 05:26:54 +09:00
Yasuo Ohgaki
a8722f5330
Add NULL byte protection to exec, system and passthru
2015-02-14 05:25:04 +09:00
Anatol Belski
b3d28d14d6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix condition
2015-02-13 13:40:10 +01:00
Anatol Belski
5ff77b005b
fix condition
2015-02-13 13:39:46 +01:00
Xinchen Hui
adc4265792
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-13 13:12:44 +08:00
Xinchen Hui
3a71fa36a2
Micro opt
2015-02-13 13:09:56 +08:00
Xinchen Hui
371c016986
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
2015-02-13 12:54:04 +08:00
Xinchen Hui
68ab716f18
Fixed #69015 (php-cgi's getopt does not see $argv)
...
No test script is added because of complicated
2015-02-13 12:53:34 +08:00
William Felipe Welter
0421404b73
Fixed bug #68638 pg_update() fails to store infinite values
...
Fix indent
2015-02-12 23:39:54 -02:00
Anatol Belski
d05070c98d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
backport gd config.w32 to support freetype 2.5
2015-02-12 20:29:24 +01:00
Anatol Belski
b5aca81de1
backport gd config.w32 to support freetype 2.5
2015-02-12 20:27:48 +01:00
Xinchen Hui
3ae88e023c
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-12 11:28:30 +08:00
Xinchen Hui
c2062ca470
Added test for #69017
2015-02-12 11:28:16 +08:00
Xinchen Hui
7062465be0
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-12 10:59:59 +08:00
Xinchen Hui
f2940b7120
Fixed bug #69017 (Fail to push to the empty array with the constant value defined in class scope)
2015-02-12 10:59:28 +08:00
Lior Kaplan
c741faf4bb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #55508 was fixed in 5.5.19 with 15ba757a , not in 5.5.18
Add missing NEWS entry for revert of bug #41631
Add missing NEWS entry for bug #68027
Align format for bug #68799
Bug #68361 was fixed in 5.5.20 using 327d4f9a , not in 5.5.19
Bug #55618 was fixed in 5.5.21 using eaf107c0
Add security bugs fixed in 5.5.18
Add CVE ID to bug #68676
Align email format for recent NEWS entries
2015-02-11 22:30:48 +02:00
Lior Kaplan
701a5f9de9
Add missing NEWS entry for revert of bug #41631
2015-02-11 14:02:55 +02:00
Lior Kaplan
b17e2b8214
Add CVE ID to bug #68676
2015-02-11 14:01:55 +02:00
Lior Kaplan
27d6cf4860
Align email format for recent NEWS entries
2015-02-11 14:01:16 +02:00
Lior Kaplan
e6d8bad618
Bug #55508 was fixed in 5.5.19 with 15ba757a, not in 5.5.18
...
See https://github.com/php/php-src/pull/631#issuecomment-61969527
2015-02-11 13:20:44 +02:00
Lior Kaplan
1ebf6fba42
Add missing NEWS entry for revert of bug #41631
2015-02-11 13:15:18 +02:00
Lior Kaplan
b582aa9a44
Add missing NEWS entry for bug #68027
2015-02-11 13:13:03 +02:00
Lior Kaplan
bb16a6b2c2
Align format for bug #68799
2015-02-11 13:11:55 +02:00
Lior Kaplan
f0b329df50
Bug #68361 was fixed in 5.5.20 using 327d4f9a, not in 5.5.19
2015-02-11 13:08:19 +02:00
Lior Kaplan
7bcf62a05b
Bug #55618 was fixed in 5.5.21 using eaf107c0
2015-02-11 13:04:32 +02:00
Lior Kaplan
0d68d0a69b
Add security bugs fixed in 5.5.18
2015-02-11 12:02:39 +02:00
Lior Kaplan
e06da17931
Add CVE ID to bug #68676
2015-02-11 12:00:19 +02:00
Lior Kaplan
e7c7788e20
Align email format for recent NEWS entries
2015-02-11 11:05:02 +02:00
Anatol Belski
4d8db154ad
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2015-02-10 16:59:22 +01:00
Anatol Belski
bc3e88b9af
fix dir separator in test
2015-02-10 16:58:59 +01:00
Ferenc Kovacs
5e1bb07701
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
oops, forgot sudo for make install
2015-02-10 11:18:34 +01:00
Ferenc Kovacs
bf9fb65001
oops, forgot sudo for make install
2015-02-10 11:18:19 +01:00
Ferenc Kovacs
ac54df17df
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add make install
Conflicts:
travis/compile.sh
2015-02-10 10:36:25 +01:00
Ferenc Kovacs
a8d001aedf
add make install
2015-02-10 10:34:52 +01:00
William Felipe Welter
60d5cdf137
Fixed bug #68638 pg_update() fails to store infinite values
...
Check if value is "infinity" with strcasestr() to add quotes
2015-02-09 20:35:18 -02:00
Daniel Lowrey
fb2314798e
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/openssl/xp_ssl.c
2015-02-09 11:44:09 -05:00
Daniel Lowrey
f2b12424c0
NEWS
2015-02-09 11:42:40 -05:00
Daniel Lowrey
1eef4f2a0c
Miscellaneous cleanup
2015-02-09 11:42:17 -05:00
Daniel Lowrey
a8cb1d2b85
Merge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5
2015-02-09 11:40:04 -05:00
Xinchen Hui
3d1ec33f96
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-09 11:32:32 +08:00
Xinchen Hui
d078c59ed9
Merge branch 'improve-bug67436' of https://github.com/reeze/php-src into PHP-5.5
2015-02-09 11:31:59 +08:00
Bob Weinand
fc444fbc70
Shut up, my lovely compiler; I do not like your warnings
...
Conflicts:
Zend/zend_object_handlers.c
2015-02-09 11:23:35 +08:00
Anatol Belski
979020fcad
moved the part of the test into an appropriate place
2015-02-08 14:10:52 +01:00
Anatol Belski
ffdc2c4123
Merge branch 'pull-request/1060' into PHP-5.6
2015-02-08 12:33:15 +01:00
manuel
cc13d8696f
Fix another invalid free of CG(interned_empty_string)
...
Fixes #68214
2015-02-07 19:17:31 +01:00
manuel
3550cc5fd9
add tests for #68996
2015-02-07 18:52:26 +01:00
George Wang
c90cd09331
Fixed #68790 (Missing return)
2015-02-07 12:19:53 -05:00
George Wang
c892127f76
Fixed #68790 (Missing return)
2015-02-07 12:18:42 -05:00
George Wang
5e3f0f5671
Fixed #68790 (Missing return)
2015-02-07 12:16:54 -05:00
Reeze Xia
4d034b1a1e
Improve tests for bug 67436
...
I always use a.php or b.php for local testing,
this diff makes the test more stable
2015-02-07 14:11:09 +08:00
William Felipe Welter
bb3a81c4b4
Fixed bug #68638 pg_update() fails to store infinite values.
...
Add quotes only if "infinity" values are received.
2015-02-07 01:26:12 -02:00
Anatol Belski
464667153d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix setting default ODBCVER value in config.w32
2015-02-06 19:59:55 +01:00
Anatol Belski
9bf95d8291
fix setting default ODBCVER value in config.w32
2015-02-06 19:59:14 +01:00
Anatol Belski
e6d16c0956
updated NEWS
2015-02-06 19:39:32 +01:00
Anatol Belski
4266f5b1c4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
2015-02-06 19:39:10 +01:00
Anatol Belski
f4319a4f73
updated NEWS
2015-02-06 19:37:01 +01:00
Anatol Belski
e46e208819
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
2015-02-06 19:05:13 +01:00
Anatol Belski
a41aa46759
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
...
This is done in two steps:
- the ODBCVER has to be rased to 0x0300 which corresponds to Sql
Server 9, otherwise the client will not recognize several SQL
datatypes
- additionally the config scripts was tweaked so then ODBCVER
can be overridden, that still allows enabling compatibility
with lower versions
Bug #67437 might be fixed by this as well.
2015-02-06 19:00:27 +01:00
manuel
13fc7f20a4
Invalid free of CG(interned_empty_string)
...
On failure php_escape_html_entities returns STR_EMPTY_ALLOC which is an
alias of CG(interned_empty_string) if interned strings are enabled.
Make sure we don't free this.
2015-02-06 16:53:01 +01:00
Anatol Belski
63761ab91e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Removed erroneous condition
2015-02-06 09:42:41 +01:00
Anatol Belski
9ef0c39b2b
Removed erroneous condition
...
This condition is always false. Furthermore headers_list() is
documented to always return an array.
2015-02-06 09:41:02 +01:00
Stanislav Malyshev
af23980de7
turn off online tests, they fail too often on CI
2015-02-05 22:05:36 -08:00
Stanislav Malyshev
57ba83d4e0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix tests
2015-02-05 21:56:26 -08:00
Stanislav Malyshev
928fdbea08
fix tests
2015-02-05 21:54:47 -08:00
Stanislav Malyshev
a1c28567c6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update header handling to RFC 7230
2015-02-05 20:10:09 -08:00
Stanislav Malyshev
067340bbc8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update header handling to RFC 7230
2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073
Update header handling to RFC 7230
2015-02-05 20:08:12 -08:00
William Felipe Welter
b64f149176
Test case Bug #68638 pg_update() fails to store infinite values
2015-02-05 13:19:52 -02:00
Stanislav Malyshev
2c386b55f2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test to not hit php.net
2015-02-05 00:41:55 -08:00
Stanislav Malyshev
d33f4c6eb8
fix test to not hit php.net
2015-02-05 00:41:51 -08:00
Stanislav Malyshev
10b15f0f8b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Conflicts: main/streams/memory.c
2015-02-05 00:41:35 -08:00
Xinchen Hui
ae90010891
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/streams/memory.c
2015-02-05 16:33:20 +08:00
Nayana Hettiarachchi
5446377c6b
Conflicts:
...
main/streams/memory.c
2015-02-05 16:32:30 +08:00
Stanislav Malyshev
ee864f3301
fix test to not hit php.net
2015-02-05 00:11:44 -08:00
Julien Pauli
a79f332333
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2015-02-04 17:45:38 +01:00
Julien Pauli
959cecf046
Updated NEWS
2015-02-04 17:43:36 +01:00
Julien Pauli
583af4979b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
2015-02-04 17:39:34 +01:00
Julien Pauli
f51b73c833
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
...
This reverts commit 8e19705a93 .
2015-02-04 17:39:16 +01:00
Julien Pauli
421d309908
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.23 now
Conflicts:
configure.in
main/php_version.h
2015-02-04 17:32:46 +01:00
Julien Pauli
e6ea244004
5.6.7 now
2015-02-04 16:37:49 +01:00
Julien Pauli
b86529f751
5.5.23 now
2015-02-04 16:35:32 +01:00
Brad Broerman
dddbe0fc33
Update xp_ssl.c
...
Added TSRMLS_CC to php_openssl_sockop_io calls.
2015-02-04 10:13:36 -05:00
Julien Pauli
93315c4e1d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "json_decode() should generate a syntax error when given ""."
Update NEWS
2015-02-04 12:48:57 +01:00
Julien Pauli
c85f12e3ac
Revert "json_decode() should generate a syntax error when given ""."
...
This reverts commit a7b3abe4e6 .
2015-02-04 12:48:17 +01:00
Michael Wallner
4c3b4dc74a
make buildconf work as expected;
...
autoconf really needs some help with all those external m4s
2015-02-04 09:39:02 +01:00
William Felipe Welter
cb3833a3be
Fixed bug #68638 pg_update() fails to store infinite values.
...
Regex to check float values changed to accept "infinity" values
and ignore case. Quotes are added to prevent syntax error on
PostgreSQL.
2015-02-03 22:47:05 -02:00
Xinchen Hui
1bb7647c6e
Fixed indent
2015-02-03 23:24:34 +08:00
Yasuo Ohgaki
bffdc4c37e
Update NEWS
2015-02-03 19:48:53 +09:00
Yasuo Ohgaki
539fd65915
Update NEWS
2015-02-03 19:45:20 +09:00
Yasuo Ohgaki
436ba1c488
Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set.
2015-02-03 18:52:46 +09:00
Yasuo Ohgaki
36f73412c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #65199 pg_copy_from() modifies input array variable
2015-02-03 15:27:19 +09:00
Yasuo Ohgaki
f8a8ccaba2
Fixed Bug #65199 pg_copy_from() modifies input array variable
2015-02-03 15:26:02 +09:00
Yasuo Ohgaki
4dd7851208
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
2015-02-03 14:04:03 +09:00
Yasuo Ohgaki
b41a6c6f05
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
2015-02-03 14:02:58 +09:00
Yasuo Ohgaki
2983ef3c48
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68063 Empty session IDs do still start sessions
2015-02-03 13:41:31 +09:00
Yasuo Ohgaki
853ae39d6e
Fixed bug #68063 Empty session IDs do still start sessions
2015-02-03 13:38:49 +09:00
Yasuo Ohgaki
665997bf16
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #61470 is fixed only in master
2015-02-03 12:26:25 +09:00
Yasuo Ohgaki
17beba686e
Bug #61470 is fixed only in master
2015-02-03 12:26:01 +09:00
Daniel Lowrey
f86600c167
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/standard/file.c
2015-02-02 10:52:27 -05:00
Daniel Lowrey
f2f467bd96
Fixed bug #65272 : correctly set flock() out param in windows
2015-02-02 10:47:54 -05:00
Adam Harvey
05d591dfdf
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-02 11:31:54 +00:00
Adam Harvey
9d8b1170aa
Let's not assume bash is always /bin/bash.
2015-02-02 11:31:10 +00:00
Adam Harvey
db375cfd4d
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-02 11:11:05 +00:00
Adam Harvey
a7b3abe4e6
json_decode() should generate a syntax error when given "".
...
Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.
2015-02-02 11:07:34 +00:00
Yasuo Ohgaki
675a12bbcf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add test for bug #61470 . It is already fixed.
2015-02-02 18:39:48 +09:00
Yasuo Ohgaki
fb803ff819
Add test for bug #61470 . It is already fixed.
2015-02-02 18:39:07 +09:00
Stanislav Malyshev
969e389121
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix sizeof size
2015-02-01 12:41:33 -08:00
Stanislav Malyshev
0bfcc2829c
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
- Updated to version 2015.1 (2015a)
2015-02-01 12:41:10 -08:00
Stanislav Malyshev
f66f5b2ffa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix sizeof size
2015-02-01 12:41:00 -08:00
Stanislav Malyshev
7efbd70b03
fix sizeof size
2015-02-01 12:40:38 -08:00
Derick Rethans
263fb375bd
- Updated to version 2015.1 (2015a)
2015-02-01 18:31:21 +00:00
Derick Rethans
440cefd5a9
Empty merge
2015-02-01 18:31:21 +00:00
Derick Rethans
4d28d12f86
- Updated to version 2015.1 (2015a)
2015-02-01 18:31:19 +00:00
Stanislav Malyshev
ac3a4e4200
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66479 : Wrong response to FCGI_GET_VALUES
2015-02-01 00:36:21 -08:00
Frank Stolle
6a905a9a3c
Fix #66479 : Wrong response to FCGI_GET_VALUES
...
Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.
Conflicts:
sapi/cgi/fastcgi.c
2015-02-01 00:35:23 -08:00
Stanislav Malyshev
463611714c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
2015-02-01 00:09:04 -08:00
Martin Jansen
de31324c22
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
...
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to also have
the loader disabled.
With this change the loader is explicitely enabled in the request init
phase.
2015-02-01 00:08:35 -08:00
Stanislav Malyshev
c5526291ce
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix group name handling
2015-01-31 23:47:25 -08:00
Stanislav Malyshev
e5e251b023
fix group name handling
2015-01-31 23:47:03 -08:00
Stanislav Malyshev
55d5811f85
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix TSRM
2015-01-31 23:34:44 -08:00
Stanislav Malyshev
d82424b46f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TSRM
2015-01-31 23:34:27 -08:00
Stanislav Malyshev
94d6cb4a78
fix TSRM
2015-01-31 23:34:14 -08:00
Stanislav Malyshev
2560a21d41
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add NEWS
2015-01-31 23:20:14 -08:00
Stanislav Malyshev
380741daa4
add NEWS
2015-01-31 23:19:23 -08:00
Stanislav Malyshev
b64cafdb9e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
2015-01-31 23:17:24 -08:00
Danack
dbc0a80b23
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
2015-01-31 23:13:55 -08:00
Stanislav Malyshev
6a960b6d1b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018
Use better constant since MAXHOSTNAMELEN may mean shorter name
2015-01-31 21:46:56 -08:00
Stanislav Malyshev
2cdbd3537f
use right sizeof for memset
2015-01-31 21:30:58 -08:00
Stanislav Malyshev
41bdd6e7cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925 )
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:12:20 -08:00
Stanislav Malyshev
882a375dba
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:10:52 -08:00
Stanislav Malyshev
237128603f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:13 -08:00
Yasuo Ohgaki
d9a9afa499
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed typo in comment
2015-02-01 05:14:56 +09:00
Yasuo Ohgaki
c8a12508c7
Fixed typo in comment
2015-02-01 05:14:27 +09:00
Yasuo Ohgaki
7b06cc8d22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use bash rather than sh
2015-01-29 15:27:08 +09:00
Yasuo Ohgaki
d463ddd3c7
Use bash rather than sh
2015-01-29 15:21:17 +09:00
Brad Broerman
1482ed2d56
reneg and should_close are not yet members of sslsock. Removing...
2015-01-28 22:36:41 -05:00
Yasuo Ohgaki
5f28622e09
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:29:11 +09:00
Yasuo Ohgaki
abf9e2ea09
Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:25:28 +09:00
Xinchen Hui
c06f1590a9
Update News
2015-01-29 00:01:13 +08:00
Xinchen Hui
5208113ad1
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-29 00:01:00 +08:00
Xinchen Hui
b2cf3f064b
Fixed bug #68901 (use after free)
2015-01-29 00:00:09 +08:00
Brad Broerman
fd4641696c
Updated with SSL fixes (backported from trunk)
2015-01-28 00:04:20 -05:00
Xinchen Hui
b881de9937
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:25:45 +08:00
Xinchen Hui
4c5995b172
fcgi_write in fpm returns ssizt_t, but it returns int in cgi
2015-01-27 22:25:38 +08:00
Xinchen Hui
92d56b0af6
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:20:03 +08:00
Xinchen Hui
c3ff9aa17d
Revert previous unintentional change to this
2015-01-27 22:19:11 +08:00
Xinchen Hui
4f187dd44f
Update NEWs
2015-01-27 22:13:30 +08:00
Xinchen Hui
6336fa18c4
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:13:04 +08:00
Xinchen Hui
8c2d91761a
Also Fixed #68571 in CGI SAPI, and some cleanup
2015-01-27 22:11:23 +08:00
Xinchen Hui
6c87372199
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
2015-01-27 22:04:23 +08:00
Bob Weinand
666cb333f7
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
2015-01-26 22:51:37 +01:00
Bob Weinand
3f57663b57
Add NEWS entry
2015-01-26 22:50:16 +01:00
Bob Weinand
b8461eb9ac
Fix call after close if multiple filters are attached
2015-01-26 22:47:35 +01:00
Keyur Govande
168877bc78
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add NEWS
Patch commit d9f85373e32 by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
Conflicts:
ext/mysqlnd/config9.m4
2015-01-26 21:32:32 +00:00
Keyur Govande
d065a2fc1b
Add NEWS
2015-01-26 21:29:57 +00:00
Keyur Govande
4c6918ec17
Patch commit d9f85373e32 by moving the float_to_double function to
...
a header file.
2015-01-26 21:20:29 +00:00
Keyur Govande
b34f8ef599
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
...
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
2015-01-26 21:20:29 +00:00
Keyur Govande
1933b556b9
Patch commit d9f85373e32 by moving the float_to_double function to
...
a header file.
2015-01-26 21:19:00 +00:00
Keyur Govande
e51980f4e6
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
...
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
2015-01-26 21:19:00 +00:00
Ferenc Kovacs
49cc1d4e84
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix some factual errors in the process
2015-01-22 21:28:41 +01:00
Ferenc Kovacs
f014785eeb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix some factual errors in the process
2015-01-22 21:28:21 +01:00
Ferenc Kovacs
61ad5e24ea
fix some factual errors in the process
2015-01-22 21:27:38 +01:00
Remi Collet
b318e54fac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
move CVE to the right version
2015-01-22 13:06:50 +01:00
Remi Collet
2955993947
move CVE to the right version
2015-01-22 13:06:15 +01:00
Anatol Belski
093a23d1c4
Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
...
The fix for bug #67647 applies here, too.
2015-01-22 12:26:50 +01:00
Anatol Belski
c9d0894ec5
Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly
2015-01-22 11:48:11 +01:00
Anatol Belski
60c2621b2a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
simplify error handling for dirs as magic
2015-01-22 10:17:14 +01:00
Anatol Belski
43652d386a
simplify error handling for dirs as magic
2015-01-22 10:16:13 +01:00
Anatol Belski
a2e83332b9
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2015-01-22 10:04:33 +01:00
Anatol Belski
a97ca0a452
updated NEWS
2015-01-22 10:01:16 +01:00
Anatol Belski
d0e75bdc59
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68827 Double free with disabled ZMM
Fixed segfault while running with moodle
2015-01-22 10:00:10 +01:00
Joshua Rogers
91aa340180
Fixed bug #68827 Double free with disabled ZMM
2015-01-22 09:59:13 +01:00
Xinchen Hui
d0928b7f97
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-22 16:39:03 +08:00
Xinchen Hui
251745c012
Fixed segfault while running with moodle
2015-01-22 16:38:34 +08:00
Rasmus Lerdorf
e242f871df
Slightly modify and merge PR#105 from @MegaManSec
2015-01-21 11:40:27 -08:00
Anatol Belski
24157f396c
fix timelib build configuration
2015-01-21 16:22:23 +01:00
Anatol Belski
bd52f4a833
make timelib_config.h inclusion configurable
2015-01-21 13:48:38 +01:00
Julien Pauli
bb2380edb7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2015-01-21 11:13:55 +01:00
Julien Pauli
88f2321a25
Updated NEWS
2015-01-21 11:10:20 +01:00
Anatol Belski
9c88a214a4
backported the timelib cleanups to 5.6
2015-01-21 11:03:16 +01:00
Xinchen Hui
57ff5a4e6f
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-21 11:18:08 +08:00
Xinchen Hui
20e5911d82
Fixed test fails
2015-01-21 11:17:49 +08:00
Ferenc Kovacs
ea44ccbd62
fix NEWS
2015-01-21 01:19:31 +01:00
Derick Rethans
1d09926e33
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-20 21:44:25 +00:00
Derick Rethans
8e19705a93
Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)
2015-01-20 21:44:19 +00:00
Stanislav Malyshev
73a5958e67
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix year
2015-01-20 13:27:51 -08:00
Stanislav Malyshev
cca3c8a985
fix year
2015-01-20 13:27:38 -08:00
Stanislav Malyshev
b2a254fe2d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
format
add CVE
2015-01-20 11:59:35 -08:00
Stanislav Malyshev
53b3db43ca
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
format
2015-01-20 11:57:50 -08:00
Stanislav Malyshev
04dcc705de
update NEWS
2015-01-20 11:57:39 -08:00
Stanislav Malyshev
b3b155ffe2
format
2015-01-20 11:57:17 -08:00
Stanislav Malyshev
295b42b76e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add CVE
2015-01-20 11:55:04 -08:00
Stanislav Malyshev
547f62ed2a
add CVE
2015-01-20 11:54:45 -08:00
Stanislav Malyshev
c9162147f2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add protection against nulls
2015-01-20 11:47:06 -08:00
Stanislav Malyshev
a3cb69d63e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add protection against nulls
2015-01-20 11:46:39 -08:00
Stanislav Malyshev
ef4896d956
add protection against nulls
2015-01-20 11:46:10 -08:00
Stanislav Malyshev
e18ec95687
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.38 next
Fix bug #68799 : Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
ext/standard/var_unserializer.c
2015-01-20 10:40:39 -08:00
Stanislav Malyshev
e2744c51b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.38 next
Fix bug #68799 : Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
configure.in
main/php_version.h
2015-01-20 10:40:11 -08:00
Stanislav Malyshev
8825311ce1
5.4.38 next
2015-01-20 10:38:33 -08:00
Julien Pauli
b5e2661fb6
Updated NEWS
2015-01-20 15:09:59 +01:00
Julien Pauli
157508d87d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
2015-01-20 15:09:34 +01:00
Julien Pauli
a40e004553
Updated NEWS
2015-01-20 15:09:13 +01:00
Joshua Rogers
df67c4e8bd
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
2015-01-20 14:54:48 +01:00
Stanislav Malyshev
e63f7b47e1
Merge branch 'bug68710' into PHP-5.4
...
* bug68710:
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
2015-01-20 01:02:26 -08:00
Stanislav Malyshev
fc6aa939f5
Merge branch 'bug68799' into PHP-5.4
...
* bug68799:
Fix bug #68799 : Free called on unitialized pointer
2015-01-20 01:00:11 -08:00
Derick Rethans
6f2f2ce5cf
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-19 22:59:31 +00:00
Derick Rethans
b0159431e3
Fixed bug #45081 (strtotime incorrectly interprets SGT time zone).
2015-01-19 22:59:24 +00:00
Juan Basso
ac7cfad3b5
Fixed bug #50224 where float without decimals were converted to integer
2015-01-19 00:46:02 -08:00
Matteo Beccati
6de149e47c
Updated NEWS for #68371
2015-01-18 09:13:02 +01:00
Xinchen Hui
b118d7b697
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-17 13:21:36 +08:00
Xinchen Hui
fa3808bacc
Update year
2015-01-17 13:21:20 +08:00
Anatol Belski
25041d2af2
updated NEWS
2015-01-15 17:48:59 +01:00
Anatol Belski
3d6a83a7d0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
2015-01-15 17:48:11 +01:00
Anatol Belski
0cef7d168d
updated NEWS
2015-01-15 16:42:52 +01:00
steffen
7c9633412e
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
...
Unix uses "127.0.0.1" as default host for named pipes,
while when using Windows a "." is required as host by mysqlnd.
(This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)
2015-01-15 16:42:51 +01:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
fe8edf760c
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-15 23:26:24 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Daniel Lowrey
5d8acad006
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Fixed bug #55618 (use case-insensitive cert name matching)
2015-01-14 18:09:07 +01:00
Daniel Lowrey
80a337bba1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
Fixed bug #55618 (use case-insensitive cert name matching)
2015-01-14 18:04:41 +01:00
Daniel Lowrey
0a76610459
Update NEWS
2015-01-14 18:03:27 +01:00
Daniel Lowrey
e2fe8e164f
Fixed bug #55618 (use case-insensitive cert name matching)
2015-01-14 18:02:50 +01:00
Xinchen Hui
0645f106e9
Update NEWS
2015-01-13 23:38:57 +08:00
Anatol Belski
edb66e05db
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68771 SQL syntax error in sqlite lib
2015-01-12 17:02:18 +01:00
Anatol Belski
ef58622534
Fixed bug #68771 SQL syntax error in sqlite lib
2015-01-12 16:55:47 +01:00
Anatol Belski
344a61a613
updated libs_versions.txt
2015-01-12 12:59:59 +01:00
Anatol Belski
7a2dbc0e7c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libs_versions.txt
Fix bug #68784
We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions
2015-01-12 12:58:37 +01:00
Anatol Belski
2923f24042
updated libs_versions.txt
2015-01-12 12:58:00 +01:00
Stanislav Malyshev
2fc178cf44
Fix bug #68799 : Free called on unitialized pointer
2015-01-11 00:51:05 -08:00
Rasmus Lerdorf
5065505c93
Fix bug #68784
2015-01-09 18:09:13 -08:00
Rasmus Lerdorf
e4b3d623a2
Fix bug #68784
2015-01-09 18:08:36 -08:00
Rasmus Lerdorf
46f429f8e6
We can't output absolute S and T values for the
...
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
2015-01-09 16:23:50 -08:00
Rasmus Lerdorf
3b9057bc6f
We can't output absolute S and T values for the
...
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
2015-01-09 16:16:47 -08:00
Julien Pauli
287217a3a3
Updated NEWS
2015-01-09 16:25:02 +01:00
Julien Pauli
138b6442d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68260
2015-01-09 16:24:32 +01:00
Julien Pauli
dc810543cf
Fix bug #68260
2015-01-09 16:24:14 +01:00
Xinchen Hui
0547edb5c2
Fixed bug (try block removed while combined with xdebug)
2015-01-09 11:53:47 +08:00
Adam Harvey
16b6f6c7f4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Calling crypt() with a salt of *0 should always return *1.
5.5.22 now
Conflicts:
configure.in
main/php_version.h
2015-01-08 19:16:32 +00:00
Adam Harvey
8b0f105761
Calling crypt() with a salt of *0 should always return *1.
2015-01-08 19:13:23 +00:00
Anatol Belski
2e79820c0e
fix test
2015-01-08 18:11:15 +01:00
Julien Pauli
3f1d1892c9
5.5.22 now
2015-01-07 10:42:53 +01:00
Ferenc Kovacs
b0a26ab8f8
PHP-5.6.6 is next
2015-01-06 22:58:22 +01:00
Remi Collet
0ba32e5cf9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
cleanup old unused typedef
2015-01-06 11:06:53 +01:00
Remi Collet
8404f8ac2a
cleanup old unused typedef
2015-01-06 11:06:25 +01:00
Adam Harvey
27ff425b78
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.
Conflicts:
sapi/cli/tests/php_cli_server.inc
2015-01-06 01:27:37 +00:00
Adam Harvey
448ef30f75
Handle NULL strings in sapi_cli_server_register_variable().
...
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
2015-01-06 01:23:27 +00:00
Adam Harvey
0cc2810498
Allow CLI server test scripts to specify the name of the router file.
...
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
2015-01-06 01:22:59 +00:00
Anatol Belski
4756207e7e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix ACLs tests, make it create dir where it has to, not file
2015-01-05 19:20:07 +01:00
Anatol Belski
339139f876
fix ACLs tests, make it create dir where it has to, not file
2015-01-05 19:19:24 +01:00
Remi Collet
480044a0ea
NEWS
2015-01-05 17:35:36 +01:00
Remi Collet
eb1a1d5feb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:35:14 +01:00
Remi Collet
4bb580adb1
NEWS
2015-01-05 17:34:45 +01:00
Remi Collet
1b6d076244
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:33:57 +01:00
Matteo Beccati
38f1b569c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update test after fixing bug #68371
2015-01-05 12:11:46 +01:00
Matteo Beccati
ea1c0c5627
Update test after fixing bug #68371
2015-01-05 12:11:16 +01:00
Matteo Beccati
e372e037dd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS for #68371
2015-01-05 11:03:31 +01:00
Matteo Beccati
4a9ad2faff
Updated NEWS for #68371
2015-01-05 11:01:54 +01:00
Matteo Beccati
3de6f80ff5
Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
2015-01-05 11:00:11 +01:00
Matteo Beccati
488d3dac2e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:18 +01:00
Matteo Beccati
7d2f8525d8
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 09:25:48 +01:00
Stanislav Malyshev
95183cc339
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix memory leak
2015-01-04 21:08:16 -08:00
Stanislav Malyshev
184b6d9e73
fix memory leak
2015-01-04 21:07:57 -08:00
Stanislav Malyshev
ec550cd783
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
2015-01-04 20:55:17 -08:00
Stanislav Malyshev
eeae4651f7
Merge branch 'pull-request/975' into PHP-5.5
...
* pull-request/975:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
2015-01-04 20:54:29 -08:00
Stanislav Malyshev
97f894e189
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix GD tests with no GD loaded
Fixed typo
GD: imagepalettetotruecolor tests
2015-01-04 19:57:29 -08:00
Stanislav Malyshev
5639c3350e
Merge branch 'pull-request/742' into PHP-5.5
...
* pull-request/742:
Fixed typo
GD: imagepalettetotruecolor tests
2015-01-04 19:47:54 -08:00
Stanislav Malyshev
75f93ed663
fix GD tests with no GD loaded
2015-01-04 19:45:57 -08:00
Anatol Belski
03ae6f22b6
updated libmagic.patch in 5.6
2015-01-04 17:07:32 +01:00
Anatol Belski
d104f2ea88
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libmagic.patch in 5.5
updated libmagic.patch in 5.4
2015-01-04 17:06:15 +01:00
Anatol Belski
4ed261870f
updated libmagic.patch in 5.5
2015-01-04 17:05:42 +01:00
Anatol Belski
c772261319
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch in 5.4
2015-01-04 17:04:53 +01:00
Anatol Belski
ebb98e7aeb
updated libmagic.patch in 5.4
2015-01-04 17:04:13 +01:00
Anatol Belski
5c0f03275e
updated NEWS
2015-01-04 14:24:59 +01:00
Anatol Belski
28e44f9d44
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access
2015-01-04 14:23:56 +01:00
Anatol Belski
d3f171117c
updated NEWS
2015-01-04 14:23:33 +01:00
Anatol Belski
5fe54dbaf9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #68735 fileinfo out-of-bounds memory access
2015-01-04 14:22:37 +01:00
Anatol Belski
ede59c8feb
Fixed bug #68735 fileinfo out-of-bounds memory access
2015-01-04 14:20:21 +01:00
Anatol Belski
c06f66563a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
removed dead code
Conflicts:
ext/fileinfo/libmagic/readelf.c
ext/fileinfo/libmagic/readelf.h
2015-01-04 09:42:46 +01:00
Anatol Belski
b644dcfb72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed dead code
2015-01-04 09:40:56 +01:00
Remi Collet
919abf0cb1
removed dead code
2015-01-04 09:40:19 +01:00
Ferenc Kovacs
83db775323
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
2015-01-03 19:18:07 +01:00
Ferenc Kovacs
fe46966678
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixes #67960 - Long/short day names reversed in jddayofweek()
2015-01-02 10:15:01 +01:00
Greg Roach
244fc1e053
Fixes #67960 - Long/short day names reversed in jddayofweek()
2015-01-02 10:14:12 +01:00
Stanislav Malyshev
b585a3aed7
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
2015-01-01 16:19:05 -08:00
Anatol Belski
ce6cbb3110
updated libmagic.patch
2014-12-30 20:22:51 +01:00
Anatol Belski
a0cf63f526
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libmagic.patch
2014-12-30 20:22:08 +01:00
Anatol Belski
99162b8198
updated libmagic.patch
2014-12-30 20:21:28 +01:00
Anatol Belski
85b4a65520
updated NEWS
2014-12-30 19:39:14 +01:00
Anatol Belski
091ea62262
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68671 incorrect expression in libmagic
2014-12-30 19:38:08 +01:00
Anatol Belski
d92a87d7cb
Fixed bug #68671 incorrect expression in libmagic
2014-12-30 19:37:27 +01:00
Adam Harvey
3ef6e3726c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Check the return value of lo_export.
2014-12-30 17:59:39 +00:00
Adam Harvey
211f4ceeae
Check the return value of lo_export.
...
Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure).
2014-12-30 17:47:19 +00:00
Anatol Belski
ab3a746a2d
updated NEWS
2014-12-30 16:52:17 +01:00
Anatol Belski
3485925a3a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
remove BOM from NEWS
2014-12-30 16:51:06 +01:00
Anatol Belski
d5123415f6
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
2014-12-30 16:50:22 +01:00
Anatol Belski
6e36ded569
remove BOM from NEWS
2014-12-30 16:47:10 +01:00
Stanislav Malyshev
4c0f17caca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
FIx bug #68618 (out of bounds read crashes php-cgi)
Fixed bug #68676 (Explicit Double Free)
2014-12-30 01:26:53 -08:00
Stanislav Malyshev
71c970077d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
FIx bug #68618 (out of bounds read crashes php-cgi)
2014-12-30 01:26:00 -08:00
Stanislav Malyshev
f9ad308669
FIx bug #68618 (out of bounds read crashes php-cgi)
2014-12-30 01:23:05 -08:00
Kalle Sommer Nielsen
fbf3a6bc1a
Fixed bug #68676 (Explicit Double Free)
2014-12-29 11:04:23 +01:00
Kalle Sommer Nielsen
24125f0f26
Fixed bug #68676 (Explicit Double Free)
2014-12-29 10:57:42 +01:00
Anatol Belski
422f323982
updated NEWs
2014-12-28 14:00:58 +01:00
Anatol Belski
a72cd07f29
Fixed bug #68665 (Invalid free)
2014-12-28 13:58:01 +01:00
Keyur Govande
83e5547827
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix for failing tests. gcc 4.8.3 would optimize away the assigment.
2014-12-26 20:37:50 +00:00
Keyur Govande
aa192f57c9
Fix for failing tests. gcc 4.8.3 would optimize away the assigment.
2014-12-26 20:36:19 +00:00
Remi Collet
76d6c4f9ec
NEWS
2014-12-26 08:35:08 +01:00
Remi Collet
faba230153
Fix bug #68656 Report gd library version
2014-12-26 08:33:21 +01:00
Xinchen Hui
316f72ce28
Merge branch 'PHP-5.5' into PHP-5.6
2014-12-25 06:21:14 -05:00
Xinchen Hui
80260bcfa6
Fixed test
2014-12-25 06:20:52 -05:00
Xinchen Hui
bba4a8aad5
Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8 + Opcache)
2014-12-24 17:55:58 +08:00
Nikita Popov
87ccf50bad
Merge branch 'PHP-5.5' into PHP-5.6
2014-12-19 21:46:38 +01:00
Nikita Popov
aa394e70ff
Fix bug #67111
...
Loop variables need to be freed for both "break" and "continue".
I'm adding the test to Zend/ because it's good to have a test for
this even without opcache.
2014-12-19 21:42:42 +01:00
Remi Collet
f382fbf4c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
2014-12-17 11:00:52 +01:00
Remi Collet
5fc2fede9c
Better fix for #68601 for perf
...
https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
2014-12-17 10:59:36 +01:00
Ferenc Kovacs
ffae8f1549
move this entry to the correct version
2014-12-17 02:18:29 +01:00
Ferenc Kovacs
54b3871b11
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add missing NEWS entry
add missing NEWS entry
5.4.37
2014-12-17 02:14:25 +01:00
Ferenc Kovacs
5a67d9a229
add missing NEWS entry
2014-12-17 02:13:59 +01:00
Ferenc Kovacs
925fa271ec
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add missing NEWS entry
5.4.37
Conflicts:
configure.in
main/php_version.h
2014-12-17 02:13:13 +01:00
Ferenc Kovacs
cd387b4575
add missing NEWS entry
2014-12-17 02:10:36 +01:00
Ferenc Kovacs
c6a7d1eaed
add NEWS entry for #68594
2014-12-17 01:59:38 +01:00
Stanislav Malyshev
8fe4cc6d28
5.4.37
2014-12-16 11:44:41 -08:00
Stanislav Malyshev
681a1afd3f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
2014-12-16 10:19:32 -08:00
Stanislav Malyshev
8efd73c4d2
update news
2014-12-16 10:18:07 -08:00
Stanislav Malyshev
622a346302
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
2014-12-16 10:17:07 -08:00
Stanislav Malyshev
53f129a44d
add CVE
2014-12-16 10:16:31 -08:00
Stanislav Malyshev
b75867fff0
add missing test file
2014-12-16 10:15:17 -08:00
Stanislav Malyshev
630f9c33c2
Fix bug #68594 - Use after free vulnerability in unserialize()
2014-12-16 10:15:17 -08:00
Remi Collet
181f34f375
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix perms
2014-12-16 08:37:56 +01:00
Remi Collet
9c4de388c6
fix perms
2014-12-16 08:37:48 +01:00
Remi Collet
505adabf25
fix typo
2014-12-14 09:22:59 +01:00
Andrea Faulds
51771ed238
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-13 22:30:19 +00:00
Andrea Faulds
f804a3614e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
NEWS
2014-12-13 22:28:45 +00:00
Andrea Faulds
034e6decb3
Fix undefined behaviour in strnatcmp
2014-12-13 22:27:10 +00:00
Remi Collet
2e5de0c323
NEWS
2014-12-13 09:05:48 +01:00
Remi Collet
8bd67ce748
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68601 buffer read overflow in gd_gif_in.c
2014-12-13 09:05:33 +01:00
Remi Collet
ba62b9bbf8
NEWS
2014-12-13 09:04:57 +01:00
Remi Collet
07b5896a13
Fix bug #68601 buffer read overflow in gd_gif_in.c
2014-12-13 09:03:44 +01:00
Julien Pauli
3769aee67c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
2014-12-12 18:24:16 +01:00
Jille Timmermans
9beb3763db
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
2014-12-12 18:16:12 +01:00
Julien Pauli
238529fc3e
Updated NEWS
2014-12-12 16:51:37 +01:00
Julien Pauli
a0d848f795
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:50:42 +01:00
Julien Pauli
d43d0663af
Updated NEWS
2014-12-12 16:50:32 +01:00
mcq8
86f1875536
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:42:38 +01:00
Julien Pauli
4cda98264e
Updated NEWS
2014-12-12 16:12:52 +01:00
Julien Pauli
d5dd29ce5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Conflicts:
Zend/zend_compile.c
2014-12-12 16:11:26 +01:00
Julien Pauli
d6eb3b49c8
Updated NEWS
2014-12-12 15:06:04 +01:00
Kévin Dunglas
ee226b961c
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
2014-12-12 14:58:23 +01:00
Julien Pauli
d1a2c15221
Updated NEWS
2014-12-12 14:20:41 +01:00
Julien Pauli
895b4efab0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2014-12-12 14:18:43 +01:00
Julien Pauli
fbe9b2c088
Updated NEWS
2014-12-12 14:18:27 +01:00
Anatol Belski
b1709b8ff0
updated NEWS
2014-12-12 12:17:42 +01:00
Anatol Belski
c96ffaa653
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68583 Crash in timeout thread
Conflicts:
Zend/zend_execute.h
2014-12-12 12:05:47 +01:00
Anatol Belski
3affc0e8a2
Fixed bug #68583 Crash in timeout thread
...
This replaces the GUI element used for execution timeout handling
on Windows. Instead a timer queue technique is used, which is indeed
a thread pool. A timer queue timer is a lightweight object handled
but that thread pool and the timer thread spends most of the time
sleeping and waiting for an alert.
Please note also that this introduces neither binary nor source
breach. The custom timeout thread functions are deleted, however
they was not exported throug DLL, so couldn't be used by any
external code. As well they couldn't be used anywhere in the core
except in executor api, because those custom timeout thread
functions they used to operate on static variables which would
be overwritten (and that would blow).
So instead a relatively modern technique is used for the timeout
handling. It's still not perfect because the executor still has to
check EX(timed_out). This can be a topic for an improvement in
master. But brobably can be tricky as currently it seems to be not
possible to signal an individual thread. Also note another issue
that static variables aren't thread safe, but the current timer
implementation is.
2014-12-12 10:43:31 +01:00
Stanislav Malyshev
97df260b27
update NEWS
2014-12-11 10:41:17 -08:00
Anatol Belski
0323f66fa2
move the test to the right place
2014-12-11 10:39:47 -08:00
Anatol Belski
13f1c276ab
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-11 10:39:37 -08:00
redfoxli
7953d830ab
follow C89 format
2014-12-10 21:58:57 +08:00
Anatol Belski
21da246807
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
move the test to the right place
2014-12-10 13:22:52 +01:00
Anatol Belski
c5f7dcd1dc
move the test to the right place
2014-12-10 13:19:51 +01:00
Anatol Belski
a96957f0da
updated NEWS
2014-12-10 11:49:13 +01:00
Anatol Belski
4a82cdce66
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
ext/standard/var_unserializer.c
2014-12-10 11:47:34 +01:00
Anatol Belski
20d93534d5
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-10 11:43:33 +01:00
Julien Pauli
e6f9059a86
Updated NEWS
2014-12-10 11:23:40 +01:00
Julien Pauli
9a1fc445bf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2014-12-10 11:22:46 +01:00
Julien Pauli
a67a5dc0ad
Updated NEWS
2014-12-10 11:22:28 +01:00
Remi Collet
eda813fd37
NEWS
2014-12-10 08:19:04 +01:00
Remi Collet
744ada7d9d
Fix bug #68526 Implement POSIX Access Control List for UDS
...
- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option
Keep old behavior (chmod) if option not used or not supported.
2014-12-10 08:15:21 +01:00
redfoxli
d0a58695d0
fix-bug-68571-to-php5.5
2014-12-09 19:42:55 +08:00
Derick Rethans
9d4f4483cb
Merge branch 'PHP-5.5' into PHP-5.6
2014-12-08 11:06:50 +00:00
Derick Rethans
4078c35939
Merge branch 'day-of-week-issues' into PHP-5.5
2014-12-08 11:06:41 +00:00
Derick Rethans
5f9a68d3ef
Fixed day_of_week function as it could sometimes return negative values internally.
2014-12-08 11:06:12 +00:00
Dmitry Stogov
278c38165c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed possible read after end of buffer and use after free.
2014-12-08 12:24:16 +03:00
Dmitry Stogov
e6ad29ae96
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed possible read after end of buffer and use after free.
2014-12-08 12:20:01 +03:00
Dmitry Stogov
dd791cd717
Fixed possible read after end of buffer and use after free.
2014-12-08 12:18:27 +03:00
Anatol Belski
41a2f7074d
Fixed bug #68398 msooxml matches too many archives
2014-12-06 20:51:00 +01:00
Anatol Belski
0854fd8b81
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-12-06 12:31:55 +01:00
Anatol Belski
5d126245a3
fixed test
2014-12-06 12:31:27 +01:00
Anatol Belski
08241ee3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
2014-12-06 12:18:05 +01:00
Anatol Belski
9016018ccc
C89 compat
2014-12-06 12:14:17 +01:00
Anatol Belski
373aa7c81f
add include for missing localeconv_r proto
2014-12-06 12:09:35 +01:00
Anatol Belski
8d79139980
updated NEWS
2014-12-06 12:00:39 +01:00
Anatol Belski
ebaf130a15
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65230 setting locale randomly broken
2014-12-06 12:00:17 +01:00
Anatol Belski
1b4d5ad46a
Fixed bug #65230 setting locale randomly broken
2014-12-06 11:59:43 +01:00
Matteo Beccati
b120f9beb2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix compilation error (ref #68424 )
2014-12-06 10:24:27 +01:00
Matteo Beccati
625b929c6e
Fix compilation error (ref #68424 )
2014-12-06 10:23:56 +01:00
Adam Harvey
381fd62ccf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert unintentional docblock change
2014-12-05 13:58:19 -08:00
Adam Harvey
79131b4617
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert unintentional docblock change
2014-12-05 13:57:46 -08:00
Chris Christoff
0e985d3726
Revert unintentional docblock change
...
Revert unintentional docblock change
It looks like commit dd8e59da8f
introduced an unintended docbloc change. I have reverted this
change in this commit.
2014-12-05 13:57:03 -08:00
Julien Pauli
0e67973e9a
Updated NEWS
2014-12-05 17:06:16 +01:00
Julien Pauli
5104c2bbc3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Start adding new attribute to control multi statements
2014-12-05 17:05:37 +01:00
Julien Pauli
3add3491b3
Updated NEWS
2014-12-05 17:05:21 +01:00
pwolanin
4c0bd5e77a
Start adding new attribute to control multi statements
2014-12-05 17:03:31 +01:00
Anatol Belski
a3e4b889e7
updated NEWS
2014-12-05 15:51:26 +01:00
Anatol Belski
297f582f5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
. Fixed bug #68120 Update bundled libsqlite
Conflicts:
ext/sqlite3/libsqlite/sqlite3.c
2014-12-05 15:50:18 +01:00
Anatol Belski
fccd1eda5f
. Fixed bug #68120 Update bundled libsqlite
2014-12-05 15:43:53 +01:00
Anatol Belski
0e09e5e6fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:08:55 +01:00
Anatol Belski
fa863c9ea3
updated NEWS
2014-12-05 11:08:32 +01:00
Anatol Belski
7943f944c2
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:06:06 +01:00
Julien Pauli
cb9cc6b8e1
Updated NEWS
2014-12-05 10:12:35 +01:00
Julien Pauli
ee709c5366
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
2014-12-05 10:12:08 +01:00
Julien Pauli
1e40b0aff6
Updated NEWS
2014-12-05 10:11:49 +01:00
Peter Cowburn
557026301f
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
2014-12-05 10:10:10 +01:00
Anatol Belski
6cf5ac7567
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separators in test
2014-12-05 07:08:35 +01:00
Anatol Belski
c65143d571
fix dir separators in test
2014-12-05 07:07:58 +01:00
Ferenc Kovacs
9c5d84ace1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add initial install
switch to C travis project instead of PHP
use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/ )
2014-12-04 11:12:32 +01:00
Ferenc Kovacs
4f9f7c7948
Merge branch 'pull-request/932' into PHP-5.5
...
* pull-request/932:
add initial install
switch to C travis project instead of PHP
use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/ )
2014-12-04 11:12:17 +01:00
Tjerk Meesters
52b41f24e3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed #65213 - cannot cast SplFileInfo to boolean
2014-12-04 07:21:13 +08:00
Tjerk Meesters
2bcf8a6cd9
Fixed #65213 - cannot cast SplFileInfo to boolean
2014-12-04 07:17:33 +08:00
Ferenc Kovacs
a8b49bbf18
add initial install
2014-12-04 00:13:38 +01:00
Ferenc Kovacs
b0f7a46b21
switch to C travis project instead of PHP
2014-12-04 00:08:04 +01:00
Ferenc Kovacs
43c36bdb73
use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/ )
2014-12-04 00:07:32 +01:00
Anatol Belski
5deac25ea0
updated NEWS
2014-12-03 16:48:49 +01:00
Anatol Belski
f3b4c05423
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #55541 errors spawn MessageBox, which blocks test automation
2014-12-03 16:48:07 +01:00
Anatol Belski
13aaba40cd
updated NEWS
2014-12-03 16:47:38 +01:00
Anatol Belski
65fce7f950
Fixed bug #55541 errors spawn MessageBox, which blocks test automation
...
With that, also fixed bug #68297 (Application Popup provides too few
information) as a better error message is provided to the event log.
In the second case, the condition for display_startup_error was removed. The
condition was added as a fix for bug #30760 which was preventing the
MessageBox to appear. When display_startup_error=on, the error will be seen
on the console. But when running under a webserver it'll probably get lost,
so we need to log it other way into the event log (would be done automatically
when message box was used, but that would eventually cause issues of blocked
execution).
Generally speaking - any MessageBox or other graphical element is a potential
issue and that was repeatedly reported. Graphical elements shouldn't be used
in the core. Even being a rare one it can cause a bad situation where the
server is blocked. Yet some places have to cleaned up.
2014-12-03 16:33:05 +01:00
Dmitry Stogov
cd68c4b1d2
Fixed __debugInfo() support
2014-12-03 12:13:01 +03:00
Adam Harvey
e346608209
Update UPGRADING for the new variadic functions, and re-sort.
2014-12-02 16:47:31 -08:00
Ferenc Kovacs
d81b7c4450
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
2014-12-02 19:19:16 +01:00
Ferenc Kovacs
4d743eee5f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Conflicts:
run-tests.php
2014-12-02 19:18:57 +01:00
Ferenc Kovacs
b28c3eb47e
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
2014-12-02 19:17:58 +01:00
Remi Collet
196b768928
NEWS
2014-12-02 08:40:52 +01:00
Remi Collet
6f3714a8fc
Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
...
Covered by ext/standard/tests/strings/pack64.phpt
2014-12-02 08:38:39 +01:00
Anatol Belski
c45fcfd063
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
one more refix to the test
2014-12-01 19:10:18 +01:00
Anatol Belski
a0c03a3ec5
one more refix to the test
2014-12-01 19:09:39 +01:00
Anatol Belski
fe4a5abf30
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2014-12-01 18:55:52 +01:00
Anatol Belski
b6d624e54e
fix dir separator in test
2014-12-01 18:55:20 +01:00
Anatol Belski
f33bd9c846
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix possible null pointer math
2014-12-01 14:43:22 +01:00
Anatol Belski
cb6dea6ea8
fix possible null pointer math
2014-12-01 14:40:35 +01:00
Ferenc Kovacs
d964832255
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
Conflicts:
.travis.yml
2014-12-01 10:14:32 +01:00
Ferenc Kovacs
a3a0e49586
Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
...
This reverts commit 5515937073 .
2014-12-01 10:12:06 +01:00
Anatol Belski
c370683903
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add include for missing usleep proto
C89 compat
Added more useful warning messages
Changed based on comments and make its behaviour equal to the Windows version
Fix #53092 - dns_get_record does not return false on dns server failure
Fix php cli (-S option) inconsistent port parsing
2014-12-01 08:30:59 +01:00
Anatol Belski
c1ec815fae
add include for missing usleep proto
2014-12-01 08:27:46 +01:00
Anatol Belski
f4a0e601ee
C89 compat
2014-12-01 08:24:44 +01:00
Tjerk Meesters
bfe7c6988f
Added more useful warning messages
2014-11-30 22:42:13 -08:00
Tjerk Meesters
904dca6392
Changed based on comments and make its behaviour equal to the Windows version
2014-11-30 22:42:13 -08:00
Tjerk Meesters
d037785165
Fix #53092 - dns_get_record does not return false on dns server failure
2014-11-30 22:42:13 -08:00
nil0x42
2a73d56ef9
Fix php cli (-S option) inconsistent port parsing
...
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
2014-11-30 22:42:12 -08:00
Tjerk Meesters
85e2e6c1fd
Added more useful warning messages
2014-11-30 22:39:25 -08:00
Tjerk Meesters
977d84490b
Changed based on comments and make its behaviour equal to the Windows version
2014-11-30 22:39:18 -08:00
Tjerk Meesters
7b44790db5
Fix #53092 - dns_get_record does not return false on dns server failure
2014-11-30 22:39:09 -08:00
nil0x42
a87300241f
Fix php cli (-S option) inconsistent port parsing
...
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
2014-11-30 22:29:24 -08:00
Remi Collet
cb1a297bf4
XFAIL as catch_workers_output = yes seems not reliable
2014-12-01 07:28:49 +01:00
Stanislav Malyshev
e0b6e5222b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
2014-11-30 22:22:01 -08:00
Stanislav Malyshev
f75da60b18
update NEWS
2014-11-30 22:19:24 -08:00
Jille Timmermans
1b4368db77
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
2014-11-30 22:18:22 -08:00
Jille Timmermans
7049d3450e
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
2014-11-30 22:18:12 -08:00
Stanislav Malyshev
85bada10c1
fix ZTS
2014-11-30 21:50:29 -08:00
Stanislav Malyshev
720ba67948
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
update news
update NEWS
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
2014-11-30 21:39:49 -08:00
Stanislav Malyshev
f7eedbe9a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update news
Conflicts:
ext/standard/crypt.c
2014-11-30 21:38:30 -08:00
Stanislav Malyshev
84be568366
update news
2014-11-30 21:37:39 -08:00
Stanislav Malyshev
3003793480
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update news
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
2014-11-30 21:12:17 -08:00
Stanislav Malyshev
39007e23a4
update news
2014-11-30 21:12:03 -08:00
Stanislav Malyshev
4d162a2d9b
update NEWS
2014-11-30 21:11:20 -08:00
Stanislav Malyshev
abf5b9481b
Merge branch 'pull-request/868' into PHP-5.5
...
* pull-request/868:
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
2014-11-30 21:09:41 -08:00
Leigh
301b7f990a
Apply error-code-salt fix to Windows too
...
Conflicts:
ext/standard/crypt.c
2014-11-30 21:07:31 -08:00
Leigh
7e870c596d
Bug fixes in light of failing bcrypt tests
...
Conflicts:
ext/standard/crypt.c
2014-11-30 21:06:39 -08:00
Leigh
2d9d10fbbf
Add tests from 1.3. Add missing tests.
...
3 of the missing tests fail. // TODO
2014-11-30 21:05:40 -08:00
Leigh
29f51e1ca9
Upgrade crypt_blowfish to version 1.3
2014-11-30 21:05:32 -08:00
m.bennewitz
4675b79e65
Conflicts:
...
ext/date/php_date.c
2014-11-30 20:49:18 -08:00
Stanislav Malyshev
de65eaa8c8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixes memory leak introduced in 2b9af967
2014-11-30 18:26:39 -08:00
Stanislav Malyshev
17094017f7
Merge branch 'pull-request/914' into PHP-5.5
...
* pull-request/914:
Fixes memory leak introduced in 2b9af967
2014-11-30 18:26:17 -08:00
Stanislav Malyshev
8c08124c0e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
2014-11-30 18:24:23 -08:00
Dominic Luechinger
6048ac32b4
Adds test cases for openssl EC improvements
2014-11-30 18:17:48 -08:00
Dominic Luechinger
5d1cc7d135
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
...
When working with elliptic curve and openssl some functions are not
aware of the different handling.
Improvements:
- Fixes export of EC private keys
- Adds curve information to openssl_pkey_get_details
Conflicts:
ext/openssl/openssl.c
2014-11-30 18:02:55 -08:00
Stanislav Malyshev
aae5d4d9db
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
fix typo
2014-11-30 17:34:51 -08:00
Stanislav Malyshev
ffb62112f8
Update NEWS
2014-11-30 17:34:07 -08:00
Stanislav Malyshev
977974f95f
fix typo
2014-11-30 17:09:53 -08:00
Stanislav Malyshev
60d5b2ec24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added test and review suggestion
Fix bug #68335 : rmdir doesnt work with file:// stream wrapper
2014-11-30 17:07:02 -08:00
mcq8
04808aa7e1
Added test and review suggestion
2014-11-30 16:38:20 -08:00
mcq8
6eaa4d01d3
Fix bug #68335 : rmdir doesnt work with file:// stream wrapper
2014-11-30 16:38:13 -08:00
Stanislav Malyshev
f6aa6324fb
fix tests for systems with no de_DE locales
2014-11-30 16:12:56 -08:00
Remi Collet
e1d4ac426c
Move chown to fpm_unix_set_socket_premissions()
...
For consistency, with fpm_unix_resolve_socket_premissions.
Compute + Use in the same source file.
To make easier future enhancement.
Also check chdir output to fix a build warning.
2014-11-29 16:49:08 +01:00
Julien Pauli
57d7b4fc56
Updated NEWS
2014-11-29 14:41:48 +01:00
Julien Pauli
736279239e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix #60509 , pcntl_signal doesn't decrease ref-count of old handler
2014-11-29 14:41:06 +01:00
Julien Pauli
40e518b4c3
Updated NEWS
2014-11-29 14:40:47 +01:00
Julien Pauli
19b5bc8ce2
Fix #60509 , pcntl_signal doesn't decrease ref-count of old handler
2014-11-29 14:39:19 +01:00
Julien Pauli
c4f9f1ff4c
Updated NEWS
2014-11-29 12:11:27 +01:00
Julien Pauli
a93fb3524e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME
2014-11-29 12:11:06 +01:00
Julien Pauli
59bd4117ac
Updated NEWS
2014-11-29 12:10:54 +01:00
Paul Garvin
605d32bedd
SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME
...
Currently when you use RecursiveDirectoryIterator with the
CURRENT_AS_PATHNAME flag PHP will throw an UnexpectedValueException with
message 'Objects returned by RecursiveIterator::getChildren() must implement
RecursiveIterator'.This happend because getChildren() will return the
current directory name instead of an Iterator (or subclass of) as required
by the RecursiveIterator interface.
This commit changes getChildren() to return annother
RecursiveDirectoryIterator but current() still returns the path name when
CURRENT_AS_PATHNAME is used. A PHPT test case (bug66405.phpt) that
reproduces the bug is included.
This fix was originally against the PHP-5.4 branch, but it was not merged
before 5.4 reached EOL. I am hoping to get it applied to 5.5, 5.6, and
master.
2014-11-29 12:04:44 +01:00
Julien Pauli
4bf299a250
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
2014-11-29 11:39:37 +01:00
Julien Pauli
1813fe9f38
Merge branch 'pull-request/656' into PHP-5.5
...
* pull-request/656:
PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
2014-11-29 11:38:57 +01:00
Popa Marius Adrian
cf2cd8fb20
PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
...
cleanup and PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
2014-11-29 11:38:36 +01:00
Ferenc Kovacs
7e4b77c921
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test with readline on mac
2014-11-29 01:49:23 +01:00
Ferenc Kovacs
108bf84967
fix test with readline on mac
2014-11-29 01:47:45 +01:00
Julien Pauli
a76f8e297d
updated NEWS
2014-11-28 13:27:46 +01:00
Julien Pauli
b248a7a95c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fix #65419 - Inside trait, self::class != __CLASS__
2014-11-28 13:26:53 +01:00
Julien Pauli
619adc9795
updated NEWS
2014-11-28 13:26:20 +01:00
Julien Pauli
7c77ca38b1
Fix #65419 - Inside trait, self::class != __CLASS__
2014-11-28 13:24:25 +01:00
Anatol Belski
1552d6ae7b
disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows
...
This is using the openssl binary which, despite it's contained in the
deps, would probably miss all it's environment. It is just prone to
failure and thus is not worth it.
2014-11-28 12:24:32 +01:00
Anatol Belski
b0645abdcc
updated NEWS
2014-11-27 13:40:07 +01:00
Anatol Belski
088f8b528b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
refactored the mbstring config.w32
Fixed bug #68504 --with-libmbfl configure option not present on Windows
2014-11-27 13:39:23 +01:00
Anatol Belski
42af411620
refactored the mbstring config.w32
2014-11-27 13:37:00 +01:00
Anatol Belski
3ec8730e89
Fixed bug #68504 --with-libmbfl configure option not present on Windows
2014-11-27 09:14:47 +01:00
Ferenc Kovacs
fcf21c4d00
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
5.5.21 now
Conflicts:
configure.in
main/php_version.h
2014-11-27 00:13:11 +01:00
Ferenc Kovacs
5d67e8617b
the darwin specific test fails for me with the same output which is the expected for the original test
...
I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on
qa.php.net/reports and on google which do see this test failing on mac.
if this change causes you to have this test failing on Mac, please drop me a mail so we can improve
the current test so it passes for everybody.
2014-11-27 00:08:40 +01:00
Ferenc Kovacs
543ad4b2d3
#68446 is fixed
2014-11-26 23:12:49 +01:00
Ferenc Kovacs
247774e3fd
remove the NEWS entries for the reverted stuff
2014-11-26 19:13:46 +01:00
Ferenc Kovacs
aef51819ce
typo fix
2014-11-26 18:41:50 +01:00
Ferenc Kovacs
0afc04b913
go back with phpdbg to the state of 5.6.3, reverting the controversial commits(remote debugging/xml protocol)
2014-11-26 18:38:36 +01:00
Julien Pauli
3656349990
5.5.21 now
2014-11-26 11:31:58 +01:00
Ferenc Kovacs
fa2a2a1059
PHP-5.6.5 is next
2014-11-26 10:21:37 +01:00
Anatol Belski
fe92a811ed
updated lib versions
2014-11-26 08:35:00 +01:00
Anatol Belski
1414f2c095
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated lib versions
2014-11-26 08:33:32 +01:00
Anatol Belski
68126a76b4
updated lib versions
2014-11-26 08:33:06 +01:00
Anatol Belski
4576b4d58a
fix dir separator in test
2014-11-25 18:16:26 +01:00
Anatol Belski
2c8aee0bb8
fix TS build
2014-11-25 17:56:28 +01:00
Dmitry Stogov
e116595e63
Better fix for bug #68446
2014-11-25 18:09:08 +03:00
Bob Weinand
0ca47ba8d8
Revert NEWS and set test to XFAIL
2014-11-25 12:27:17 +01:00
Bob Weinand
aba95c2399
Revert "Fix bug #68446 (bug with constant defaults and type hints)"
...
This reverts commit 5ef138b0c7 .
2014-11-25 12:24:29 +01:00
Stanislav Malyshev
faa396c67d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
move tests into proper place
2014-11-24 12:26:50 -08:00
Stanislav Malyshev
f86aa349eb
move tests into proper place
2014-11-24 12:26:20 -08:00
Anatol Belski
3578e5b250
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
fork test for windows
update for LiteSpeed
2014-11-24 16:25:38 +01:00
Anatol Belski
09f2355eec
fix dir separator in test
2014-11-24 16:14:17 +01:00
Anatol Belski
ac8b1a9de1
fork test for windows
2014-11-24 16:09:26 +01:00
Stanislav Malyshev
1db49d8c5b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update for LiteSpeed
2014-11-23 18:06:47 -08:00
Stanislav Malyshev
f79bf4900a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update for LiteSpeed
2014-11-23 18:05:49 -08:00
Stanislav Malyshev
7dbc5e5c69
update for LiteSpeed
2014-11-23 18:05:26 -08:00
Stanislav Malyshev
4469049b7b
update for LiteSpeed
2014-11-23 18:03:07 -08:00
Stanislav Malyshev
90445ba4a4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
tests image gd
xmlwriter_full_end_element tests
Tests for writeAttributeNS and xmlwriter_write_attribute_ns
2014-11-23 17:52:50 -08:00
Stanislav Malyshev
d7f27984d2
Merge branch 'pull-request/757' into PHP-5.5
...
* pull-request/757:
xmlwriter_full_end_element tests
Tests for writeAttributeNS and xmlwriter_write_attribute_ns
2014-11-23 17:52:43 -08:00
Stanislav Malyshev
711a3ab9d1
Merge branch 'pull-request/782' into PHP-5.5
...
* pull-request/782:
tests image gd
2014-11-23 17:52:08 -08:00
Stanislav Malyshev
a8dfb33db8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add my information to this test
Add a test for the exception cases of readline_read_history
added some tests to datetime and dateinterval functions
added various tests for XSLTProcessor and one test for iconv extension
teste basico da funcao timezone_version_get
2014-11-23 17:26:28 -08:00
Stanislav Malyshev
1330491994
Merge branch 'pull-request/854' into PHP-5.5
...
* pull-request/854:
teste basico da funcao timezone_version_get
2014-11-23 17:23:34 -08:00
Stanislav Malyshev
9d7206dcea
Merge branch 'pull-request/855' into PHP-5.5
...
* pull-request/855:
added some tests to datetime and dateinterval functions
added various tests for XSLTProcessor and one test for iconv extension
2014-11-23 17:22:54 -08:00
Stanislav Malyshev
24cd25824e
Merge branch 'pull-request/856' into PHP-5.5
...
* pull-request/856:
Add my information to this test
Add a test for the exception cases of readline_read_history
2014-11-23 17:22:02 -08:00
Stanislav Malyshev
2c67c0246e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Test PHP Init Fail Without Params
2014-11-23 17:21:29 -08:00
Stanislav Malyshev
fa76fa8e32
Merge branch 'pull-request/863' into PHP-5.5
...
* pull-request/863:
Test PHP Init Fail Without Params
2014-11-23 17:21:20 -08:00
marcosptf
49a133dd0b
test to function addcslashes
...
test to function bin2hex
2014-11-23 17:19:56 -08:00
marcosptf
2917c70252
test
2014-11-23 17:19:47 -08:00
Archil Imnadze
926bd6cc7a
Update CODING_STANDARDS
2014-11-23 17:14:32 -08:00
Stanislav Malyshev
34c1ba5685
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Correct two zlib tests to use a string, not a const
2014-11-23 17:12:52 -08:00
Tim Siebels
5351ecbfca
Correct two zlib tests to use a string, not a const
2014-11-23 17:12:37 -08:00
Stanislav Malyshev
de075d172c
update NEWS
2014-11-23 16:39:52 -08:00
Alexander Lisachenko
a5aae1b66c
Fix incorrect argument reflection info for array_multisort()
2014-11-23 16:38:30 -08:00
Stanislav Malyshev
5a3e236bd5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix NEWS order
2014-11-23 16:24:54 -08:00
Stanislav Malyshev
03dcf66f9a
fix NEWS order
2014-11-23 16:21:53 -08:00
Stanislav Malyshev
faee48506d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Update the VM generation script, per Bob.
Update NEWS after rebase.
Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
2014-11-23 16:18:52 -08:00
Stanislav Malyshev
05394d6056
update NEWS
2014-11-23 16:18:04 -08:00
Stanislav Malyshev
9ef264504d
Merge branch 'pull-request/840' into PHP-5.5
...
* pull-request/840:
Update the VM generation script, per Bob.
Update NEWS after rebase.
Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
2014-11-23 16:17:17 -08:00
Stanislav Malyshev
7e4de4f8d6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update comments in php.ini
2014-11-23 16:13:58 -08:00
Sobak
6d148f7ed9
Update comments in php.ini
2014-11-23 16:13:44 -08:00
Stanislav Malyshev
fa7615af59
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added missing INSTALL_ROOT
2014-11-23 16:09:40 -08:00
Sebastian Brandt
c7248e6359
added missing INSTALL_ROOT
2014-11-23 16:09:24 -08:00
Reeze Xia
7386b74b07
Fix php.ini-*'s comment about directive: request_order
...
request_order directive only support register G,P,C but not all of
the EGPCS global variables.
The doc <http://php.net/manual/en/ini.core.php#ini.request-order >
is ok.
2014-11-23 16:07:47 -08:00
Kévin Dunglas
8439eb6277
Minor: typo fix in filter_var comment
2014-11-23 15:18:47 -08:00
Dominic Luechinger
437ab7f1f4
Minor fix: Missing quotes in openssl test case for bug bug64802
2014-11-23 15:15:49 -08:00
Bob Weinand
dd70a2c7ae
Added NEWS entry and test for bug 68446
2014-11-24 00:08:45 +01:00
Veres Lajos
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
Bob Weinand
5ef138b0c7
Fix bug #68446 (bug with constant defaults and type hints)
2014-11-23 21:10:41 +01:00
Florian MARGAINE
489bfb0af9
Fixes memory leak introduced in 2b9af967
...
Fixes https://bugs.php.net/bug.php?id=68285
2014-11-23 01:42:26 +01:00
Remi Collet
c8dd415543
typo
2014-11-22 10:37:22 +01:00
Remi Collet
6e17a439a9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed Bug #68478 acess_log don't use prefix
2014-11-22 10:36:54 +01:00
Remi Collet
9664312e30
NEWS
2014-11-22 10:36:45 +01:00
Remi Collet
c50ee655ea
Fixed Bug #68478 acess_log don't use prefix
...
Calling fpm_conf_process_all_pools before fpm_log_open
allow to use fpm_evaluate_full_path and so to honor
global prefix or pool prefix for access.log
2014-11-22 10:35:51 +01:00
Remi Collet
6b974874ab
NEWS
2014-11-22 10:30:42 +01:00
Remi Collet
3a3f67f79b
minor typo in test
2014-11-22 10:29:51 +01:00
Remi Collet
fd5c421a00
add test for global / pool prefix and bug #68478
2014-11-22 10:29:05 +01:00
Remi Collet
b924af8db9
Fixed Bug #68478 acess_log don't use prefix
...
Calling fpm_conf_process_all_pools before fpm_log_open
allow to use fpm_evaluate_full_path and so to honor
global prefix or pool prefix for access.log
2014-11-22 10:25:53 +01:00
Stanislav Malyshev
515fa6160d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "made lsapi_main.c compatible with PHP7/phpng ."
Updated NEWS
2014-11-22 00:41:06 -08:00
Stanislav Malyshev
bc55af0cf2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "made lsapi_main.c compatible with PHP7/phpng ."
2014-11-22 00:40:11 -08:00
Stanislav Malyshev
96cde1841a
Revert "made lsapi_main.c compatible with PHP7/phpng ."
...
This reverts commit 9fb816f45a .
Not a security-related fix.
2014-11-22 00:38:04 -08:00
Julien Pauli
9a06628c80
Updated NEWS
2014-11-21 16:17:49 +01:00
Julien Pauli
99fa36cc58
Updated NEWS
2014-11-21 16:16:54 +01:00
Julien Pauli
ab3525c401
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #68185 - Inconsistent insteadof definition
Conflicts:
Zend/zend_compile.c
2014-11-21 15:50:27 +01:00
Julien Pauli
cd3b46f28a
Fix #68185 - Inconsistent insteadof definition
2014-11-21 15:37:33 +01:00
Anatol Belski
64b9277867
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-11-21 13:57:46 +01:00
Anatol Belski
59a9e7af21
fixed test
...
on Linux gettext requires a locale to be installed on the system
2014-11-21 13:56:49 +01:00
Remi Collet
1e14f805f9
add test for fastcgi_finish_request()
2014-11-21 11:28:20 +01:00
Anatol Belski
0581e877a5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added test for things done so far for bug #66265
partially fixed bug #66265
forked bug67052.phpt for Windows
2014-11-21 10:24:53 +01:00
Anatol Belski
f2e33dc725
added test for things done so far for bug #66265
2014-11-21 10:22:47 +01:00
Anatol Belski
56fac96bec
partially fixed bug #66265
...
NTS mode should additionally use _putenv to satisfy libs like gettext
relying on _getenv. As _putenv isn't thread safe, it wouldn't bring
much for the TS mode as it would change locale across all the threads
and require locking to avoid random fails with concurrent _getenv
calls.
2014-11-21 09:57:12 +01:00
Anatol Belski
502ce90873
forked bug67052.phpt for Windows
2014-11-21 09:53:55 +01:00
Remi Collet
b97fd60b42
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
Raise a warning when listen = hostname used and is resolved as multiple addresses
2014-11-21 07:56:48 +01:00
Remi Collet
8be510ae63
NEWS
2014-11-21 07:56:39 +01:00
Remi Collet
5be75da202
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
...
Add a "There are no allowed addresses for this pool"
2014-11-21 07:55:13 +01:00
Remi Collet
c4ca220467
Raise a warning when listen = hostname used and is resolved as multiple addresses
...
Using getaddrinfo is perhaps not a good idea... if we are not able
to listen on multiple addresses...
At least this message should help to diagnose problem, ex
... Found address for localhost, socket opened on ::1
... Found multiple addresses for localhost, 127.0.0.1 ignored
2014-11-21 07:54:51 +01:00
Remi Collet
d10df70f4e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
move zlog_set_level() again
Change pm.start_servers default warning to notice
2014-11-21 07:50:04 +01:00
Remi Collet
1f4972e348
NEWS
2014-11-21 07:49:53 +01:00
David Zuelke
9e8d4a1b06
move zlog_set_level() again
...
from fpm_unix_init_main() to fpm_conf_post_process() this time (see #894 ),
because otherwise nothing in fpm_conf_init_main() obeys log levels
2014-11-21 07:49:08 +01:00
David Zuelke
8beb153460
Change pm.start_servers default warning to notice
...
Unlike other settings, this has a perfectly reasonable default, calculated using
a dynamic formula. If the default was hardcoded to "2" or something, then it
would make sense to have a warning, since that could potentially be bad, but for
a dynamically calculated value based on other mandatory settings, a notice ought
to be enough.
2014-11-21 07:47:04 +01:00
Remi Collet
5234c2941f
add test for #68391
2014-11-21 07:36:34 +01:00
Remi Collet
4ab05e8f69
NEWS
2014-11-21 07:35:49 +01:00
Remi Collet
61f6cd0da5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #68391 Returns the pool config files in order
2014-11-21 07:35:10 +01:00
Remi Collet
cf3a902286
NEWS
2014-11-21 07:34:40 +01:00
Florian MARGAINE
29d2c13809
Fixed bug #68391 Returns the pool config files in order
...
Fixes https://bugs.php.net/bug.php?id=68391
2014-11-21 07:33:15 +01:00
Adam Harvey
245d01892a
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-20 16:19:03 -08:00
Adam Harvey
73cb5ca777
Merge branch 'PHP-5.4' into PHP-5.5
2014-11-20 16:18:42 -08:00
George Wang
b664909397
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-11-20 16:56:28 -05:00
George Wang
d467761663
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-11-20 16:56:03 -05:00
George Wang
620db04e91
made lsapi_main.c compatible with PHP7/phpng .
2014-11-20 16:50:15 -05:00
George Wang
bd3bc097b0
made lsapi_main.c compatible with PHP7/phpng .
2014-11-20 16:49:56 -05:00
George Wang
9fb816f45a
made lsapi_main.c compatible with PHP7/phpng .
2014-11-20 16:49:01 -05:00
Remi Collet
15d8601866
NEWS
2014-11-20 15:16:39 +01:00
Remi Collet
6e1e113b91
adapt test for error message introduce in fix for #68463
2014-11-20 15:15:54 +01:00
Remi Collet
5c6ccb2d8f
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
...
Add a "There are no allowed addresses for this pool"
2014-11-20 15:14:34 +01:00
Remi Collet
7ef559ff80
run a few request in this test
2014-11-20 14:45:17 +01:00
Anatol Belski
e25b23d1c9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
split formatter_format*.phpt for ICP 54.1
split dateformat_timezone_arg_variations*.phpt for ICU 54.1
split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
fix icu version to test
split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
clone dateformat_calendars_variant3.phpt for ICU 54.1
split collator_get_sort_key_variant3.phpt for icu 54.1
split ext/intl/tests/collator_create3.phpt for icu >= 54.1
Conflicts:
ext/intl/tests/dateformat_create_cal_arg_variant3.phpt
ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt
ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt
ext/intl/tests/dateformat_get_set_calendar_variant3.phpt
ext/intl/tests/dateformat_get_set_timezone_variant3.phpt
ext/intl/tests/dateformat_timezone_arg_variations3.phpt
ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt
2014-11-20 13:36:37 +01:00
Anatol Belski
6c3768b154
split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
2014-11-20 13:26:23 +01:00
Anatol Belski
65ca28b463
split formatter_format*.phpt for ICP 54.1
2014-11-20 13:17:41 +01:00
Anatol Belski
2ec7f04f7e
split dateformat_timezone_arg_variations*.phpt for ICU 54.1
2014-11-20 13:12:02 +01:00
Anatol Belski
a52ff5cde6
split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
2014-11-20 13:06:22 +01:00
Anatol Belski
36a2e235dd
fix icu version to test
2014-11-20 13:01:04 +01:00
Anatol Belski
96249b68e5
split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
2014-11-20 12:58:41 +01:00
Anatol Belski
278d71e508
split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
2014-11-20 12:53:11 +01:00
Anatol Belski
9cfe459e21
split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
2014-11-20 12:46:48 +01:00
Anatol Belski
54af278762
split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
2014-11-20 12:39:52 +01:00
Anatol Belski
b61dba5e1d
clone dateformat_calendars_variant3.phpt for ICU 54.1
2014-11-20 11:49:39 +01:00
Anatol Belski
8ca69ff641
split collator_get_sort_key_variant3.phpt for icu 54.1
2014-11-20 11:37:06 +01:00
Anatol Belski
f97fc096a3
split ext/intl/tests/collator_create3.phpt for icu >= 54.1
2014-11-20 11:17:42 +01:00
Remi Collet
9fd54bd9d8
Raise a warning when listen = hostname used and is resolved as multiple addresses
...
Using getaddrinfo is perhaps not a good idea... if we are not able
to listen on multiple addresses...
At least this message should help to diagnose problem, ex
... Found address for localhost, socket opened on ::1
... Found multiple addresses for localhost, 127.0.0.1 ignored
2014-11-20 10:15:15 +01:00
Remi Collet
914787491d
NEWS
2014-11-20 08:15:13 +01:00
Remi Collet
1939097ede
Fixed #68458 Change pm.start_servers default warning to notice
...
Add another test
014 checks that no "notice" are traced when log_level=warning
015 checks that "notice" are traced when log_level=notice
2014-11-20 08:12:27 +01:00
David Zuelke
a128cbad57
fix test description
2014-11-20 08:11:44 +01:00
David Zuelke
49be4af42b
tests for #895
2014-11-20 08:11:44 +01:00
David Zuelke
befce20c84
move zlog_set_level() again
...
from fpm_unix_init_main() to fpm_conf_post_process() this time (see #894 ),
because otherwise nothing in fpm_conf_init_main() obeys log levels
2014-11-20 08:11:43 +01:00
David Zuelke
909d44f20d
Change pm.start_servers default warning to notice
...
Unlike other settings, this has a perfectly reasonable default, calculated using
a dynamic formula. If the default was hardcoded to "2" or something, then it
would make sense to have a warning, since that could potentially be bad, but for
a dynamically calculated value based on other mandatory settings, a notice ought
to be enough.
2014-11-20 08:11:43 +01:00
Remi Collet
7e0ccb6d12
Factorization and consistency
...
- create a fpm_use_error_log() to check when file or stderr should be used
- use it everywhere for consistency
- add some comments
2014-11-20 07:49:54 +01:00
Peter Cowburn
48c0cf7df6
NEWS
2014-11-19 17:03:15 +00:00
Chris McCafferty
1e92b24a2a
Fix #68355 : Inconsistency in example php.ini comments
...
There are some arbitrary differences between php.ini-production and
php.ini-development. This patch corrects the differences.
2014-11-19 16:57:47 +00:00
Remi Collet
a521d7e1be
NEWS
2014-11-19 16:49:23 +01:00
Remi Collet
c5a1c5f5a4
Fixed bug #68452 php-fpm man page is oudated (-O)
2014-11-19 16:49:05 +01:00
Remi Collet
4a36482378
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
NEWS
Fixed bug #68381 Set FPM log level earlier during init
2014-11-19 16:48:21 +01:00
Remi Collet
d438bcf226
NEWS
2014-11-19 16:47:52 +01:00
Remi Collet
858c9d86fa
Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
2014-11-19 16:46:51 +01:00
Remi Collet
c40e665ecd
NEWS
2014-11-18 17:45:50 +01:00
Remi Collet
f164df0b7b
add test for bug #68381
2014-11-18 17:45:50 +01:00
David Zuelke
9a43410871
Fixed bug #68381 Set FPM log level earlier during init
...
The log level will be ignored throughout log events in fpm_unix_init_main, until
the very end when zlog_set_level is finally called.
In particular, fpm_unix_conf_wp may throw notices like this:
> [08-Nov-2014 17:13:36] NOTICE: [pool www] 'user' directive is ignored when…
Which will still appear even if log_level in php-fpm.conf is set to warning+
2014-11-18 17:45:49 +01:00
Remi Collet
5674827ead
NEWS
2014-11-18 17:43:28 +01:00
David Zuelke
03cf70ab1e
Fixed bug #68381 Set FPM log level earlier during init
...
The log level will be ignored throughout log events in fpm_unix_init_main, until
the very end when zlog_set_level is finally called.
In particular, fpm_unix_conf_wp may throw notices like this:
> [08-Nov-2014 17:13:36] NOTICE: [pool www] 'user' directive is ignored when…
Which will still appear even if log_level in php-fpm.conf is set to warning+
2014-11-18 17:42:21 +01:00
Remi Collet
ec26d7a80f
simplify fpm tests
2014-11-18 13:11:53 +01:00
Remi Collet
51394dff3f
Add test for bug #68442
...
Add another helper function fpm_display_log
Restore change from c996a989 badly reverted in 8c0cc49
2014-11-18 11:08:49 +01:00
Remi Collet
8c0cc49b9b
Add various tests for FPM
...
- covering recent bugs (68420, 68421, 68423, 68428)
- for UDS
- for ping and status URI
- for multi pool and multi mode
2014-11-18 08:07:45 +01:00
Remi Collet
a740f9e783
Include small MIT FastCGI client library from
...
https://github.com/adoy/PHP-FastCGI-Client
Add run_request function to easily run a FastCGI call,
which is needed for new tests.
2014-11-18 08:01:18 +01:00
Remi Collet
d8868b654e
Add new FPM test for IPv4/IPv6
...
Use 9000+PHP_INT_SIZE as poprt
- to avoid using default 9000
- to allow multipole 32/64 bits simultaneous run
2014-11-17 15:22:04 +01:00
Remi Collet
c996a9899e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update fpm configuration for #68428
fix incompatible pointer types
2014-11-17 09:43:26 +01:00
Remi Collet
d9fd670fdc
update fpm configuration for #68428
2014-11-17 09:43:23 +01:00
Remi Collet
09f9f7ce50
update fpm configuration for #68428
2014-11-17 09:43:09 +01:00
Anatol Belski
873a460c7c
fix incompatible pointer types
2014-11-17 09:33:58 +01:00
Anatol Belski
1504e9c9df
fix incompatible pointer types
2014-11-17 09:33:37 +01:00
Remi Collet
82c71158c1
NEWS
2014-11-17 09:23:47 +01:00
Remi Collet
45b17d0f96
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #68428 allowed_client is IPv4 only
2014-11-17 09:23:26 +01:00
Remi Collet
6d9b4ca5fc
NEWS
2014-11-17 09:23:16 +01:00
Remi Collet
3a8103ae47
Fixed bug #68428 allowed_client is IPv4 only
2014-11-17 09:22:13 +01:00
Remi Collet
f22e0c0a6a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
comment about ipv4-mapped in fpm conf
Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
2014-11-17 06:58:28 +01:00
Remi Collet
4475cbdc85
comment about ipv4-mapped in fpm conf
2014-11-17 06:57:59 +01:00
Remi Collet
4657289e87
Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
...
Log IPv4-Mapped-Ipv6 address as IPv4 (not as IPv6)
2014-11-17 06:53:38 +01:00
Remi Collet
10a957ed35
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improve comments about FPM listen option
2014-11-16 18:00:24 +01:00
Remi Collet
23fd22f9ed
improve comments about FPM listen option
2014-11-16 17:59:36 +01:00
Remi Collet
51acb9dddd
NEWS
2014-11-15 08:14:43 +01:00
Remi Collet
e52295988c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
2014-11-15 08:14:09 +01:00
Remi Collet
69b9381901
NEWS
2014-11-15 08:13:56 +01:00
Remi Collet
9871cf78f6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
2014-11-15 08:11:32 +01:00
Remi Collet
1d9bb287c5
Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
...
Restore default behavior when no address configured:
Listen on all IPv4 addresses.
At some time we could consider to switch to all IPv6
but this will be a BC break.
2014-11-15 08:08:23 +01:00
Remi Collet
548352aa1e
NEWS
2014-11-14 19:14:42 +01:00
Remi Collet
546fb3407d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
2014-11-14 19:14:02 +01:00
Remi Collet
e4974f6cc6
NEWS
2014-11-14 19:13:53 +01:00
Remi Collet
b7bc907cfd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68421 access.format='%R' doesn't log ipv6 address
2014-11-14 19:10:19 +01:00
Remi Collet
5112fdd670
Fix bug #68421 access.format='%R' doesn't log ipv6 address
2014-11-14 19:09:50 +01:00
Remi Collet
d66640a334
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68423i PHP-FPM will no longer load all pools
2014-11-14 17:32:46 +01:00
Remi Collet
23db119768
Fix bug #68423i PHP-FPM will no longer load all pools
...
The hash need to be unique per IP + Port
Previous version have (IPv4 only)
sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
2014-11-14 17:29:31 +01:00
Remi Collet
063a06b8e5
NEWS for 1b15620744
2014-11-14 10:58:27 +01:00
Remi Collet
1b15620744
Fix build with gmp < 4.2
...
See 3d6d863ccb
and acd7fcf55f
2014-11-13 13:08:00 +01:00
Matteo Beccati
86127a077f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed NEWS
2014-11-12 16:54:17 +01:00
Matteo Beccati
faaea4f304
Fixed NEWS
...
Some entries had been mistakenly removed in ad468d20b1
2014-11-12 16:51:26 +01:00
Ferenc Kovacs
00e763f499
update NEWS
2014-11-12 14:51:18 +01:00
Ferenc Kovacs
fea84a1c9c
update NEWS
2014-11-12 14:45:39 +01:00
Ferenc Kovacs
5f15d6f0d8
update NEWS
2014-11-12 14:28:45 +01:00
Matteo Beccati
07655ffe7e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
2014-11-12 11:22:48 +01:00
Matteo Beccati
65fee90462
Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
2014-11-12 11:21:11 +01:00
Julien Pauli
14d3e173aa
Fixed wrong NEWS
2014-11-12 10:59:54 +01:00
Yasuo Ohgaki
9e072d9565
Remove unneeded md5 hashing from PHP-5.6 branch.
...
It's removed from master already by my previous commit.
2014-11-12 13:43:54 +09:00
Stanislav Malyshev
1b143f4033
fix loop - size_t is unsigned so can not be negative
2014-11-11 16:33:02 -08:00
Stanislav Malyshev
4571cc2195
fix copypaste error
2014-11-11 16:33:02 -08:00
Stanislav Malyshev
99b538a722
Merge branch 'PHp-5.4' into PHP-5.5
...
* PHp-5.4:
5.4.36-dev
Fixed bug #66584 Segmentation fault on statement deallocation
Conflicts:
configure.in
main/php_version.h
2014-11-11 16:32:38 -08:00
Stanislav Malyshev
98b22864ff
5.4.36-dev
2014-11-11 16:31:38 -08:00
Matteo Beccati
2323e95df9
Fixed bug #66584 Segmentation fault on statement deallocation
2014-11-11 16:25:31 -08:00
Ferenc Kovacs
74d6c23b39
update NEWS
2014-11-12 00:25:16 +01:00
Ferenc Kovacs
a2e7b9162c
update NEWS
2014-11-12 00:21:04 +01:00
Ferenc Kovacs
654bb8faf3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
update NEWS
2014-11-12 00:20:54 +01:00
Ferenc Kovacs
791fc70025
update NEWS
2014-11-12 00:19:51 +01:00
Ferenc Kovacs
b05e123cde
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
2014-11-12 00:18:55 +01:00
Ferenc Kovacs
db5ad4c51f
update NEWS
2014-11-12 00:18:13 +01:00
Derick Rethans
a19d96fc58
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-11 14:01:26 -03:00
Derick Rethans
695a102ede
- Updated to version 2014.10 (2014j)
2014-11-11 14:01:24 -03:00
Xinchen Hui
399ec40a76
Update NEWS
2014-11-11 16:24:59 +08:00
Xinchen Hui
e003c56c74
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-11 16:23:18 +08:00
Xinchen Hui
327d4f9afb
Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes)
2014-11-11 16:22:49 +08:00
Rasmus Lerdorf
96c5c1ef59
Fix skipif test here
2014-11-10 10:42:57 -08:00
Rasmus Lerdorf
ad468d20b1
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #68370 ("unset($this)" can make the program crash)
Fixed NEWS for 5.5
Fix opcache.revalidate_freq per-request behavior
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
2014-11-10 10:42:30 -08:00
Rasmus Lerdorf
bff7dc70d8
Fix skipif test here
2014-11-10 10:42:17 -08:00
Rasmus Lerdorf
19992250cf
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Update NEWS
Fixed bug #68370 ("unset($this)" can make the program crash)
Fix opcache.revalidate_freq per-request behavior
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
2014-11-10 10:36:46 -08:00
Matteo Beccati
3e4b91ec7f
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2014-11-10 08:16:35 +01:00
Xinchen Hui
7d69fa7179
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
2014-11-10 13:52:07 +08:00
Xinchen Hui
eacf998af2
Update NEWS
2014-11-10 13:47:50 +08:00
Xinchen Hui
b9e44888c0
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-10 13:47:14 +08:00
Xinchen Hui
ab84939254
Fixed bug #68370 ("unset($this)" can make the program crash)
2014-11-10 13:46:47 +08:00
Julien Pauli
722dd4637b
Fixed NEWS for 5.5
2014-11-07 12:59:48 +01:00
Dmitry Stogov
e6581d52cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix opcache.revalidate_freq per-request behavior
2014-11-07 10:17:48 +03:00
Dmitry Stogov
033abd6d77
Fix opcache.revalidate_freq per-request behavior
2014-11-07 10:16:25 +03:00
Dmitry Stogov
e120438c8c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
2014-11-07 09:54:05 +03:00
Dmitry Stogov
ed4c0245c7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
2014-11-07 09:48:26 +03:00
Dmitry Stogov
9dfa843a38
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
2014-11-07 09:46:49 +03:00
Rasmus Lerdorf
2375d659d7
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src: (142 commits)
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
Update NEWS
Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
fix dir separator in test
arg1-3 are not variable names to use; removed useless buffer variable
update NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
set default response code to 200
set default response code to 200
Fixed bug #66584 Segmentation fault on statement deallocation
Add credit
fix ZTS build
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)
Temporarily disable wait/xml protocol...
don't try to send in the test results until we restored qa.php.net
Fix uninitialized value...
...
2014-11-06 10:19:45 -08:00
Rasmus Lerdorf
96a6f688cb
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
2014-11-06 09:49:11 -08:00
Matteo Beccati
8fccf0bac9
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
2014-11-06 16:34:47 +01:00
Matteo Beccati
8fdc4d8797
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
2014-11-06 15:47:32 +01:00
Yasuo Ohgaki
c9c8f86539
Update NEWS
2014-11-06 13:54:16 +09:00
Yasuo Ohgaki
4dd3fbfcd2
Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
2014-11-06 13:06:29 +09:00
Rasmus Lerdorf
63831d6984
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src: (29 commits)
fix dir separator in test
update NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
set default response code to 200
Fixed bug #66584 Segmentation fault on statement deallocation
fix ZTS build
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
don't try to send in the test results until we restored qa.php.net
Don't treat warnings as failures in the junit output
Fixed test to work with recent libcurl versions
PHP 5.5.20 now
Ensure we have enough input data before parsing date
Fix bug #68095 - invalid read in php_getopt()
NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
- Updated to version 2014.9 (2014i)
updated libmagic.patch in 5.5
...
2014-11-05 12:39:42 -08:00
Anatol Belski
d4050f42fd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2014-11-05 15:43:13 +01:00
Anatol Belski
53266476e6
fix dir separator in test
2014-11-05 15:42:45 +01:00
Bob Weinand
342d56b23d
arg1-3 are not variable names to use; removed useless buffer variable
2014-11-04 16:59:32 +01:00
Stanislav Malyshev
c511e0560f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
2014-11-03 11:43:51 -08:00
Stanislav Malyshev
acd93dfb6d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
2014-11-03 11:43:40 -08:00
Stanislav Malyshev
0ddcf2a919
update NEWS
2014-11-03 11:43:15 -08:00
Remi Collet
7740edae36
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
...
Drop use of php memory allocators as this raise various conflicts
with other extensions and libraries which use libgmp.
No other solution found.
We cannot for ensure correct use of allocator with shared lib.
Some memory can allocated before php init
Some memory can be freed after php shutdown
Known broken run cases
- php + curl + gnutls + gmp
- mod_gnutls + mod_php + gnutls + gmp
- php + freetds + gnutls + gmp
- php + odbc + freetds + gnutls + gmp
- php + php-mapi (zarafa) + gnutls + gmp
2014-11-03 11:42:15 -08:00
Stanislav Malyshev
90ba99a2c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-11-03 11:38:29 -08:00
Stanislav Malyshev
279550ee85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
Conflicts:
configure.in
ext/curl/interface.c
main/php_version.h
2014-11-03 11:37:43 -08:00
Stanislav Malyshev
c351b47ce8
Initialize the offset table - PCRE may sometimes miss offsets
2014-11-03 11:31:02 -08:00
George Wang
bba11e3255
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-11-03 11:44:13 -05:00
George Wang
3918e544d8
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-11-03 11:43:43 -05:00
George Wang
4435161456
set default response code to 200
2014-11-03 11:43:04 -05:00
George Wang
19f3f4b155
set default response code to 200
2014-11-03 11:42:45 -05:00
George Wang
1a2ec3fc60
set default response code to 200
2014-11-03 11:42:01 -05:00
Matteo Beccati
e12d69df0c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66584 Segmentation fault on statement deallocation
2014-11-01 19:20:43 +01:00
Matteo Beccati
69f6aee35c
Fixed bug #66584 Segmentation fault on statement deallocation
2014-11-01 19:19:56 +01:00
Xinchen Hui
00b50850eb
Add credit
2014-11-01 22:29:55 +08:00
Anatol Belski
1b1f7c627a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix ZTS build
2014-10-31 19:53:39 +01:00
Anatol Belski
1fc80d0ca7
fix ZTS build
2014-10-31 19:53:16 +01:00
Matteo Beccati
e797db8909
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
2014-10-31 18:57:59 +01:00
Matteo Beccati
29ee694341
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
2014-10-31 18:54:16 +01:00
Matteo Beccati
9580fcfedd
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
2014-10-31 18:11:32 +01:00
Adam Harvey
4bb836be20
Update the VM generation script, per Bob.
2014-10-31 10:10:49 -07:00
Adam Harvey
087150de95
Update NEWS after rebase.
2014-10-31 10:09:14 -07:00
Adam Harvey
5b5f99ef18
Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
2014-10-31 10:08:17 -07:00
Xinchen Hui
d017c4bf3a
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
2014-10-31 17:36:33 +08:00
Xinchen Hui
d9d181e5ad
Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)
2014-10-31 17:32:23 +08:00
Bob Weinand
113f1fd6d5
Temporarily disable wait/xml protocol...
2014-10-30 23:09:57 +01:00
Ferenc Kovacs
067852ca61
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
don't try to send in the test results until we restored qa.php.net
Don't treat warnings as failures in the junit output
Conflicts:
.travis.yml
2014-10-30 18:14:37 +01:00
Ferenc Kovacs
5515937073
don't try to send in the test results until we restored qa.php.net
2014-10-30 18:12:37 +01:00
Bob Weinand
b9d1dc329f
Merge phpdbg into PHP-5.6
2014-10-30 13:17:58 +01:00
Bob Weinand
4fd66387a9
Fix uninitialized value...
2014-10-30 12:15:27 +01:00
Anatol Belski
73e2dd3381
add DLL export to the output globals
2014-10-30 10:27:20 +01:00
Xinchen Hui
9e1da42af1
Use macro
2014-10-30 11:52:29 +08:00
Xinchen Hui
7b4993dd16
Fixed build.... (shouldn't it be zend_output_globals?)
2014-10-30 11:42:02 +08:00
Anatol Belski
fc904569ea
fix output globals importing
2014-10-29 20:03:28 +01:00
Anatol Belski
5d76185792
export output globals
...
needed by phpdbg
2014-10-29 20:02:41 +01:00
Anatol Belski
4b8f411d31
use portable strndup implementation
2014-10-29 19:49:20 +01:00
Anatol Belski
f842b8f4be
unix sockets aren't available on windows
2014-10-29 19:39:46 +01:00
Anatol Belski
fdbfcc0b51
dll export APIs needed by phpdbg
2014-10-29 19:32:52 +01:00
Anatol Belski
79a4339f1b
fix sapi/phpdbg/config.w32
2014-10-29 19:28:21 +01:00
Matteo Beccati
8bd58502ca
Don't treat warnings as failures in the junit output
...
This matches Travis and the actual return code.
2014-10-29 14:34:58 +01:00
Matteo Beccati
a3b4f8320d
Don't treat warnings as failures in the junit output
...
This matches Travis and the actual return code.
2014-10-29 14:33:36 +01:00
Bob Weinand
68b5dd2ba9
Merge phpdbg into PHP-5.6
2014-10-29 11:43:01 +01:00
Bob Weinand
6545a5c234
Merge php-src into phpdbg
2014-10-29 11:40:56 +01:00
Matteo Beccati
eb4e4b7bca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test to work with recent libcurl versions
PHP 5.5.20 now
Conflicts:
configure.in
main/php_version.h
2014-10-29 11:32:12 +01:00
Matteo Beccati
daf9357d27
Fixed test to work with recent libcurl versions
2014-10-29 11:28:27 +01:00
Bob Weinand
919bd3eb0c
Enable shared builds for webhelper
2014-10-29 11:28:09 +01:00
Remi Collet
89e613cf01
cleanup uneeded json
2014-10-29 07:26:41 +01:00
Remi Collet
7dd871438f
cleanup uneeded json
2014-10-29 07:26:41 +01:00
Bob Weinand
beb767dbe0
Merge phpdbg into PHP-5.6
2014-10-28 23:06:50 +01:00
Bob Weinand
a5415456d4
Merge phpdbg into PHP-5.6
2014-10-28 23:06:50 +01:00
Bob Weinand
31ada13463
Removed last HAVE_JSON check
2014-10-28 23:06:32 +01:00
Bob Weinand
45e2dc692b
Merge phpdbg into PHP-5.6
2014-10-28 22:44:29 +01:00
Bob Weinand
be5d389768
Merge phpdbg into PHP-5.6
2014-10-28 22:44:29 +01:00
Bob Weinand
234df7d2ca
Fix versions & config.m4
2014-10-28 22:33:41 +01:00
Bob Weinand
4bc7a91be7
Merge ../phpdbg into PHP-5.6
...
Conflicts:
sapi/phpdbg/config.m4
2014-10-28 22:15:05 +01:00
Bob Weinand
6150d9342c
Merge ../phpdbg into PHP-5.6
...
Conflicts:
sapi/phpdbg/config.m4
2014-10-28 22:15:05 +01:00
Bob Weinand
d25cc7f090
Use serialize instead of json for transfer
2014-10-28 22:14:35 +01:00
Bob Weinand
69b999eb7e
Add webhelper in config.w32
2014-10-28 22:11:30 +01:00
Bob Weinand
9ba0654ad7
Merge php-src into phpdbg
...
Conflicts:
config.m4
2014-10-28 21:15:47 +01:00
Remi Collet
36fef6dcd9
fix phpdbg build when src tree != build tree
2014-10-28 19:12:41 +01:00
Remi Collet
9028846c63
fix phpdbg build when src tree != build tree
2014-10-28 19:12:41 +01:00
Bob Weinand
2a24763f6c
Merge ../phpdbg into PHP-5.6
2014-10-28 17:42:38 +01:00
Bob Weinand
7561e6b6e3
Remove the ugly hack via a temp file to store breakpoints
2014-10-28 17:25:48 +01:00
Bob Weinand
297baa0c18
Remove the ugly hack via a temp file to store breakpoints
2014-10-28 17:25:48 +01:00
Bob Weinand
82640b7363
Typo (notfoundc => notfound)
2014-10-28 17:25:46 +01:00
Bob Weinand
fd8a70b1ee
Typo (notfoundc => notfound)
2014-10-28 17:25:46 +01:00
Bob Weinand
c895fbea22
Fix quitting on a second run
2014-10-28 17:25:46 +01:00
Bob Weinand
76bd799eb7
Fix quitting on a second run
2014-10-28 17:25:46 +01:00
Bob Weinand
b7d83ff8a6
Fix wrong exec length on relative paths
2014-10-28 17:25:45 +01:00
Bob Weinand
c34fd92466
Fix wrong exec length on relative paths
2014-10-28 17:25:45 +01:00
Bob Weinand
a8ac22452d
Fix possibly unclosed <stream> tags
2014-10-28 17:25:45 +01:00
Bob Weinand
cc3587f4a3
Fix possibly unclosed <stream> tags
2014-10-28 17:25:45 +01:00
Bob Weinand
9990089f28
Fix potential segfaults and unresolved breaks
2014-10-28 17:25:43 +01:00
Bob Weinand
79c66e7cd2
Fix potential segfaults and unresolved breaks
2014-10-28 17:25:43 +01:00
Bob Weinand
64774c7ddb
*Always* clean up and run destructors
2014-10-28 17:25:43 +01:00
Bob Weinand
fe5f5d40f2
*Always* clean up and run destructors
2014-10-28 17:25:43 +01:00
Bob Weinand
49e31265ed
Remove the ugly hack via a temp file to store breakpoints
2014-10-28 17:20:21 +01:00
Julien Pauli
c7f074b163
5.6.4 now
2014-10-28 16:00:19 +01:00
Julien Pauli
71e200b338
PHP 5.5.20 now
2014-10-28 15:01:53 +01:00
Bob Weinand
b24640f463
Typo (notfoundc => notfound)
2014-10-28 13:55:56 +01:00
Bob Weinand
b8dd98178c
Fix quitting on a second run
2014-10-28 13:55:14 +01:00
Bob Weinand
24a88e3906
Fix wrong exec length on relative paths
2014-10-28 13:27:20 +01:00
Bob Weinand
2b3ea0a2bd
Fix possibly unclosed <stream> tags
2014-10-28 13:20:43 +01:00
Bob Weinand
da3d6f3d64
Fix potential segfaults and unresolved breaks
2014-10-28 12:38:07 +01:00
Bob Weinand
cce9550e48
*Always* clean up and run destructors
2014-10-28 12:27:19 +01:00
Remi Collet
47acdcb176
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Ensure we have enough input data before parsing date
2014-10-28 08:50:48 +01:00
Remi Collet
13a218d328
Ensure we have enough input data before parsing date
...
This check have be removed in
http://git.php.net/?p=php-src.git;a=commit;h=ba2f87b50667f147c198abd31fc31eb09522f3d7
But the parser really need 17 char.
And the string need to be nul terminated for this check
So avoid reading random byte from memory.
2014-10-28 08:48:22 +01:00
Stanislav Malyshev
c5659cb8bd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68095 - invalid read in php_getopt()
2014-10-27 19:09:39 -07:00
Stanislav Malyshev
deadeeae1d
Fix bug #68095 - invalid read in php_getopt()
...
It's a hacky solution and incomplete, but I don't see other way
without refactoring the whole getopt protocol.
2014-10-27 19:06:44 -07:00
Bob Weinand
44079a0c82
Merge phpdbg into PHP-5.6
2014-10-27 14:07:26 +01:00
Bob Weinand
0ede82d466
Merge phpdbg into PHP-5.6
2014-10-27 14:07:26 +01:00
Bob Weinand
2297a9aa01
Fix resolving breakpoints of already loaded files
2014-10-27 13:55:20 +01:00
Bob Weinand
8b98ffea5f
Never exist xml mode...
2014-10-27 13:27:54 +01:00
Bob Weinand
35d90d3858
Merge phpdbg into PHP-5.6
...
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
2014-10-27 13:11:13 +01:00
Bob Weinand
6eab2b9101
Merge phpdbg into PHP-5.6
...
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
2014-10-27 13:11:13 +01:00
Bob Weinand
b4db856d37
Fix failing quit when quitting during execution
2014-10-27 11:02:08 +01:00
Bob Weinand
9139d031d8
Fix segfault when cleaning without execution context
2014-10-27 11:01:43 +01:00
Bob Weinand
5e8359d360
Fix listening on port
2014-10-27 10:49:16 +01:00
Anatol Belski
08684a9828
Merge branch 'master' of github.com:krakjoe/phpdbg
...
Conflicts:
phpdbg_prompt.c
2014-10-27 10:19:59 +01:00
Anatol Belski
0e7987c61a
improve the current sigio handling on win32
2014-10-27 10:08:58 +01:00
Remi Collet
cc91072f0e
NEWS
2014-10-27 07:51:50 +01:00
Remi Collet
0146505187
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Conflicts:
ext/gmp/gmp.c
2014-10-27 07:50:42 +01:00
Remi Collet
88527e4569
NEWS
2014-10-27 07:47:18 +01:00
Remi Collet
3c925b18fa
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
...
Drop use of php memory allocators as this raise various conflicts
with other extensions and libraries which use libgmp.
No other solution found.
We cannot for ensure correct use of allocator with shared lib.
Some memory can allocated before php init
Some memory can be freed after php shutdown
Known broken run cases
- php + curl + gnutls + gmp
- mod_gnutls + mod_php + gnutls + gmp
- php + freetds + gnutls + gmp
- php + odbc + freetds + gnutls + gmp
- php + php-mapi (zarafa) + gnutls + gmp
2014-10-27 07:45:34 +01:00
Bob Weinand
50756b515c
Do not execute anything after quit or clean command
2014-10-27 00:00:19 +01:00
Bob Weinand
e7ddcbcb86
Do not execute anything after quit or clean command
2014-10-27 00:00:19 +01:00
Bob Weinand
190f4f9f18
Fix last commit, and do not output unnecessary information
2014-10-27 00:00:18 +01:00
Bob Weinand
26babfb357
Fix last commit, and do not output unnecessary information
2014-10-27 00:00:18 +01:00
Bob Weinand
3ab7734b88
Stabilize execution, always run destructors and extended file breakpoints
2014-10-27 00:00:16 +01:00
Bob Weinand
510676fbbf
Stabilize execution, always run destructors and extended file breakpoints
2014-10-27 00:00:16 +01:00
Bob Weinand
69bc61de41
Fix nullptr dereference in clean without exec context
2014-10-27 00:00:15 +01:00
Bob Weinand
af9c6afa6f
Fix nullptr dereference in clean without exec context
2014-10-27 00:00:15 +01:00
krakjoe
41537cdddc
remove dodgy param parser, bring userland breakpoint api inline with PHP7
2014-10-27 00:00:14 +01:00
krakjoe
de656f8a49
remove dodgy param parser, bring userland breakpoint api inline with PHP7
2014-10-27 00:00:14 +01:00
krakjoe
51c1cc4ff5
disable output buffering by default
2014-10-27 00:00:14 +01:00
krakjoe
fa3a01374d
disable output buffering by default
2014-10-27 00:00:14 +01:00
Bob Weinand
cc70ec1e67
Add question to reset execution in run/exec/clean
2014-10-27 00:00:13 +01:00
Bob Weinand
2bcc8d8394
Add question to reset execution in run/exec/clean
2014-10-27 00:00:13 +01:00
Bob Weinand
f4748ff9ff
Do not execute anything after quit or clean command
2014-10-26 23:33:54 +01:00
Bob Weinand
29edee4e70
Fix last commit, and do not output unnecessary information
2014-10-26 22:21:18 +01:00
Bob Weinand
05711d9961
Stabilize execution, always run destructors and extended file breakpoints
2014-10-26 20:43:49 +01:00
Derick Rethans
25e3560546
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-26 10:54:09 -04:00
Derick Rethans
22b9f16e9a
- Updated to version 2014.9 (2014i)
2014-10-26 10:54:07 -04:00
Bob Weinand
1ff04117c3
Fix nullptr dereference in clean without exec context
2014-10-26 10:48:45 +01:00
krakjoe
65eaab52b6
remove dodgy param parser, bring userland breakpoint api inline with PHP7
2014-10-26 07:24:35 +00:00
krakjoe
5feb96520a
disable output buffering by default
2014-10-26 07:08:29 +00:00
Bob Weinand
918466c262
Add question to reset execution in run/exec/clean
2014-10-26 03:50:28 +01:00
Bob Weinand
e4e39d852a
Merge phpdbg into PHP-5.6
2014-10-25 18:59:48 +02:00
Bob Weinand
24babb0194
Merge phpdbg into PHP-5.6
2014-10-25 18:59:48 +02:00
Bob Weinand
bbcee18b4b
Fix phpdbg output when outputting via php with active output handlers
2014-10-25 18:48:43 +02:00
Bob Weinand
be5242e0fe
Set engine back to initial state after fatal-ed ev command
2014-10-25 15:29:54 +02:00
Bob Weinand
e995ad1131
Fix eventual stack overflow after clean cmd
2014-10-25 15:28:41 +02:00
Bob Weinand
b79e9044f9
Fix listing of files with no absolute path
2014-10-25 15:06:34 +02:00
Anatol Belski
c1639b3e52
stdint will be included in the win32 variant, so don't do it twice
2014-10-25 13:01:17 +02:00
Anatol Belski
3794431b78
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libmagic.patch in 5.5
2014-10-25 12:04:27 +02:00
Anatol Belski
7e5bd4ec69
updated libmagic.patch in 5.6
2014-10-25 12:03:49 +02:00
Anatol Belski
270df3ffd6
updated libmagic.patch in 5.5
2014-10-25 12:01:58 +02:00
Remi Collet
e75e003ae4
NEWS
2014-10-25 11:30:53 +02:00
Remi Collet
cefa310cf9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
2014-10-25 11:30:29 +02:00
Remi Collet
ec3d25fcbd
NEWS
2014-10-25 11:29:53 +02:00
Remi Collet
5b295bf191
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
...
Upstream commit
https://github.com/file/file/commit/39c7ac1106be844a5296d3eb5971946cc09ffda0
CVE -2014-3710
(cherry picked from commit 1803228597 )
2014-10-25 11:29:16 +02:00
Bob Weinand
c03ac47baf
Added some NEWS
2014-10-24 19:26:04 +02:00
Bob Weinand
062284e4fb
Merge phpdbg into PHP-5.6
2014-10-24 19:22:45 +02:00
Bob Weinand
9b4d9ac6c7
Merge phpdbg into PHP-5.6
2014-10-24 19:22:45 +02:00
Bob Weinand
3639942891
Make xml valid (missing space between attrs)
2014-10-24 14:42:18 +02:00
Bob Weinand
dc61a5c359
Fix info classes file name in xml
2014-10-24 14:29:06 +02:00
Bob Weinand
87c055e95e
Add note about <eval> tag for errors in xml.md
2014-10-24 14:18:02 +02:00
Bob Weinand
9053b8a4d4
Name the tag <eval> if the error id during ev cmd
2014-10-24 14:16:49 +02:00
Bob Weinand
b0089e3c2f
Do not print out xml as PHP print...
2014-10-24 13:11:14 +02:00
Bob Weinand
9ce03bc7da
Fix output to wrong function
2014-10-24 12:55:44 +02:00
Bob Weinand
56b3eda377
Fixed parameter order on %.*s
2014-10-24 12:32:48 +02:00
Bob Weinand
23a408a51b
Too much copypaste...
2014-10-23 20:14:12 +02:00
Bob Weinand
f025482678
Add xml formatted deep dump of return value from ev
2014-10-23 17:19:26 +02:00
Bob Weinand
28dcdb2d13
Fix some compiler warnings
2014-10-23 13:23:37 +02:00
Bob Weinand
6ee2dc47f3
Move phpdbg_print and helper functions to phpdbg_out.*
2014-10-23 13:16:00 +02:00
Bob Weinand
4a836ced7e
Do not use int8_t when it is useless...
2014-10-23 13:02:50 +02:00
Bob Weinand
504448bce3
Fixed frame numbering in xml output
2014-10-23 12:38:35 +02:00
Bob Weinand
d61a12799c
Do not display dots in xml output for i v/i d
2014-10-23 12:23:48 +02:00
Stanislav Malyshev
4d54c4bdf0
fix NEWS & version
2014-10-22 13:16:29 -07:00
Bob Weinand
801080cf7e
Try fixing 5.4 and 5.5 build, again
2014-10-22 19:58:52 +02:00
Remi Collet
de4fff0fb3
NEWS
2014-10-22 15:39:49 +02:00
Remi Collet
1803228597
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
...
Upstream commit
https://github.com/file/file/commit/39c7ac1106be844a5296d3eb5971946cc09ffda0
CVE -2014-3710
2014-10-22 15:37:04 +02:00
Remi Collet
411984c0e9
NEWS
2014-10-22 15:27:21 +02:00
Remi Collet
ef2a2fa3a1
Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer
...
Upstream commit
https://github.com/file/file/commit/f28fbb947e3aa55fc40b09820f59ebff6f66f213
2014-10-22 15:24:59 +02:00
Anatol Belski
242387e51b
add comment
2014-10-21 17:43:23 +02:00
Anatol Belski
d7229b2bb6
restart listening on socket
...
if remote sent somthing else than ctrl+c while performing something blocking
2014-10-21 16:56:06 +02:00
Anatol Belski
b8368a7bcf
some minor fixes
2014-10-21 16:19:31 +02:00
Anatol Belski
6fcf7ede49
added phpdbg_eol.* sources
2014-10-21 16:18:44 +02:00
Anatol Belski
a741d3b266
basic EOL implementation for CRLF
2014-10-21 15:50:55 +02:00
Anatol Belski
0f3448ef8b
start sigio watcher only for run and eval for now
...
there myght be more needing that
2014-10-21 11:47:22 +02:00
Anatol Belski
63a450281a
reworked the current EOL stuff
2014-10-21 11:47:21 +02:00
Anatol Belski
e011f0ca60
prepare setting EOL with command or INI
2014-10-21 11:47:20 +02:00
Anatol Belski
55936dc23d
correct place to start the sigio watcher
...
plus started with the eol command
2014-10-21 11:47:19 +02:00
Anatol Belski
da40b116a6
further improvements to windows/sigio
2014-10-21 11:47:18 +02:00
Anatol Belski
3dec59f00d
basic sigio surrogate for windows
2014-10-21 11:47:17 +02:00
Bob Weinand
bafe6a9f7a
Always show the prompt (now also: <prompt> tag)
2014-10-20 22:05:05 +02:00
Bob Weinand
dfdc19fb2a
Fix off-by-one bug in text messages (msg/<phpdbg>)
2014-10-20 21:52:47 +02:00
Bob Weinand
27629577b0
Add xml.md info for info constants
2014-10-20 21:22:16 +02:00
Bob Weinand
d410b23f90
Ensure that %.*s uses the full string (INCLUDING \0)
2014-10-20 21:17:45 +02:00
Bob Weinand
3e5a4c6f30
Add info constants (alias: i d) command
2014-10-20 21:14:13 +02:00
Bob Weinand
6c6b356f63
Add values of scalars to info vars/globals
2014-10-20 16:05:37 +02:00
Anatol Belski
e0b247bc87
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
initialize lineno before calling compile file file in phar
News entry for new curl constants
2014-10-20 15:54:33 +02:00
Anatol Belski
37d5a2b18f
initialize lineno before calling compile file file in phar
2014-10-20 15:53:32 +02:00
Bob Weinand
fa1c26f022
Fix for ports >= 1<<15
2014-10-20 09:47:35 +02:00
Bob Weinand
2916a14018
Fix reading from remote on some *nixes
2014-10-20 08:46:22 +02:00
Bob Weinand
07670ff871
Fix TSRMLS_* and a few warnings
2014-10-19 21:20:43 +02:00
Anatol Belski
795cb98ac6
revert PHP_EOL changes
2014-10-19 20:09:39 +02:00
Anatol Belski
362c87f4b0
don't use timeout for the remote prompt, recv() will block until input arrives
2014-10-19 18:30:07 +02:00
Anatol Belski
0acafba89d
improve server sock creation and support ipv6
2014-10-19 13:40:45 +02:00
Anatol Belski
75bc207653
add comment
2014-10-19 11:16:56 +02:00
Anatol Belski
0929b7a4e4
increase default recv timeout to 30 seconds
2014-10-19 11:16:01 +02:00
Anatol Belski
2be895e4fe
more EOL fixes
2014-10-19 11:10:13 +02:00
Anatol Belski
52686b3226
use MSG_PEEK flag for recv() everywhere
2014-10-19 11:03:17 +02:00
Anatol Belski
e853fec3fd
fixed EOL transferred to the client side, fixed strftime fmt string
...
the windows telnet gets broken output when receiving no '\r'
2014-10-19 10:39:44 +02:00
Anatol Belski
d5fb8e5830
increase stack to avoid overflow crash on SIGINT
...
but should actually check, maybe something is causing a recursive
stack exhaustion
2014-10-19 02:14:31 +02:00
Anatol Belski
1137d9cb2b
several fixes to the new io stuff
2014-10-19 01:32:46 +02:00
Anatol Belski
52d2ead59d
override stdin and stdout to be remote, stderr is untouched however
...
is this ok? some functions want to write a log there ...
2014-10-19 01:31:00 +02:00
Anatol Belski
47388e6362
move these to use the mixed read/write routines
2014-10-19 01:30:00 +02:00
Anatol Belski
dd551706a9
add basic stuff to generalize IO
2014-10-19 00:12:23 +02:00
Anatol Belski
0cfd77185b
enable php_stdiop_write for windows
...
yet it's unclear whether it'll be usable, but otherwise it breaks
compilation as some places depend on it
2014-10-18 22:59:49 +02:00
Anatol Belski
3af83e196c
export functions needed for phpdbg
2014-10-18 22:55:14 +02:00
Anatol Belski
3ca381ee8b
fix dll export
2014-10-18 22:45:17 +02:00
Anatol Belski
f67bd30131
C89 compat
2014-10-18 22:43:56 +02:00
Bob Weinand
8525c40eac
Fix for 5.4/5.5
2014-10-18 21:54:44 +02:00
Bob Weinand
6932bbfd52
Merge branch 'xml-protocol'
...
Conflicts:
phpdbg.c
phpdbg_list.c
2014-10-18 21:12:25 +02:00
Bob Weinand
bdb18d9f48
Fix execution of immediately following commands
2014-10-18 20:42:54 +02:00
Bob Weinand
24972fa986
Fixed potential segfault in backtrace of internal funcs
2014-10-17 22:20:54 +02:00
Bob Weinand
f0e67720d4
Remove accidentally added null-byte in attributes
2014-10-17 19:39:09 +02:00
Bob Weinand
afe01e4956
Fix negative list offsets
2014-10-17 19:32:02 +02:00
Matteo Beccati
8c5e2e66bc
Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
2014-10-17 16:22:52 +02:00
Rasmus Lerdorf
d748c9f990
News entry for new curl constants
2014-10-16 21:38:19 -07:00
Rasmus Lerdorf
8c9e254319
News entry for new curl constants
2014-10-16 21:36:53 -07:00
Rasmus Lerdorf
5606466624
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
2014-10-16 21:28:20 -07:00
Rasmus Lerdorf
0d27b3ea69
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src: (129 commits)
NEWS
cleanup NEWS
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
Revert "Bug #67965 : Fix blocking behavior in non-blocking crypto streams"
Revert "Bug #41631 : Fix regression from first attempt (6569db8 )"
NEWS
Fixed Bug #65171 imagescale() fails
Fixed bug #68234
Revert "Bug #41631 : Observe socket read timeouts in SSL streams"
PHP-5.6.3 is next
update NEWS, 5.6.2 will be a security-only release
Fix return code (merges are hard :( )
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
Fix bug #68113 (Heap corruption in exif_thumbnail())
...
2014-10-16 21:27:49 -07:00
Rasmus Lerdorf
2b5bffe6c7
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
2014-10-16 21:25:29 -07:00
Bob Weinand
a80f0b982a
Fix lexing of -r \d+ in raw-string commands
2014-10-16 12:27:26 +02:00
Bob Weinand
68694e3141
Fix invalid dereference
2014-10-16 11:04:45 +02:00
Bob Weinand
22f1c8a062
Fix segfault in exceptions with xml
2014-10-15 22:00:33 +02:00
Bob Weinand
b28e3d01d7
Fix ctrl characters handling
2014-10-15 20:30:16 +02:00
Remi Collet
a3beb42ded
NEWS
2014-10-15 19:49:22 +02:00
Remi Collet
3d9f460313
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
cleanup NEWS
2014-10-15 19:48:25 +02:00
Remi Collet
a1abdba1eb
cleanup NEWS
2014-10-15 19:47:55 +02:00
Ferenc Kovacs
cfa1028d7e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed Bug #65171 imagescale() fails
Revert "Bug #41631 : Observe socket read timeouts in SSL streams"
Conflicts:
ext/openssl/xp_ssl.c
2014-10-15 19:42:51 +02:00
Ferenc Kovacs
2109f5bfe3
removing the NEWS entry as we had to revert this fix for now
2014-10-15 19:36:13 +02:00
Ferenc Kovacs
feadaaed56
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
...
This reverts commit 98e67add15 , reversing
changes made to 2cdc1a2b74 .
2014-10-15 19:34:07 +02:00
Ferenc Kovacs
4fb998d42f
Revert "fix TS build"
...
This reverts commit 84a4041ba4 .
2014-10-15 19:33:47 +02:00
Ferenc Kovacs
7b8222aa44
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
...
This reverts commit 30a73658c6 , reversing
changes made to 7fac56e072 .
2014-10-15 19:33:31 +02:00
Ferenc Kovacs
528e4166a6
Revert "Bug #67965 : Fix blocking behavior in non-blocking crypto streams"
...
This reverts commit f86b2193a4 .
2014-10-15 19:32:46 +02:00
Ferenc Kovacs
ff91a48f6e
Revert "Bug #41631 : Fix regression from first attempt ( 6569db8)"
...
This reverts commit 372844918a .
2014-10-15 19:32:14 +02:00
Remi Collet
503f8193e8
NEWS
2014-10-15 19:16:45 +02:00
Remi Collet
2728e6f017
Fixed Bug #65171 imagescale() fails
...
Third param (height) is set as optional,
but default value = -1 is incorrect
Compute correct height to preserve ratio.
2014-10-15 19:13:25 +02:00
Tjerk Meesters
836a5dfddb
Fixed bug #68234
...
Certificate will now expire in 2034
2014-10-15 21:12:13 +08:00
Julien Pauli
6d9c9f8f04
Revert "Bug #41631 : Observe socket read timeouts in SSL streams"
...
This reverts commit 6569db8808 .
Conflicts:
ext/openssl/xp_ssl.c
2014-10-15 14:38:12 +02:00
Ferenc Kovacs
646b4cca85
PHP-5.6.3 is next
2014-10-15 14:08:32 +02:00
Ferenc Kovacs
b85b87fabc
update NEWS, 5.6.2 will be a security-only release
2014-10-15 14:07:40 +02:00
Stanislav Malyshev
47a1447cc8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix return code (merges are hard :( )
2014-10-14 11:43:34 -07:00
Stanislav Malyshev
bb3d43fa05
Fix return code (merges are hard :( )
2014-10-14 11:42:33 -07:00
Stanislav Malyshev
3e4cef131e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-10-14 10:45:47 -07:00
Stanislav Malyshev
f9ba0a157f
Fix bug #68113 (Heap corruption in exif_thumbnail())
2014-10-14 10:45:36 -07:00
Stanislav Malyshev
71b63fc701
Fix bug #68089 - do not accept options with embedded \0
...
Conflicts:
ext/curl/interface.c
2014-10-14 10:45:35 -07:00
Stanislav Malyshev
88eb7ea47d
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
2014-10-14 10:44:57 -07:00
Stanislav Malyshev
2142d78281
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-10-14 10:44:39 -07:00
Stanislav Malyshev
ddb207e7fa
Fix bug #68113 (Heap corruption in exif_thumbnail())
2014-10-14 10:44:00 -07:00
Stanislav Malyshev
d1e030db02
Fix bug #68089 - do not accept options with embedded \0
...
Conflicts:
ext/curl/interface.c
2014-10-14 10:43:59 -07:00
Stanislav Malyshev
9aa9014523
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
2014-10-14 10:43:13 -07:00
Stanislav Malyshev
44035de79f
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-10-14 10:43:12 -07:00
Tjerk Meesters
fb35d7c56e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68128
2014-10-14 22:50:07 +08:00
Tjerk Meesters
71ba533640
Fixed bug #68128
...
Three issues are addressed:
- RecursiveRegexIterator::accept() should accept non-empty arrays without
applying any regular expression and RegexIterator::accept() should not accept
an array.
- RegexIterator::accept() should not accept an atom that fails to match
anything, even when PREG_PATTERN_ORDER is used (which would return an array
of empty arrays).
- RecursiveRegexIterator::getChildren() should pass all constructor arguments
to its child iterator instead of just the regular expression.
2014-10-14 22:49:01 +08:00
Stanislav Malyshev
4773c1dfdc
update NEWS and UPGRADING
2014-10-14 00:36:36 -07:00
Stanislav Malyshev
8615e42942
Merge branch 'pull-request/839' into PHP-5.6
...
* pull-request/839:
Upated NEWS
Address issues raised by @nikic
Make sure min < max
Mersenne Twister was added in GMP 4.2
Add test files
Add gmp_random_bits(bits) and gmp_random_range(min, max)
Change GMPs default PRNG to Mersenne Twister
2014-10-14 00:33:16 -07:00
Bob Weinand
c812ee9c35
Fix invalid efree() on null pointer and add help for -x
2014-10-14 09:16:30 +02:00
Stanislav Malyshev
287c91c1f0
Fix bug #68113 (Heap corruption in exif_thumbnail())
2014-10-13 23:17:45 -07:00
Stanislav Malyshev
ab0939e5e5
Fix bug #68089 - do not accept options with embedded \0
...
Conflicts:
ext/curl/interface.c
2014-10-13 23:16:06 -07:00
Stanislav Malyshev
56754a7f9e
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
2014-10-13 23:14:25 -07:00
Stanislav Malyshev
88412772d2
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-10-13 23:12:11 -07:00
Dmitry Stogov
7acba332fe
We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST.
2014-10-13 14:07:37 +04:00
Anatol Belski
449fd307e4
enable console options for remote on win
2014-10-12 20:05:26 +02:00
Anatol Belski
d5ce62c17c
basic rework for remote on win
2014-10-12 19:53:05 +02:00
Anatol Belski
a5607c4b5a
fix config.w32
2014-10-12 19:31:38 +02:00
Anatol Belski
c96a6b4493
DLL export several APIs needed for phpdbg
2014-10-12 19:22:03 +02:00
Tjerk Meesters
37a685ff2b
More fixes for nodelist array access
...
- testing for null property read
- no zval copying if the type is already long
- memory fix for master
2014-10-12 12:47:58 +08:00
Bob Weinand
1486a9ebf7
Fix some compiler warnings
2014-10-12 00:30:09 +02:00
Bob Weinand
e19c789979
Maybe-fix for krakjoe/phpdbg#120 , fixed remote on darwin
2014-10-11 23:36:12 +02:00
Bob Weinand
3445e0e59e
Fix issue krakjoe/phpdbg#122 (segfault in helpaliases)
2014-10-11 00:20:30 +02:00
Ard Biesheuvel
3e13c6dcb2
update NEWS
...
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org >
2014-10-10 11:45:24 +02:00
Ard Biesheuvel
8aa952410a
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-10 11:44:52 +02:00
Ard Biesheuvel
b73ef0ee4a
update NEWS
...
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org >
2014-10-10 11:44:39 +02:00
Ard Biesheuvel
c2cce33cba
Merge branch 'PHP-5.4' into PHP-5.5
2014-10-10 11:41:10 +02:00
Ard Biesheuvel
82b07b62c0
update NEWS
...
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org >
2014-10-10 11:40:07 +02:00
Tjerk Meesters
a88feb139c
Added note to UPGRADING regarding 64-bit support in pack()/unpack()
2014-10-10 07:33:06 +08:00
Tjerk Meesters
30f8a9baff
RFC: 64 bit format codes for pack() and unpack()
2014-10-10 07:00:38 +08:00
Leigh
63fd969300
Add 64 bit formats to pack() and unpack()
2014-10-09 21:02:42 +01:00
Tjerk Meesters
59f39dea66
Refactored DOMNodeList array dereferencing implementation
2014-10-09 23:07:12 +08:00
Bob Weinand
9dfc5d5511
Escape control characters
2014-10-09 16:06:10 +02:00
Bob Weinand
e72b00b1ec
Only show req attribute if given
2014-10-09 14:54:47 +02:00
Bob Weinand
f4f9e39faa
Fix ev/run/sh parsing
2014-10-09 14:54:08 +02:00
Bob Weinand
0bcb32ae47
Fixed segfault when listing and last line is empty
...
Conflicts:
phpdbg_list.c
2014-10-09 12:51:04 +02:00
Bob Weinand
a54de936d0
Fixed segfault when listing and last line is empty
2014-10-09 12:43:53 +02:00
Bob Weinand
31b6024c65
Updated xml.md
2014-10-09 12:35:54 +02:00
Bob Weinand
a7918213e7
Always output request id in containers
2014-10-09 12:24:52 +02:00
Bob Weinand
eeafa4e518
Merge branch 'master' into xml-protocol
2014-10-09 12:01:43 +02:00
Bob Weinand
ca7f2f5f43
Ports are unsigned short, use unsigned to display
2014-10-09 12:01:25 +02:00
Bob Weinand
b426897c9c
Fix regression in list
...
It showed the entire remaining file before...
2014-10-09 11:52:57 +02:00
Bob Weinand
96de7c4b0a
Reduce variabledetails+variable to just one variable tag
2014-10-09 11:47:52 +02:00
Tjerk Meesters
72bd28a5da
Updated NEWS for #67949
2014-10-09 16:18:14 +08:00
Tjerk Meesters
8a3b41cd39
Merge branch 'pr/846' into PHP-5.6
...
* pr/846:
DOMNodeList elements are accessible through array notation
2014-10-09 15:55:10 +08:00
Tjerk Meesters
cac55bad1a
Updated NEWS for #68129
2014-10-09 08:24:30 +08:00
Tjerk Meesters
f92c9b3ced
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS for #68129
Fixed bug #68129
2014-10-09 08:24:05 +08:00
Tjerk Meesters
061cb9b807
Updated NEWS for #68129
2014-10-09 08:23:42 +08:00
Tjerk Meesters
d0e51f5ce9
Fixed bug #68129
...
Empty usernames and passwords are now treated differently from no username or password
For example, empty password:
ftp://user:@example.org
Empty username:
ftp://:password@example.org
Empty username and empty password
ftp://:@example.org
2014-10-09 08:21:30 +08:00
Bob Weinand
9db6a93b69
Add <intros> tag around <intro /> tags
2014-10-09 00:25:25 +02:00
Bob Weinand
07bbe62742
Put stack_verify in error buffer too
2014-10-08 23:44:22 +02:00
Bob Weinand
fa89d8b3f9
Fix escaping of <
2014-10-08 23:42:20 +02:00
Dmitry Stogov
aec519199b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added info about ext/opcache
2014-10-08 21:49:53 +04:00
Dmitry Stogov
09f9403a6e
Added info about ext/opcache
2014-10-08 21:48:44 +04:00
Bob Weinand
0ef8b4caf3
Revert WS change from "[\r\n\t ]+" to "[\t ]+"
2014-10-08 00:35:17 +02:00
Bob Weinand
89a0d3c2b2
Merge branch 'master' into xml-protocol
...
Conflicts:
phpdbg_lexer.c
phpdbg_prompt.c
2014-10-08 00:27:12 +02:00
Bob Weinand
eabcdb2eb2
Fix bug which causes inf loop on \r\n
2014-10-08 00:15:21 +02:00
Keyur Govande
3bd8ac6710
Add to NEWS
2014-10-07 21:22:54 +00:00
Keyur Govande
92f108801e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add to NEWS
Fix for bug #68087 (ODBC not reading DATE columns correctly)
2014-10-07 21:22:07 +00:00
Keyur Govande
d319a0c1d8
Add to NEWS
2014-10-07 21:21:23 +00:00
Keyur Govande
df9078ea55
Fix for bug #68087 (ODBC not reading DATE columns correctly)
...
Temporary variable indicating column field type ID should be
reset to default for loop iteration (i.e. every column in the
record set. The old buggy code made it persist across all columns
leading to invalid reads from the buffer, if for example a DATE
column was preceded by a VARCHAR column.
2014-10-07 21:17:36 +00:00
Keyur Govande
6f634ebb8c
Add to NEWS
2014-10-07 21:09:47 +00:00
Keyur Govande
bcda6c9392
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add to NEWS
Fix for bug #68114 (Build fails on OS X due to undefined symbols)
2014-10-07 21:08:18 +00:00
Keyur Govande
d21602c072
Add to NEWS
2014-10-07 21:07:19 +00:00
Keyur Govande
648673bffe
Fix for bug #68114 (Build fails on OS X due to undefined symbols)
...
gcc (i686-apple-darwin10-gcc-4.2.1) on OS X cannot link fixed-width
decimals and fails with undefined symbols errors like ___extendsddf.
If configure used gcc for compiling it would notice and mark the
feature HAVE_DECIMAL_FP_SUPPORT as unsupported.
But configure seems to use cc (i686-apple-darwin10-llvm-gcc-4.2)
instead, which doesn't support fixed-width decimals either, but the
code compiles and links just fine. I suspect it may have something
to do with the llvm backend printed in the version.
Lacking the time to debug this further, the patch fixes the issue by
checking the expected output when fixed-width decimal support is
present and correctly implemented.
2014-10-07 20:58:43 +00:00
Leigh
106fab00bc
Upated NEWS
2014-10-07 14:28:02 +01:00
Leigh
aa679295e4
Merge branch 'PHP-5.6' of https://github.com/php/php-src into gmp-random
2014-10-07 14:25:44 +01:00
Leigh
f66013df94
Apply error-code-salt fix to Windows too
2014-10-07 13:12:38 +01:00
krakjoe
4b3a11debb
make build work moar
2014-10-07 12:36:03 +01:00
Leigh
4e8c876120
Bug fixes in light of failing bcrypt tests
2014-10-07 12:27:57 +01:00
Bob Weinand
8bc2881260
Merge branch 'master' into xml-protocol
...
Conflicts:
phpdbg.c
phpdbg.h
phpdbg_cmd.c
phpdbg_cmd.h
phpdbg_frame.c
phpdbg_info.c
phpdbg_list.c
phpdbg_print.c
phpdbg_prompt.c
phpdbg_utils.c
phpdbg_utils.h
phpdbg_watch.c
2014-10-07 13:08:30 +02:00
Leigh
a0420a72af
Add tests from 1.3. Add missing tests.
...
3 of the missing tests fail. // TODO
2014-10-07 11:50:36 +01:00
krakjoe
f545ef48eb
fix case insensitivity for registered functions
2014-10-07 11:30:26 +01:00
Leigh
e331f9af73
Upgrade crypt_blowfish to version 1.3
2014-10-07 11:23:24 +01:00
krakjoe
556ed2d3f4
fix mistake in help
2014-10-07 10:28:21 +01:00
Bob Weinand
6f584e22fe
Merge branch 'webdata_transfer'
2014-10-07 00:45:29 +02:00
Bob Weinand
2422c70c4f
" => &quot; in md document
2014-10-06 22:34:41 +02:00
Bob Weinand
699497e99f
Add request id to <backtrace>
2014-10-06 13:20:04 +02:00
Bob Weinand
abd75ea2c5
Fix frames output
2014-10-06 11:46:39 +02:00
Bob Weinand
fb76316819
Add request_id possibility for xml output
2014-10-06 11:26:08 +02:00
Bob Weinand
8b6d707df0
Use PHP 5.4 compatible zend_execute in #if
2014-10-05 13:57:35 +02:00
Bob Weinand
2f6317c483
Fix infinite recursion issues (segfaults)
2014-10-05 13:33:31 +02:00
Bob Weinand
38e981bbdc
Fix infinite recursion issues (segfaults)
2014-10-05 13:29:56 +02:00
Bob Weinand
bedd503c3f
Consistency in breakpoint tags, <run> => <stop>
2014-10-05 12:33:24 +02:00
Bob Weinand
9cc73b5c75
Fix precision handling in strings
2014-10-05 11:57:14 +02:00
Bob Weinand
c55dbad546
Disable automatic resetting of imported auto_globals
2014-10-05 02:27:51 +02:00
Bob Weinand
f48fc67c86
Fix (system) ini entry transfer
2014-10-05 00:16:19 +02:00
Bob Weinand
62465b6d82
Fix issues with path names and cwd
2014-10-04 23:30:57 +02:00
Bob Weinand
19cdad194b
Add transfer of output back to webserver and merge master in
...
Conflicts:
config.m4
phpdbg.c
phpdbg.h
phpdbg_cmd.c
phpdbg_prompt.c
2014-10-04 23:21:34 +02:00
Johannes Schlüter
79ca53b62b
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-04 20:06:44 +02:00
Johannes Schlüter
b386991471
Fix accidental edit in previous commit
2014-10-04 20:06:02 +02:00
Johannes Schlüter
61d29990b4
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-04 20:00:10 +02:00
Johannes Schlüter
136dd53ac2
Fix arginfo
2014-10-04 19:59:21 +02:00
Bob Weinand
9d96cde268
LIBREADLINE => HAVE_LIBREADLINE
2014-10-04 17:02:44 +02:00
Derick Rethans
0e5f475f5e
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-04 15:59:17 +01:00
Derick Rethans
0874ef624c
Merge branch 'PHP-5.4' into PHP-5.5
2014-10-04 15:58:40 +01:00
Florian MARGAINE
046c345de5
DateTimeZone::getOffset() now accepts a DateTimeInterface
...
Fixes #68062
2014-10-04 15:58:24 +01:00
Bob Weinand
490aa1f984
Use or instead of and for libedit and readline
2014-10-04 16:31:34 +02:00
George Wang
0e18003374
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-10-03 16:43:35 -04:00
George Wang
ef0eed7f5f
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-10-03 16:43:08 -04:00
George Wang
5b08e56eca
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:27 -04:00
George Wang
0cc2600ec6
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:15 -04:00
George Wang
26ff3a4c1e
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:41:32 -04:00
Nikita Popov
56da3638c4
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-03 21:42:28 +02:00
Nikita Popov
d67c05bb89
Fix bug number
2014-10-03 21:41:58 +02:00
Nikita Popov
8617f2fa8d
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-03 21:27:07 +02:00
Nikita Popov
93288d0095
Fix bug #68188
2014-10-03 21:26:39 +02:00
Bob Weinand
323e59adfc
Added support for a restricted ev (variables only) in async safe contexts
2014-10-03 12:43:32 +02:00
Ferenc Kovacs
79e05bf557
NEWS entry for previous commit
2014-10-03 11:39:53 +02:00
Ferenc Kovacs
200e407b24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS entry for previous commit
add IPv6 support to php-fpm
2014-10-03 11:39:09 +02:00
Ferenc Kovacs
25e65a7599
NEWS entry for previous commit
2014-10-03 11:38:32 +02:00
Robin Gloster
15ba757a2b
add IPv6 support to php-fpm
2014-10-03 11:35:27 +02:00
Sara Golemon
f41a7b926a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add hash to EXTENSIONS file
2014-10-02 18:55:29 -07:00
Sara Golemon
2cf94189a2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add hash to EXTENSIONS file
2014-10-02 18:55:14 -07:00
Sara Golemon
4e7b31a0db
Add hash to EXTENSIONS file
2014-10-02 18:54:46 -07:00
Bob Weinand
8af0870d72
Made some functions async safe and provide interactive shell in signal handler
...
Fixes also (as a side-effect) a possible bug in list function when included files become unreachable after loading by caching the file contents
This is already pretty stable; a (restricted) ev and sh may follow.
2014-10-03 01:29:41 +02:00
Ferenc Kovacs
7a529790b2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
we also have xz release tarballs since 5.5
5.5.19 now
Conflicts:
configure.in
main/php_version.h
2014-10-02 22:32:18 +02:00
Ferenc Kovacs
d7b01aff89
we also have xz release tarballs since 5.5
2014-10-02 22:28:19 +02:00
Bob Weinand
7911b6405c
Remove accidental insertion of a single "s"
2014-10-02 11:18:36 +02:00
Julien Pauli
cfe8a8b968
5.5.19 now
2014-10-01 16:16:05 +02:00
Ferenc Kovacs
26f4e40622
update NEWS about the release date of 5.6.1
2014-10-01 11:15:59 +02:00
Remi Collet
3e6f176733
only no_NO.ISO-8859-1 have to be ignored
2014-10-01 10:14:14 +02:00
krakjoe
7cbd8f8b8a
remove bogus locale use from test
2014-10-01 10:12:06 +02:00
Remi Collet
f584b67eaa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
use $PHP_LIBDIR instread of "lib" in skel example
2014-10-01 09:26:46 +02:00
Remi Collet
7319298ffe
use $PHP_LIBDIR instread of "lib" in skel example
2014-10-01 09:26:21 +02:00
Paulo Eduardo
17759439d7
Test PHP Init Fail Without Params
2014-09-30 08:56:46 -03:00
Anatol Belski
df4d559881
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test filename
2014-09-29 20:30:43 +02:00
Anatol Belski
7f1239232e
fix test filename
2014-09-29 20:30:18 +02:00
Anatol Belski
cc3849f039
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
one more test to illustrate transfer of an arbitrary data amount throug pipes
2014-09-29 20:19:31 +02:00
Anatol Belski
1a2a8c6d4e
one more test to illustrate transfer of an arbitrary data amount throug pipes
2014-09-29 20:18:33 +02:00
Anatol Belski
70ff3ad7d1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix tests on linux
better test cleanup
2014-09-29 18:12:56 +02:00
Anatol Belski
859913f6d4
fix tests on linux
2014-09-29 18:12:25 +02:00
Anatol Belski
91d3cd8559
better test cleanup
...
and even force the XFAIL to fail as it would take too long anyway, even if it passes
2014-09-29 18:11:06 +02:00
Anatol Belski
231a311ecb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
increase the polling period to not to break existing behaviours
2014-09-29 17:28:27 +02:00
Anatol Belski
46aa2c396b
increase the polling period to not to break existing behaviours
2014-09-29 17:27:24 +02:00
Anatol Belski
7e16bb263f
updated NEWS
2014-09-29 16:28:12 +02:00
Anatol Belski
87a37f4090
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #51800 proc_open on Windows hangs forever
2014-09-29 16:27:33 +02:00
Anatol Belski
0c982798e0
Fixed bug #51800 proc_open on Windows hangs forever
...
This loop can block for some minutes, theoretically. Practially
however, this is a 99% non issue for a normal use case. This is
required because read() is synchronous. The PHP streams API wants
to fill its internal buffers, therefore it might try to read some
more data than user has demanded. Also, for a case where we want
to read X bytes, but neither enough data nor EOF arrives, read()
will block until it could fill the buffer. If a counterpart station
runs slowly or delivers not all the data at once, read() would
still be waiting. If we quit too early, we possibly could loose
some data from the pipe. Thus it has to emulate the read()
behaviour, but obviously not completely, just to some grade.
Reading big data amount is for sure an issue on any platforms, it
depends on the pipe buffer size, which is controlled by the system.
On Windows, the buffer size seems to be way too small, which causes
buffer congestion and a dead lock. It is essential to read the pipe
descriptors simultaneously and possibly in the same order as the
opposite writes them.
Thus, this will work with smaller buffer data sizes passed through
pipes. As MSDN states, anonymous pipes don't support asynchronous
operations. Neither anonymous pipes do support select() as they are
not SOCKETs but file descriptors. Consequently - bigger data sizes
will need a better solution based on threads. However it is much
more expencive. Maybe a better solution could be exporting a part
of the internal doing as a userspace function which could perform
some kind of lookahead operation on the pipe descriptor.
This is just the first stone, depending on the user feedback we
might go for further improvements in this area.
2014-09-29 16:24:34 +02:00
Pedro MFA Evangelista
2c6ecbbea1
Add my information to this test
2014-09-28 23:25:47 -03:00
Pedro MFA Evangelista
8cd23d49db
Add a test for the exception cases of readline_read_history
2014-09-28 23:25:47 -03:00
Rodrigo Prado de Jesus
d89b1dad8a
added some tests to datetime and dateinterval functions
2014-09-28 20:30:52 -03:00
Rodrigo Prado de Jesus
813830e763
added various tests for XSLTProcessor and one test for iconv extension
2014-09-28 20:29:29 -03:00
Rodrigo Wanderley de Melo Cardoso
c0b83ba2be
teste basico da funcao timezone_version_get
2014-09-28 19:03:32 -03:00
Stanislav Malyshev
a8e84b1b21
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Set an LDAP error code when failing ldap_bind due to null bytes
2014-09-28 12:25:49 -07:00
Stanislav Malyshev
ef39f40445
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Set an LDAP error code when failing ldap_bind due to null bytes
2014-09-28 12:25:24 -07:00
Matthew Daley
fcbe20d357
Set an LDAP error code when failing ldap_bind due to null bytes
...
Some applications check a LDAP link's error code after seeing ldap_bind
fail due to a null byte bind attempt and hence incorrectly receive the
last set error code.
Fix by setting an LDAP error code before returning in this case.
2014-09-28 12:23:52 -07:00
Bob Weinand
b183494f37
Send a \x03 during execution to interrupt (POSIX only)
2014-09-28 02:57:12 +02:00
Johannes Schlüter
16b4167fdd
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-27 02:18:29 +02:00
Johannes Schlüter
e6105ffb22
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-27 02:17:52 +02:00
Johannes Schlüter
2711948d14
This test should pass
2014-09-27 02:17:26 +02:00
Florian MARGAINE
9469db9311
DOMNodeList elements are accessible through array notation
...
Fixes #67949
2014-09-27 01:27:46 +02:00
Derick Rethans
71c39612d5
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-26 16:27:05 +01:00
Derick Rethans
5d299509b4
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-26 16:27:00 +01:00
Derick Rethans
16e2d954fc
- Updated to version 2014.8 (2014h)
2014-09-26 16:26:59 +01:00
Stanislav Malyshev
b465f00d42
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix date
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
2014-09-26 01:01:39 -07:00
Stanislav Malyshev
00e99dcafd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Conflicts:
ext/openssl/xp_ssl.c
2014-09-26 01:00:20 -07:00
Stanislav Malyshev
2bfe92c90f
fix date
2014-09-26 00:56:39 -07:00
Stanislav Malyshev
28ed0119ac
update NEWS
2014-09-26 00:55:49 -07:00
Stanislav Malyshev
408b172017
Revert xp_ssl.c to the state of 5.4.32 due to regressions
2014-09-26 00:44:24 -07:00
Remi Collet
d19356948a
NEWS
2014-09-26 09:07:12 +02:00
Remi Collet
97cab239d7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #68103 Dupplicate entry in Reflection
2014-09-26 09:06:51 +02:00
Remi Collet
bf046d6d66
NEWS
2014-09-26 09:06:12 +02:00
Remi Collet
efa7f87de4
Fixed bug #68103 Dupplicate entry in Reflection
...
$ php -r '$r=new ReflectionExtension("pthreads"); print_r($r->getClassNames());'
Array
(
[0] => Threaded
[1] => stackable
[2] => Thread
[3] => Worker
[4] => Mutex
[5] => Cond
[6] => Collectable
[7] => Pool
)
In getClasses() output, it is possible to compare key (ex "stackable")
with $obj->name (ex "Threaded") to detect class alias.
...
[Threaded] => ReflectionClass Object
(
[name] => Threaded
)
[stackable] => ReflectionClass Object
(
[name] => Threaded
)
...
2014-09-26 08:56:42 +02:00
Bob Weinand
aeb7508959
Fix typo: inactivee => inactive
2014-09-25 22:01:31 +02:00
Bob Weinand
6e698f1fa5
Push first draft of xml protocol documentation
2014-09-25 21:26:57 +02:00
Bob Weinand
7beb17f2fd
Make set commands more consistent
2014-09-25 21:25:18 +02:00
Bob Weinand
1ad0287499
Make phpdbg_prompt.c xml messages more consistent
2014-09-25 15:28:25 +02:00
Bob Weinand
c30c40c359
Make print command xml output more consistent
2014-09-25 02:04:12 +02:00
Bob Weinand
5ba53cac06
Fix tests
2014-09-25 01:29:08 +02:00
Bob Weinand
67787d7b6d
Merge branch 'master' into xml-protocol
...
Conflicts:
phpdbg_utils.c
2014-09-25 01:22:33 +02:00
Bob Weinand
a4c4c3593b
Fix test after adding script ended notice
2014-09-25 00:59:17 +02:00
Bob Weinand
2bd1a74690
Always add a newline before a warning or a notice
2014-09-25 00:55:17 +02:00
Bob Weinand
abafb7b4f9
Better naming in list command and inform about filename
2014-09-25 00:22:58 +02:00
Bob Weinand
9bd171888b
Use more consistent naming in info command for xml protocol
2014-09-25 00:21:27 +02:00
Leigh
adf8f0f284
Address issues raised by @nikic
...
- Thread safety on rand init function.
- Ret false on validation failure
- Add _dep of temp_a to temp_b
- Special case int sized min values
- More tests!
2014-09-24 22:01:09 +01:00
Ferenc Kovacs
d27f3e7b64
update the certificate used for the test, as it expired recently
2014-09-24 13:40:52 +02:00
Remi Collet
44921ca75d
typo
2014-09-24 10:42:20 +02:00
Remi Collet
8d2de21b1c
NEWS
2014-09-24 10:36:29 +02:00
Remi Collet
0d776ef87b
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
2014-09-24 10:34:55 +02:00
Ferenc Kovacs
213d9ee62d
the order of the blocks should be Core, then exts in alphabetical order
2014-09-24 09:40:52 +02:00
Ferenc Kovacs
8673394ecc
add missing NEWS entry for the phpdbg compilation fix
2014-09-24 09:39:14 +02:00
Ferenc Kovacs
60dda65306
add NEWS entry for #68088
2014-09-24 09:09:34 +02:00
Leigh
3e9a31748d
Make sure min < max
2014-09-24 07:56:46 +01:00
Leigh
acd7fcf55f
Mersenne Twister was added in GMP 4.2
2014-09-23 23:16:26 +01:00
Leigh
31e27fc89a
Add test files
2014-09-23 22:54:40 +01:00
Leigh
831bb9260c
Add gmp_random_bits(bits) and gmp_random_range(min, max)
2014-09-23 22:12:23 +01:00
Leigh
3d6d863ccb
Change GMPs default PRNG to Mersenne Twister
...
Since we don't allow users to seed the RNG, there is no BC issue with changing the generator.
2014-09-23 19:51:56 +01:00
Bob Weinand
3b81337f80
Fix accidental short-circuiting when comparing fds (& warnings)
2014-09-23 18:29:36 +02:00
Bob Weinand
79ea51f360
Use consistently "num" for an nth opline number
2014-09-23 17:04:39 +02:00
Bob Weinand
beb9520039
Merge branch 'master' into xml-protocol
...
Conflicts:
phpdbg_prompt.c
2014-09-23 16:51:18 +02:00
Bob Weinand
92fe2d0a85
Add info globals command
2014-09-23 16:48:37 +02:00
Bob Weinand
e2329bc704
Add notification at script end
2014-09-23 13:04:53 +02:00
Tjerk Meesters
1765548bce
PR 837: Fixed typo in php.ini-development and php.ini-production
...
Fixed typo in comment for 'mbstring.detect_order'
2014-09-23 18:10:32 +08:00
Sebastian Zartner
876792c756
Fixed typo
2014-09-23 07:45:03 +02:00
Bob Weinand
7f9e036077
Fix breakpoints and listing
2014-09-22 23:28:07 +02:00
Bob Weinand
ca635e4884
A few general segfault fixes
2014-09-22 00:52:22 +02:00
Bob Weinand
bbeccd7474
First draft of an xml protocol
2014-09-21 04:17:19 +02:00
Ard Biesheuvel
8312836c74
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-20 16:42:12 -07:00
Ard Biesheuvel
7958793342
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-20 16:40:02 -07:00
Ard Biesheuvel
e64da8c20d
Fixed bug #66242 (don't assume char is signed)
...
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org >
2014-09-20 16:39:48 -07:00
Nikita Popov
308c0a727e
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-20 21:47:59 +02:00
Nikita Popov
5e977e69e1
Fixed bug #67633
2014-09-20 21:46:25 +02:00
Anatol Belski
6213d9fc91
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix possible array underflow
2014-09-19 20:13:46 +02:00
Anatol Belski
5d9403f56c
fix possible array underflow
...
there are multiple issues with this code
- php_stream_read() returns an unsigned val, so is >= 0
- if it read less than sizeof(a) bytes, the function operates on garbage
- result->channels is an unsigned val, so >= 0
2014-09-19 20:12:24 +02:00
Matteo Beccati
24ed330a22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed freetype test on multiple environments
2014-09-16 10:22:49 +02:00
Matteo Beccati
b8470e19e4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed freetype test on multiple environments
2014-09-16 10:22:34 +02:00
Matteo Beccati
00525b824a
Fixed freetype test on multiple environments
...
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)
This reverts commit 592df89027 .
2014-09-16 10:19:29 +02:00
Remi Collet
a410067d78
NEWS
2014-09-15 13:32:13 +02:00
Remi Collet
47bc380ecf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
2014-09-15 13:31:26 +02:00
Remi Collet
ad0b63cad4
NEWS
2014-09-15 13:31:17 +02:00
Remi Collet
8cac75969e
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
...
ProxyPass is unable to provide correct PATH_INFO
as it is not aware of file path (while SetHandler is).
As we can extract PATH_INFO from PATH_TRANSLATED,
we also need to check if present in SCRIPT_NAME
and remove it.
After applying this patch.
With mod_php
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foor/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
With mod_proxy_fcgi + SetHandler
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foo/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
With mod_proxy_fcgi + ProxyPass
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foo/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
2014-09-15 13:29:55 +02:00
Anatol Belski
7f0f04e606
updated NEWS
2014-09-15 10:29:00 +02:00
Anatol Belski
e8780e27fd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
2014-09-15 10:28:22 +02:00
Anatol Belski
24b41a23b3
updated NEWS
2014-09-15 10:27:52 +02:00
Bob Weinand
e0e990229d
Use full duplex stdin/stdout socket
2014-09-15 09:58:14 +02:00
Remi Collet
a390d579bb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8
2014-09-15 08:24:20 +02:00
Remi Collet
6dc6daf7e3
Fix NEWS
...
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in ee275e34c8
2014-09-15 08:24:10 +02:00
Remi Collet
3411fe33a2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8
2014-09-15 08:23:40 +02:00
Remi Collet
2775dc2b44
Fix NEWS
...
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in ee275e34c8
2014-09-15 08:23:25 +02:00
Bob Weinand
29d8aad2f6
Merge phpdbg into PHP-5.6
2014-09-15 05:48:09 +02:00
Bob Weinand
0cb365fb98
Merge phpdbg into PHP-5.6
2014-09-15 05:48:09 +02:00
Bob Weinand
05c73757ed
Fix bug #111 (compile error without ZEND_SIGNALS)
2014-09-14 12:24:56 +02:00
Anatol Belski
bcdbd47117
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed the cast and incompatible pointer warning
2014-09-12 14:36:54 +02:00
Anatol Belski
fdfc31a4f7
fixed the cast and incompatible pointer warning
2014-09-12 14:36:00 +02:00
Anatol Belski
13280a9e36
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
2014-09-11 23:31:16 +02:00
Anatol Belski
69ea7f9509
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
2014-09-11 23:30:01 +02:00
Julien Pauli
8ff79d3e89
5.6.2 now
2014-09-11 18:37:25 +02:00
Anatol Belski
0b89bb83ba
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix precision when fetching float through mysqlnd
2014-09-10 19:31:59 +02:00
Anatol Belski
dff820cea3
fix precision when fetching float through mysqlnd
...
fixes failing ext/mysqli/tests/010.phpt
2014-09-10 19:29:11 +02:00
Bob Weinand
cccc75eef9
Do not unload phpdbg module in any case
2014-09-10 17:01:08 +02:00
Bob Weinand
554b30389e
Fix segfaults, reorder files and set filename to exec
2014-09-10 16:03:26 +02:00
Bob Weinand
c35bb34608
Add webhelper extension and support for loading extensions
...
New phpdbg commands:
dl [path] - loads module / Zend extension
wait - waits for incoming connection from a phpdbg_webhelper module
Webhelper module is a UNIX domain socket to which a SAPI with the phpdbg_webhelper module loaded will write to the socket information about its whole environment.
phpdbg can then run the request locally [TODO: write the request back to the sender]
2014-09-10 16:03:26 +02:00
Bob Weinand
6464b3ffae
Don't run travis against master (phpng)
2014-09-10 15:57:05 +02:00
Michael Wallner
4f2563329b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
make LTP version check a blacklist
2014-09-10 13:31:22 +02:00
Michael Wallner
3b78a24ee9
make LTP version check a blacklist
2014-09-10 13:30:52 +02:00
Matteo Beccati
0b648a424f
FR #67990 - Added nowait argument to sem_acquire
2014-09-10 07:31:25 +02:00
Stanislav Malyshev
3571a68ab9
update NEWS
2014-09-09 16:11:32 -07:00
Daniel Lowrey
edb2799333
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #41631 : Fix regression from first attempt (6569db8 )
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 10:24:40 -06:00
Daniel Lowrey
bf2f80b223
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #41631 : Fix regression from first attempt (6569db8 )
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 09:27:20 -06:00
Daniel Lowrey
372844918a
Bug #41631 : Fix regression from first attempt ( 6569db8)
2014-09-09 09:01:42 -06:00
Daniel Lowrey
f86b2193a4
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 07:37:57 -06:00
Tjerk Meesters
da7c87e2f8
Updated NEWS for #67985
2014-09-09 18:04:09 +08:00
Tjerk Meesters
7e9daf60c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed #67985 - Incorrect last used array index copied to new array after unset
2014-09-09 18:03:10 +08:00
Tjerk Meesters
b9ac5e23fb
Updated NEWS for #67985
2014-09-09 18:02:45 +08:00
Tjerk Meesters
aca474fa14
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed #67985 - Incorrect last used array index copied to new array after unset
2014-09-09 18:00:49 +08:00
Tjerk Meesters
99f0760bfb
Fixed #67985 - Incorrect last used array index copied to new array after unset
...
In master zend_array_dup() is used to do this properly; this is a workaround.
2014-09-09 17:58:45 +08:00
Michael Wallner
8d1099ac05
duplicate value's string for the SAPI filter
...
reported by sesser; tyrael, do you take care of the bug/NEWS?
2014-09-09 06:54:23 +02:00
George Wang
4bdd9aabdd
Fine tuned the order of adding request variables.
2014-09-09 00:01:03 -04:00
George Wang
bdac08bcdd
Fine tuned the order of adding request variables.
2014-09-09 00:00:14 -04:00
George Wang
d2e1a04b10
Fine tuned the order of adding request variables.
2014-09-08 23:58:05 -04:00
Adam Harvey
0cbfdc9df5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
5.5.18 now
Conflicts:
configure.in
main/php_version.h
2014-09-08 19:28:15 +00:00
Adam Harvey
bc44eb6172
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
...
SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
2014-09-08 19:25:14 +00:00
Nikita Popov
03797a73b2
Split GMP tests testing multiple functions
...
Also drop dummy test
2014-09-04 21:18:37 +02:00
Nikita Popov
9586b15229
Give proper names to GMP test files
2014-09-04 21:10:41 +02:00
Nikita Popov
15c139b99a
Throw warnings when using zero modulus in gmp_powm
...
Also fixes a leak in this case.
2014-09-04 20:55:09 +02:00
Nikita Popov
f10d194c8c
Add GMP tests for some uncovered branches
2014-09-04 20:03:29 +02:00
Tjerk Meesters
af3bd57d33
Updated NEWS for #67955
2014-09-04 07:00:14 +08:00
Tjerk Meesters
fa08ff9245
Fixed #67955 : SoapClient prepends 0-byte to cookie names
2014-09-04 06:58:04 +08:00
George Wang
b85b78db4f
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:29:44 -04:00
George Wang
b16929ca72
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-09-03 11:28:30 -04:00
George Wang
bba16dde5d
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:27:54 -04:00
George Wang
582f42b8d4
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:24:45 -04:00
Philip Hofstetter
9befa8c5f7
fix bug #67955
...
this fixes a regression from 6c2a806820 .
smart_str_appendl is expecting the length as the length of the string,
but key_length is the byte length of the key, including the 0
terminator.
As such, the cookie name appeneded to the header would now also include
the 0 terminator of the key name which then would be sent to the server.
2014-09-03 14:35:40 +02:00
Julien Pauli
9266227402
5.5.18 now
2014-09-03 10:18:51 +02:00
Matteo Beccati
627704b38e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test with freetype >= 2.4.12
2014-09-03 09:45:09 +02:00
Matteo Beccati
72c9b0e12b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test with freetype >= 2.4.12
2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027
Fixed test with freetype >= 2.4.12
2014-09-03 09:43:29 +02:00
Stanislav Malyshev
3e7d11b632
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.34 is next
2014-09-02 15:04:00 -07:00
Stanislav Malyshev
a734acd439
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.34 is next
Conflicts:
configure.in
main/php_version.h
2014-09-02 15:03:54 -07:00
Stanislav Malyshev
5e95b61639
5.4.34 is next
2014-09-02 15:03:04 -07:00
Stanislav Malyshev
0c6e2b5219
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:19:03 -07:00
Stanislav Malyshev
70f92aa97e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:18:05 -07:00
Stanislav Malyshev
fe551c089a
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
...
This reverts commit 53fa6c5b6b .
The change breaks tests, so not putting it into 5.4.
2014-09-02 14:15:39 -07:00
Stanislav Malyshev
63f42adbb2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:32:40 -07:00
Stanislav Malyshev
af85eff5b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:32:03 -07:00
Stanislav Malyshev
53fa6c5b6b
Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:31:03 -07:00
Nikita Popov
834daa455b
Fixed bug #50175
...
0x and 0b prefix is now only handled if either no base is given
or if the base is 16 (0x) or 2 (0b). Always handling it is incorrect
because 0x and 0b are perfectly valid numbers in other bases.
2014-09-02 19:04:55 +02:00
Nikita Popov
7533243f0c
Fix C89 build and small cleanup
2014-09-02 18:52:13 +02:00
Leigh
47d630e7f0
Implement gmp_import() and gmp_export()
2014-09-02 14:19:18 +02:00
Tjerk Meesters
f54451cf39
Make DOMNode::textContent writeable
2014-09-02 06:34:18 +08:00
Tjerk Meesters
8da58e36b4
Updated UPGRADING
2014-09-02 06:32:56 +08:00
Tjerk Meesters
83bacd2fe0
Updated NEWS
2014-09-02 06:32:56 +08:00
Stanislav Malyshev
57f82819e9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
Fix typo from commit 32314f6b6
Fix destruction order in zend_shutdown (bug #65463 , #66036 )
2014-09-01 12:20:34 -07:00
Stanislav Malyshev
4b9fcc01d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
Fix typo from commit 32314f6b6
Fix destruction order in zend_shutdown (bug #65463 , #66036 )
2014-09-01 12:15:54 -07:00
Stanislav Malyshev
30aceaf1a7
update NEWS
2014-09-01 12:13:43 -07:00
Stanislav Malyshev
197095c29e
Merge branch 'pull-request/770' into PHP-5.4
...
* pull-request/770:
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
Fix typo from commit 32314f6b6
Fix destruction order in zend_shutdown (bug #65463 , #66036 )
2014-09-01 12:11:42 -07:00
Derick Rethans
f89b7ec389
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-01 16:40:54 +01:00
Derick Rethans
21446cd7b6
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-01 16:40:50 +01:00
Derick Rethans
e665a07ab9
- Updated to version 2014.7 (2014g)
2014-09-01 16:40:49 +01:00
Tjerk Meesters
f0ba3e265a
Updated UPGRADING for #38409
2014-09-01 22:15:53 +08:00
Tjerk Meesters
65c1e14cb9
Updated NEWS for #38409
2014-09-01 22:13:38 +08:00
Tjerk Meesters
1bf996b324
Added test case
2014-09-01 22:04:25 +08:00
Tjerk Meesters
5270ee1aef
Making ini parser typed
...
- Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file()
- Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE
- Added zend_ini_copy_typed_value() function for zval initialisation
- Updated RETURN_TOKEN() to observe scanner_mode
2014-09-01 22:04:06 +08:00
Nikita Popov
d7368c2531
Fix bug #67938 : Segfault when extending interface method with variadic
...
We only want to check extra optional args if the proto function is
variadic, not when we're adding extra variadic args.
2014-08-30 20:43:34 +02:00
Anatol Belski
daefca44b5
updated NEWS
2014-08-30 04:06:00 +02:00
Anatol Belski
c301467f9b
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
2014-08-30 04:04:42 +02:00
Lior Kaplan
13b45a36f0
Add missing CVE IDs for 5.6.0
2014-08-29 11:42:12 +03:00
Lior Kaplan
210e35a2fa
Align entiries format to "Fixed bug #..."
2014-08-29 11:42:12 +03:00
Lior Kaplan
49d6472f9f
Use #66356 instead of #66714 , as the latter is only a regression fix from the former.
2014-08-29 11:42:12 +03:00
Lior Kaplan
cd38d72eee
Add an entry for bug#66060 (fixed in 5.5.8)
2014-08-29 11:42:12 +03:00
Stanislav Malyshev
08c63e2a56
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
2014-08-28 23:12:41 -07:00
Stanislav Malyshev
e55c641792
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
2014-08-28 23:11:55 -07:00
Stanislav Malyshev
b206b0e29d
fix NEWS for fcgi fix merge
2014-08-28 23:10:32 -07:00
David Zuelke
ee275e34c8
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
2014-08-28 23:06:00 -07:00
Lior Kaplan
a8b97086d7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org >
libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au >
2014-08-28 00:48:28 +03:00
Lior Kaplan
b38ca3adee
config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>
...
Based on http://git.savannah.gnu.org/cgit/config.git/commit/?id=29900d3b
2014-08-28 00:44:31 +03:00
Lior Kaplan
302ccc195b
libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>
...
Patch created using the following changes in libtool:
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=75ffb257
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=056889b8
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd998a7e
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=429d40a0
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=8a8dfaec
2014-08-28 00:37:01 +03:00
Nikita Popov
fc5f931663
Fix bug #67917 (gmp compound assignment operator leak)
2014-08-27 22:16:20 +02:00
Chris Wright
db03216e62
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix stream_select() issue with OpenSSL buffer
2014-08-27 16:06:28 +01:00
Chris Wright
30a73658c6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
ext/openssl/xp_ssl.c
2014-08-27 16:01:18 +01:00
Chris Wright
32be79dcfa
Fix stream_select() issue with OpenSSL buffer
...
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
2014-08-27 13:25:50 +01:00
Anatol Belski
4d667eeaf3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed DBG_INF macro name
2014-08-27 12:11:35 +02:00
Anatol Belski
7fac56e072
fixed DBG_INF macro name
2014-08-27 12:10:35 +02:00
Julien Pauli
1d6e9e8fb7
reworked NEWS for 5.6.0GA
2014-08-27 10:47:44 +02:00
Ferenc Kovacs
f39ff29366
fix the NEWS
2014-08-27 04:51:24 +02:00
Ferenc Kovacs
bd3e758cf8
add the NEWS entries from the last stable release
2014-08-27 04:23:55 +02:00
Ferenc Kovacs
7ec03b481a
almost forgot to bump this
2014-08-27 04:18:23 +02:00
Ferenc Kovacs
b165be9ae1
from now on, this should be 5.6.1-dev
2014-08-27 04:14:23 +02:00
Ferenc Kovacs
f7b7c14594
update NEWS to reflect what makes into 5.6.0 final
2014-08-27 04:07:37 +02:00
Ferenc Kovacs
86b2d7b523
remove the -dev suffix from the Zend version
2014-08-27 03:52:46 +02:00
Ferenc Kovacs
e0a177d676
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update the GIT-RULES with the 5.6 and the release branches
2014-08-27 00:47:57 +02:00
Ferenc Kovacs
1e1b7c74fb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update the GIT-RULES with the 5.6 and the release branches
2014-08-27 00:47:37 +02:00
Ferenc Kovacs
52f35b984c
update the GIT-RULES with the 5.6 and the release branches
2014-08-27 00:47:09 +02:00
Ferenc Kovacs
dbe8c37476
better heading for UPGRADING.INTERNALS
2014-08-26 00:31:36 +02:00
Daniel Lowrey
ffab52ad7d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
2014-08-25 19:50:02 +02:00
Daniel Lowrey
f463523cda
Update NEWS
2014-08-25 19:47:35 +02:00
Daniel Lowrey
546a32e2b3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #67850 : Build when OpenSSL compiled without SSLv3 support
Conflicts:
ext/openssl/xp_ssl.c
2014-08-25 18:16:38 +02:00
Daniel Lowrey
640214701c
Bug #67850 : Build when OpenSSL compiled without SSLv3 support
2014-08-25 17:28:09 +02:00
Lior Kaplan
6e87b01e95
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk >
2014-08-25 00:30:40 +03:00
Lior Kaplan
c8b3bce407
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk >
2014-08-25 00:30:01 +03:00
Lior Kaplan
bda1cc6946
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>
2014-08-25 00:29:05 +03:00
Ferenc Kovacs
86966a092b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
this test depends on the simplexml ext, not just on xml
2014-08-24 00:09:31 +02:00
Ferenc Kovacs
a90d05a430
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
this test depends on the simplexml ext, not just on xml
2014-08-24 00:09:00 +02:00
Ferenc Kovacs
cb41a7bad1
this test depends on the simplexml ext, not just on xml
2014-08-24 00:08:09 +02:00
Marcelo Diniz
cba1150cdb
tests image gd
2014-08-23 16:55:55 -03:00
Keyur Govande
437612f656
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
2014-08-23 14:17:37 +00:00
Tjerk Meesters
ce9bdae33f
Fixed #67694 : Regression in session_regenerate_id()
2014-08-23 09:18:02 +08:00
Michael Wallner
3b82c4e520
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bug #67865
updated NEWS to fit last release
NEWS
Fix bug #67878 program_prefix not honoured in man pages
2014-08-21 22:45:33 +02:00
Michael Wallner
c4fb183b9f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #67865
2014-08-21 22:43:25 +02:00
Michael Wallner
54fbbded37
fix bug #67865
2014-08-21 22:41:36 +02:00
Julien Pauli
dbbf1c2a3c
updated NEWS to fit last release
2014-08-21 11:34:38 +02:00
Remi Collet
76c2a9f4f4
NEWS
2014-08-21 09:14:39 +02:00
Remi Collet
e02616866f
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:14:38 +02:00
Remi Collet
43ed561222
NEWS
2014-08-21 09:14:16 +02:00
Remi Collet
e9166fec62
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:14:16 +02:00
Anatol Belski
d3ca974ff5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
avoid clash when stdint.h was included after win32/php_stdint.h
2014-08-21 09:09:29 +02:00
Anatol Belski
713e9a7eaa
avoid clash when stdint.h was included after win32/php_stdint.h
2014-08-21 09:08:44 +02:00
Stanislav Malyshev
89d3a356d1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-08-20 14:44:33 -07:00
Stanislav Malyshev
6da2a977fc
fix test
2014-08-20 14:44:25 -07:00
Stanislav Malyshev
2dfabd8b51
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-08-20 14:43:22 -07:00
Stanislav Malyshev
6424bf659d
fix test
2014-08-20 14:42:48 -07:00
Remi Collet
42e1df9b01
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
2014-08-20 15:17:20 +02:00
Remi Collet
825ddbb3c6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
2014-08-20 15:17:05 +02:00
Remi Collet
9185cfd539
NEWS
2014-08-20 15:16:53 +02:00
Remi Collet
f4120e53c8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed variable corruption under win x64
2014-08-20 15:10:54 +02:00
Remi Collet
6d19358ae0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed variable corruption under win x64
2014-08-20 15:10:02 +02:00
Anatol Belski
20941b71aa
fixed variable corruption under win x64
2014-08-20 15:08:52 +02:00
Lior Kaplan
96f812e411
Add NEWS entry for bug #67730
2014-08-20 01:34:57 +03:00
Lior Kaplan
ac0c864c63
Add CVE ID for bug #67539
2014-08-20 01:18:15 +03:00
Lior Kaplan
6aa7466492
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add NEWS entry for bug #67492
Add NEWS entry for bug #67730
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
2014-08-20 01:16:04 +03:00
Lior Kaplan
d382d6f3dc
Add NEWS entry for bug #67492
...
Included in 5.5.14 with commit d9c5a1d
2014-08-20 01:10:38 +03:00
Lior Kaplan
9360b6eeee
Add NEWS entry for bug #67730
2014-08-20 01:05:22 +03:00
Lior Kaplan
aa6dc6c108
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
2014-08-20 01:01:23 +03:00
Lior Kaplan
276bead9c4
Add NEWS entry for bug #67730
...
Included in 5.4.32 with commit 706aefb
2014-08-20 00:54:19 +03:00
Lior Kaplan
359bc0ee2f
Add CVE ID for bug #67539
2014-08-20 00:51:37 +03:00
Sara Golemon
a309dda777
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Switch use of strtok() to gd_strtok_r()
2014-08-19 13:22:14 -07:00
Sara Golemon
ac4569621d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Switch use of strtok() to gd_strtok_r()
Conflicts:
NEWS
2014-08-19 13:17:56 -07:00
Sara Golemon
cbe1597b74
Switch use of strtok() to gd_strtok_r()
...
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.
I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
2014-08-19 13:16:44 -07:00
Stanislav Malyshev
fae17a00f5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:25 -07:00
Stanislav Malyshev
b278be894f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:09 -07:00
Stanislav Malyshev
5a7039035c
Merge tag 'PHP-5.4.32' into PHP-5.4
...
5.4.32
* tag 'PHP-5.4.32':
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
Conflicts:
configure.in
main/php_version.h
2014-08-19 01:33:45 -07:00
Stanislav Malyshev
eb2360602e
5.4.32
2014-08-19 00:40:27 -07:00
Remi Collet
cdd987b16c
NEWS
2014-08-19 08:41:42 +02:00
Remi Collet
230804b08d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
2014-08-19 08:41:14 +02:00
Remi Collet
335d89ec4d
NEWS
2014-08-19 08:40:58 +02:00
Remi Collet
5e9e0a2c74
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
2014-08-19 08:40:30 +02:00
Remi Collet
88c48a4b95
NEWS
2014-08-19 08:40:18 +02:00
Remi Collet
2fefae4771
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
...
Incomplete fix for CVE-2014-4049
Check possible buffer overflow
- pass real buffer end to dn_expand calls
- check buffer len before each read
2014-08-19 08:33:49 +02:00
Stanislav Malyshev
2b10db8e10
fix potentially missing NUL termination
2014-08-18 23:04:24 -07:00
Stanislav Malyshev
706aefb781
Fix bug #67730 - Null byte injection possible with imagexxx functions
2014-08-18 22:49:10 -07:00
Stanislav Malyshev
529da0f74c
Fixed bug #67717 - segfault in dns_get_record
2014-08-18 22:37:25 -07:00
Derick Rethans
77cc6aabb7
Merge branch 'PHP-5.5' into PHP-5.6
2014-08-18 20:27:44 +01:00
Derick Rethans
299d8f339f
Merge branch 'datetimebugs' into PHP-5.5
2014-08-18 20:27:33 +01:00
Derick Rethans
05d1612e16
BFN.
2014-08-18 18:46:56 +01:00
Derick Rethans
36d05d75c8
Fixed bug #67109 : First uppercase letter breaks date string parsing.
2014-08-18 18:41:50 +01:00
Derick Rethans
2b9af967fb
Fixed bug #66985 : Some timezones are no longer valid in PHP 5.5.10.
2014-08-18 18:41:50 +01:00
Ferenc Kovacs
d07f49118a
improve the grammar for my recent UPGRADING note
2014-08-18 18:47:07 +02:00
Ferenc Kovacs
003c2c1005
mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING
...
see the discussion on the mailing list and in the pull request for details:
https://github.com/php/php-src/pull/733
2014-08-18 16:59:03 +02:00
Lior Kaplan
f1d0e50ea8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Correct typo in comments: 'initialized'
2014-08-17 21:34:03 +03:00
Lior Kaplan
fac08a960b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Correct typo in comments: 'initialized'
2014-08-17 21:33:41 +03:00
Lior Kaplan
1504f7d630
Correct typo in comments: 'initialized'
2014-08-17 21:32:53 +03:00
Lior Kaplan
56d02d564e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
typofixes
2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typofixes
2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1
typofixes
2014-08-17 15:44:02 +03:00
Keyur Govande
c6d9bf2946
Update NEWS
2014-08-15 23:49:07 +00:00
Keyur Govande
032dee4982
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Fix another failing test
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/mysqli_change_user.phpt
2014-08-15 23:47:06 +00:00
Keyur Govande
6279246d2c
Update NEWS
2014-08-15 23:38:14 +00:00
Keyur Govande
48dc203408
Fix another failing test
2014-08-15 23:26:21 +00:00
Keyur Govande
7c4b5d9187
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/table.inc
2014-08-15 23:13:36 +00:00
Keyur Govande
0407bdf252
Add NEWS
2014-08-15 23:08:29 +00:00
Keyur Govande
7bfe9bf951
Merge branch 'pull-request/772' into PHP-5.4
...
* pull-request/772:
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
2014-08-15 23:06:55 +00:00
Stanislav Malyshev
3e6cfeed8f
add NEWS for 5.6 too
2014-08-14 18:16:33 -07:00
Remi Collet
7ba1409a1a
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:44:19 -07:00
Stanislav Malyshev
23122ba69c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:22:06 -07:00
Stanislav Malyshev
59c2477bc3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:21:37 -07:00
Stanislav Malyshev
3468f03b6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:21:29 -07:00
Remi Collet
35f32637b0
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:21:20 -07:00
Remi Collet
49387b31cf
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:19:03 -07:00
Stanislav Malyshev
ed7ab762de
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-08-14 17:08:37 -07:00
Stanislav Malyshev
ff4cf1a838
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2014-08-14 17:07:45 -07:00
Stanislav Malyshev
eab42649ab
fix test
2014-08-14 17:07:28 -07:00
Stanislav Malyshev
41fccab023
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
split the glob() test to test different basedir
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358 , glob returns error, should be empty array()
2014-08-14 17:05:12 -07:00
Stanislav Malyshev
008330e5b3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
split the glob() test to test different basedir
2014-08-14 17:05:03 -07:00
Anatol Belski
b7cd099ae0
split the glob() test to test different basedir
2014-08-14 17:04:51 -07:00
Stanislav Malyshev
4185633207
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358 , glob returns error, should be empty array()
2014-08-14 17:00:36 -07:00
Anatol Belski
ad492ca932
fixed glob() edge case on windows, ref bug #47358
2014-08-14 16:58:16 -07:00
Pierre Joye
481c4715d4
- fix bug #47358 , glob returns error, should be empty array()
...
Conflicts:
ext/standard/dir.c
2014-08-14 16:56:22 -07:00
Keyur Govande
4e2c01617f
Fix failing tests
2014-08-14 18:20:26 +00:00
Keyur Govande
c044164a96
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
...
Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
2014-08-14 18:19:56 +00:00
Johannes Schlüter
a68f63156c
Merge branch 'PHP-5.5' into PHP-5.6
2014-08-14 17:25:22 +02:00
Johannes Schlüter
d1dd71454d
Merge branch 'PHP-5.4' into PHP-5.5
2014-08-14 17:22:25 +02:00
Johannes Schlüter
aeb633543b
Merge branch 'PHP-5.3' into PHP-5.4
2014-08-14 17:13:44 +02:00
Johannes Schlüter
7311087cf0
Update Git rules
2014-08-14 17:08:02 +02:00
Johannes Schlüter
1355ea60cc
Back to -dev (with EOL notice in NEWS)
2014-08-14 17:05:20 +02:00
Keyur Govande
5e338836ff
Fix typo from commit 32314f6b6
2014-08-14 01:14:11 +00:00
Keyur Govande
32314f6b67
Fix destruction order in zend_shutdown (bug #65463 , #66036 )
...
If Apache or a similar SAPI receives a signal during PHP processing
it calls zend_shutdown() without calling shutdown_executor().
#65463 : If a module like Gearman or Memcached is loaded,
in the unfixed version it is unloaded by zend_destroy_modules() before the
CG(CLASS_TABLE) is destructed. When CG(CLASS_TABLE) is destructed,
any pointers to methods (specifically around destruction) in the unloaded
module's .so are now dangling and the process segfaults.
#66036 : Any subclasses of an internal class like ArrayObject need
to be destructed in order: subclass first and then the internal class. In the
unfixed version zend_shutdown() clears the CG(CLASS_TABLE) from the head
of the list onwards, so internal classes are destructed first and user-defined
classes last. Internal classes are alloc/deallocated with malloc/free while
user-defined classes with emalloc/efree. If there's shared data between them
then efree() could be called instead of free() leading to a seg-fault.
2014-08-14 00:55:14 +00:00
Johannes Schlüter
babeca356b
It's 2014 already, fix copyright year where user visible
...
Left out all file headers
2014-08-13 21:22:50 +02:00
Johannes Schlüter
1847cf10c1
PHP 5.3.29
2014-08-13 18:36:10 +02:00
Tjerk Meesters
7fbc99e390
Some changes were lost in the merge commit of #66091
2014-08-13 20:57:10 +08:00
Tjerk Meesters
e4905b38b7
Updated NEWS for #66091
2014-08-13 20:24:43 +08:00
Tjerk Meesters
4b85f1d46a
Fixed #66091
2014-08-13 20:24:43 +08:00
Stanislav Malyshev
fd28010e20
5.4.32 RC1
2014-08-05 21:03:35 -07:00
Mauricio Vieira
8afe869cab
xmlwriter_full_end_element tests
2014-08-02 22:39:12 -03:00
Mauricio Vieira
51be35cf38
Tests for writeAttributeNS and xmlwriter_write_attribute_ns
2014-08-02 22:39:11 -03:00
Johannes Schlüter
990ecc12fc
PHP 5.3.29RC1
2014-07-31 15:40:51 +02:00
Stanislav Malyshev
0fe07a0e74
Fix missing type checks in various functions
2014-07-31 15:36:24 +02:00
Carlos André Ferrari
2659b0f3cb
Fixed typo
2014-07-25 09:45:16 -03:00
Carlos André Ferrari
660cfeabb4
GD: imagepalettetotruecolor tests
2014-07-25 09:45:16 -03:00
Bob Weinand
e3605383cd
Merge pull request #106 from EagleEyeJohn/patch-1
...
Update README.md
2014-07-22 04:49:41 +02:00
Stanislav Malyshev
1ffb7fddc2
update NEWS
2014-07-18 16:49:00 -07:00
Stanislav Malyshev
c74efe1b2e
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
...
Conflicts:
ext/spl/spl_array.c
ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
2014-07-18 16:31:59 -07:00
Xinchen Hui
b5051ff939
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
2014-07-18 16:28:58 -07:00
Stanislav Malyshev
e2ba5c7987
Fix bug #66127 (Segmentation fault with ArrayObject unset)
2014-07-18 16:28:16 -07:00
Stanislav Malyshev
8e9777a1f1
Fix test - because of big #67397 we don't allow overlong locales anymore
2014-07-18 16:27:11 -07:00
Stanislav Malyshev
e644aad3f9
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
2014-07-18 16:26:51 -07:00
Stanislav Malyshev
8ab4e2e90d
Fix bug #67349 : Locale::parseLocale Double Free
2014-07-18 16:26:05 -07:00
Stanislav Malyshev
b512adf78d
Fixed bug #67399 (putenv with empty variable may lead to crash)
...
Conflicts:
ext/standard/basic_functions.c
2014-07-18 16:24:54 -07:00
Remi Collet
2fe5bcbeb5
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Upstream:
https://github.com/file/file/commit/93e063ee374b6a75729df9e7201fb511e47e259d
Adapted for C standard.
2014-07-18 16:21:01 -07:00
Remi Collet
892def5f12
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
...
Upstream:
https://github.com/file/file/commit/40bade80cbe2af1d0b2cd0420cebd5d5905a2382
2014-07-18 16:20:19 -07:00
Remi Collet
8d1d038509
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
...
Upstream:
https://github.com/file/file/commit/36fadd29849b8087af9f4586f89dbf74ea45be67
Conflicts:
ext/fileinfo/libmagic/cdf.c
2014-07-18 16:19:30 -07:00
Remi Collet
6bd5a06894
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
...
Upstream
https://github.com/file/file/commit/27a14bc7ba285a0a5ebfdb55e54001aa11932b08
2014-07-18 16:17:36 -07:00
Stanislav Malyshev
ec002bd837
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
2014-07-18 16:14:42 -07:00
Remi Collet
52de149ebc
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
...
Upstream fix https://github.com/file/file/commit/6d209c1c489457397a5763bca4b28e43aac90391.patch
Only revelant part applied
2014-07-18 16:13:07 -07:00
Stanislav Malyshev
2326401fc1
fix bug #67253 : timelib_meridian_with_check out-of-bounds read
...
Conflicts:
ext/date/lib/parse_date.c
2014-07-18 16:11:54 -07:00
Stanislav Malyshev
7f527897fe
Fix bug #67252 : convert_uudecode out-of-bounds read
2014-07-18 16:05:52 -07:00
Stanislav Malyshev
d4b67896ec
Fix bug #67250 (iptcparse out-of-bounds read)
2014-07-18 16:02:52 -07:00
Stanislav Malyshev
84605098bc
Fix bug #67247 spl_fixedarray_resize integer overflow
2014-07-18 15:59:59 -07:00
Stanislav Malyshev
ee1ab62763
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
...
Upstream patch: https://github.com/file/file/commit/b8acc83781d5a24cc5101e525d15efe0482c280d
2014-07-18 15:52:00 -07:00
Stanislav Malyshev
d77ea459bd
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
...
Upstream fix: https://github.com/file/file/commit/f97486ef5dc3e8735440edc4fc8808c63e1a3ef0
2014-07-18 15:50:58 -07:00
Anatol Belski
44be7b7f27
backport this piece from 5.6, related to the #66307 fix
...
Conflicts:
ext/fileinfo/libmagic/readcdf.c
2014-07-18 15:50:04 -07:00
Anatol Belski
0335d2ef3e
Fixed bug #66307 Fileinfo crashes with powerpoint files
...
Conflicts:
ext/fileinfo/libmagic/readcdf.c
ext/fileinfo/tests/finfo_file_002.phpt
2014-07-18 15:48:18 -07:00
Remi Collet
a0bb3fd679
Fixed bug #66060 (Heap buffer over-read in DateInterval)
...
Conflicts:
ext/date/lib/parse_iso_intervals.c
2014-07-18 15:39:37 -07:00
Stanislav Malyshev
eca037a51d
Fix bug #65873 - Integer overflow in exif_read_data()
2014-07-18 15:37:15 -07:00
Xinchen Hui
f3230e3522
let make test report the run-test result
2014-07-18 15:33:59 -07:00
John Nicholls
44d61576b9
Update README.md
...
correct spelling of "exert"
2014-07-17 15:43:24 +01:00
Bob Weinand
18c9f8fbb9
Merge sapi/phpdbg into PHP-5.6
2014-07-06 01:17:50 +02:00
Bob Weinand
856801b84f
Merge sapi/phpdbg into PHP-5.6
2014-06-29 12:49:10 +02:00
Bob Weinand
05955fbce5
Merge sapi/phpdbg into PHP-5.6
2014-06-25 13:56:45 +02:00
Remi Collet
7efbccd60f
Better fix for phpdbg + libedit
...
- fix include
- disable coloured prompt only with libedit
2014-06-23 10:21:19 +02:00
Remi Collet
679d08e8ba
Fix https://github.com/krakjoe/phpdbg/issues/91
...
Enable edit feature when build with libedit.
Notice: coloured prompt only enable with READLINE
2014-06-23 10:21:19 +02:00
Lior Kaplan
55d97085a4
Update copyright year to 2014
2014-06-16 23:34:50 +03:00
Bob Weinand
79230e5561
Merge sapi/phpdbg into PHP-5.6
2014-06-15 15:47:14 +02:00
Stanislav Malyshev
3c328f0984
Fix bug #67251 - date_parse_from_format out-of-bounds read
...
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
2014-06-15 00:33:24 -07:00
Stanislav Malyshev
d780c2a673
Fix bug #67249 : printf out-of-bounds read
2014-06-13 16:43:56 -07:00
Sara Golemon
d400b74296
Fix potential segfault in dns_get_record()
...
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
2014-06-13 16:42:55 -07:00
Remi Collet
08334293f8
Fix bug #67390 insecure temporary file use in the configure script
2014-06-13 16:41:13 -07:00
Bob Weinand
5e6c5e9569
Merge sapi/phpdbg into PHP-5.6
2014-06-09 10:06:29 +02:00
Bob Weinand
b264783d63
Merge sapi/phpdbg into PHP-5.6
2014-06-04 02:18:39 +02:00
Bob Weinand
3200d99763
Merge sapi/phpdbg into PHP-5.6
2014-06-03 21:15:02 +00:00
Bob Weinand
d4b5ef2e4a
Merge sapi/phpdbg into PHP-5.6
2014-05-03 11:40:25 +02:00
Bob Weinand
eae7a94fe0
Added stdion/stdout/stderr constsnts and their php:// wrappers
...
Fixes issue #85
2014-05-01 11:43:46 +02:00
Anatol Belski
a1edc8e396
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
...
* phpdbg/master:
C89 compat
2014-04-27 18:01:26 +02:00
Anatol Belski
9a8123fabb
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
...
* phpdbg/master:
removed /EHa as __try/__catch syntax is used anyway
fix ZEND_DEBUG usage
fix CFLAGS_PHPDBGS and some formatting
2014-04-26 00:15:32 +02:00
Anatol Belski
91b599f4a3
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
2014-04-24 11:05:52 +02:00
Bob Weinand
3e3dcde8d7
Merge sapi/phpdbg into PHP-5.6
2014-04-21 23:30:08 +02:00
Mateusz Kocielski
ea12799eff
Fixed wrong indentation
2014-03-18 10:49:28 +01:00
Mateusz Kocielski
b20abadf90
Fix phpdbg build on FreeBSD
...
Added missing netinet/in.h header.
2014-03-18 09:51:39 +01:00
Veres Lajos
57294d6824
a few typofixes
2014-02-14 17:16:17 +02:00
krakjoe
2462d2764a
windows
2014-02-02 15:14:25 +00:00
krakjoe
f1a6ca29fb
clean symbols
2014-02-02 15:10:17 +00:00
krakjoe
d260b5d240
another patch from upstream
2014-02-02 14:58:39 +00:00
krakjoe
395a936397
woops
2014-02-02 14:50:32 +00:00
krakjoe
1deeec0ba8
better use of tmpnam/mkstemp
2014-02-02 14:42:31 +00:00
krakjoe
591e64ff58
update version
2014-02-02 14:04:47 +00:00
krakjoe
270e487d41
remove use of zend directly, avoid leaks/bugs in modules etc
2014-02-02 13:43:43 +00:00
Anatol Belski
137feda86a
fix C89 compat
2014-01-19 02:05:10 +01:00
Johannes Schlüter
2dd38009ca
Merge branch 'phpdbg' into PHP-5.6
2014-01-18 13:52:27 +01:00
Xinchen Hui
75bad44801
Bump year
2014-01-03 11:08:10 +08:00
krakjoe
2b111a3b14
update version output
2013-12-27 18:03:11 +00:00
Anatol Belski
b36bae023e
fix c89 compat
2013-12-25 23:43:20 +01:00
Anatol Belski
868dbe7baf
fixed incompatible pointer in phpdbg on win64
2013-12-24 21:08:33 +01:00
Bob Weinand
36f487a32c
Fixed #18
...
Errors not displaying in some configurations
2013-12-24 13:19:18 +01:00
Bob Weinand
31c15f0d17
Fixed credits in phpdbg.* files
2013-12-24 00:34:23 +01:00
Bob Weinand
02352bee60
Added breaking upon fatal-ish error
2013-12-24 00:30:37 +01:00
Joe Watkins
a1387ae088
credits file for phpdbg
2013-12-24 00:16:47 +01:00
Bob Weinand
4350937027
Merge branch 'master' of sapi/phpdbg into PHP-5.6
...
Including phpdbg.
2013-12-20 14:27:51 +01:00