Commit Graph

7189 Commits

Author SHA1 Message Date
Stanislav Malyshev
fe79276371 Merge branch 'sec54' into PHP-5.4
* sec54:
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
2012-03-28 21:16:04 -07:00
Anatoliy Belsky
92bca7436f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61459 popen_close_basic-win32 can't run sort.exe
2012-03-28 19:32:24 +02:00
Anatoliy Belsky
eeab3be303 Fix bug #61459 popen_close_basic-win32 can't run sort.exe 2012-03-28 19:25:29 +02:00
Anatoliy Belsky
c447704f98 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
2012-03-27 18:53:50 +02:00
Anatoliy Belsky
da85d5b4a0 Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt 2012-03-27 18:49:59 +02:00
Stanislav Malyshev
50bdc48685 fix test 2012-03-25 13:53:49 -07:00
Rasmus Lerdorf
b08b7fe787 Merge branch 'PHP-5.3' into PHP-5.4 2012-03-25 05:45:55 +05:30
Rasmus Lerdorf
900778731c open_basedir check for linkinfo 2012-03-25 05:32:21 +05:30
Hannes Magnusson
10809686f0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix test on FreeBSD and other systems that have /etc/services
2012-03-24 17:59:52 +01:00
Hannes Magnusson
948d326b29 Fix test on FreeBSD and other systems that have /etc/services 2012-03-24 17:58:40 +01:00
Xinchen Hui
f84d55b062 Fix test 2012-03-24 12:15:04 +08:00
Gustavo André dos Santos Lopes
cfdd6c5788 MFH: 7dcada1 for 5.4
- Fixed possible unsigned int wrap around in html.c. Note that 5.3 has the same
  (potential) problem; even though the code is substantially different, the
  variable name and the fashion it was incremented was kept.
2012-03-19 16:36:21 +00:00
Gustavo André dos Santos Lopes
9a460497da MFH: 45a6f8d for 5.4.
- Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
  together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
  already sufficient data buffered). stream_get_line() now behaves more like
  fgets(), as is documented.
2012-03-19 16:34:31 +00:00
Gustavo André dos Santos Lopes
d974e44248 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
Gustavo André dos Santos Lopes
ef19fba2d5 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
Adam Harvey
9aec9ccd7c Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana. 2012-03-16 02:07:46 +00:00
Gustavo André dos Santos Lopes
ed98579924 - Fixed bug #61374: html_entity_decode tries to decode code points that don't
exist in ISO-8859-1.
2012-03-13 18:08:30 +00:00
Ilia Alshanetsky
9c886ea553 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Ilia Alshanetsky
4cccba09e0 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Gustavo André dos Santos Lopes
7166298d63 - Fixed bug #61253: Wrappers opened with errors concurrency problem
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
Gustavo André dos Santos Lopes
f413b3726c - Fixed bug #61253: Wrappers opened with errors concurrency problem
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
Stanislav Malyshev
4cc747677c MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227. 2012-03-07 07:49:56 +00:00
Ilia Alshanetsky
0fe734b7c8 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Ilia Alshanetsky
5525d80982 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Nikita Popov
37d7df72a6 Fix bug #52719: array_walk_recursive crashes if third param of the function is by reference 2012-03-02 18:05:38 +00:00
Nikita Popov
e7810c1f1e Fix bug #52719: array_walk_recursive crashes if third param of the function is by reference 2012-03-02 18:05:38 +00:00
Rasmus Lerdorf
f564921c15 Fix tests that break if filter.default isn't set to unsafe_raw 2012-03-02 05:04:40 +00:00
Xinchen Hui
fda8d2fe68 MFH: Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX) 2012-03-02 03:40:40 +00:00
Adam Harvey
03f3d03ce0 MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934). 2012-03-02 03:39:04 +00:00
Adam Harvey
4fc6861030 MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934). 2012-03-02 03:39:04 +00:00
Pierrick Charron
d102030b00 Fixed memory leak in substr_replace 2012-03-01 15:10:29 +00:00
Pierre Joye
ee772f60b1 - fix bug #60879, unserialize does not invoke __wakeup 2012-02-28 18:36:10 +00:00
Stanislav Malyshev
f2c791c42b update credits 2012-02-26 06:23:14 +00:00
Olivier DOUCET
f94237edf3 fix phpt : fopen(data://) requires allow_url_fopen=1 2012-02-25 12:44:46 +00:00
Olivier DOUCET
e613889d50 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
6546beecec fix test file for bug #47997 : fopen(data://) requires allow_url_fopen=1 2012-02-25 10:58:30 +00:00
Gustavo André dos Santos Lopes
bcefc31e68 - Better fix for #61115.
- Fixed resource leak in stream_socket_client().
2012-02-24 22:56:21 +00:00
Gustavo André dos Santos Lopes
eb1ada852d - Fixed bug #61115 (stream related segfault on fatal error in
php_stream_context_link).
#run-tests.php is not currently detecting the segfault in the test
#Missing 5.4 merge
2012-02-22 11:45:26 +00:00
Rasmus Lerdorf
4ed1640b35 This one depends on max_input_vars as well 2012-02-14 09:50:46 +00:00
Rasmus Lerdorf
f60145a1a2 This one depends on max_input_vars as well 2012-02-14 09:50:46 +00:00
David Soria Parra
dd14c92499 Add credit line for the PHP Output Handler 2012-02-13 19:54:51 +00:00
Rasmus Lerdorf
fdd1977ea7 Unbreak these tests - please be careful with your Windows-based editors that
seem to mess up ^M's here.
2012-02-12 08:01:25 +00:00
Xinchen Hui
33125e2312 Improved fix for #61058, and add test script 2012-02-12 05:32:24 +00:00
Xinchen Hui
c578917e30 Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX) 2012-02-12 04:59:08 +00:00
Christopher Jones
e2ab222c13 Force allow_url_fopen to fix qa.php.net/reports diffs 2012-02-06 23:52:42 +00:00
Christopher Jones
74a79f706f Force allow_url_fopen to fix qa.php.net/reports diffs 2012-02-06 23:52:42 +00:00
Christopher Jones
2759e78afc Mask different curl message. Now passes on Oracle Linux 5 2012-02-06 23:31:51 +00:00
Christopher Jones
3f0dfb0ee5 Mask different curl message. Now passes on Oracle Linux 5 2012-02-06 23:31:51 +00:00
Ferenc Kovacs
de2355935e merging the patch from bug #52078, fixes the test on disk with huge inode size(fileinode() can overflow and return negative values there). 2012-02-06 22:47:21 +00:00