Stanislav Malyshev
c08f9c2c78
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/pack.c
ext/standard/tests/dir/opendir_variation1-win32.phpt
2015-05-12 14:24:15 -07:00
Julien Pauli
c117548ea9
Fix for #66048
2015-05-12 16:12:29 +02:00
Stanislav Malyshev
4605d536d2
Fixed bug #69364 - use smart_str to assemble strings
2015-05-09 23:04:25 -07:00
Julien Pauli
775d0707ca
5.5.26 now
2015-04-29 11:16:06 +02:00
Stanislav Malyshev
e21f87e957
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix type in fix for #69085
fix CVE num
Conflicts:
configure.in
main/php_version.h
2015-04-14 00:34:02 -07:00
Stanislav Malyshev
e10272c628
5.4.41 next
2015-04-14 00:30:58 -07:00
Julien Pauli
8e3e034469
5.5.24RC1
2015-03-31 16:03:52 +02:00
Stanislav Malyshev
4c3b73b6df
5.4.40 next
2015-03-17 22:37:16 -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
Julien Pauli
0f334a1265
5.5.24 now
2015-03-05 14:13:39 +01:00
Reeze Xia
860fc3947f
Improve fix for bug 67741
...
Thanks to laruence.
2015-03-03 16:25:43 +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
Xinchen Hui
4eb830b212
Reorder
2015-02-27 12:02:42 +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
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
Julien Pauli
c4c3dca302
Fix #67626
2015-02-20 16:07:40 +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
Stanislav Malyshev
24f8a68d0a
5.4.39 next
2015-02-17 07:34:00 +01: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
Nayana Hettiarachchi
5446377c6b
Conflicts:
...
main/streams/memory.c
2015-02-05 16:32:30 +08:00
Julien Pauli
b86529f751
5.5.23 now
2015-02-04 16:35:32 +01:00
Stanislav Malyshev
e5e251b023
fix group name handling
2015-01-31 23:47:03 -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
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
Bob Weinand
b8461eb9ac
Fix call after close if multiple filters are attached
2015-01-26 22:47:35 +01: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
8825311ce1
5.4.38 next
2015-01-20 10:38:33 -08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Julien Pauli
3f1d1892c9
5.5.22 now
2015-01-07 10:42:53 +01:00
Stanislav Malyshev
8fe4cc6d28
5.4.37
2014-12-16 11:44:41 -08:00
mcq8
86f1875536
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:42:38 +01:00
Anatol Belski
373aa7c81f
add include for missing localeconv_r proto
2014-12-06 12:09:35 +01:00
Anatol Belski
1b4d5ad46a
Fixed bug #65230 setting locale randomly broken
2014-12-06 11:59:43 +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
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
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
Julien Pauli
3656349990
5.5.21 now
2014-11-26 11:31:58 +01:00
Stanislav Malyshev
98b22864ff
5.4.36-dev
2014-11-11 16:31:38 -08:00
Julien Pauli
71e200b338
PHP 5.5.20 now
2014-10-28 15:01:53 +01: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
Stanislav Malyshev
4d54c4bdf0
fix NEWS & version
2014-10-22 13:16:29 -07:00
Julien Pauli
cfe8a8b968
5.5.19 now
2014-10-01 16:16:05 +02:00
Anatol Belski
46aa2c396b
increase the polling period to not to break existing behaviours
2014-09-29 17:27:24 +02:00
