clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
83,330 Commits 494 Branches 1,367 Tags 881 MiB
72ac8cf5ad
Commit Graph

952 Commits

Author SHA1 Message Date
Anatol Belski
632fc51d98 Bug #71596 Segmentation fault on ZTS with date function (setlocale) 2016-02-18 19:13:07 +01:00
Anatol Belski
fffbca55e8 backport 9a07245b72 from 7.0 2016-01-11 20:37:46 +01:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Julien Pauli
2ddb560c2e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix for #66048
 2015-05-12 16:12:51 +02:00
Julien Pauli
c117548ea9 Fix for #66048 2015-05-12 16:12:29 +02: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
860fc3947f Improve fix for bug 67741 
Thanks to laruence.
 2015-03-03 16:25:43 +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
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
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
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
manuel
cc13d8696f Fix another invalid free of CG(interned_empty_string) 
Fixes #68214
 2015-02-07 19:17:31 +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
Xinchen Hui
1bb7647c6e Fixed indent 2015-02-03 23:24:34 +08: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
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08: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
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
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
Yasuo Ohgaki
a84e5dc37d Remove unneeded string copy. 
Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes.
More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.
 2014-03-27 17:20:57 +09:00
Yasuo Ohgaki
cbd108abf1 Implement RFC https://wiki.php.net/rfc/default_encoding 2014-02-13 11:54:52 +09:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Michael Wallner
729f85fad7 add 'never' 2013-12-30 14:28:43 +01:00
Michael Wallner
4153c23efa s/BOOLEAN/ENTRY/ 2013-12-30 14:28:42 +01:00
Michael Wallner
3641507fc1 re-introduce always_populate_raw_post_data 2013-12-30 14:28:42 +01:00
Sara Golemon
df755deb45 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix php_module_startup() when loading more than one additional module
 2013-12-03 18:21:12 -08:00
Sara Golemon
00a7b1ff7f Fix php_module_startup() when loading more than one additional module 
Dereferencing addition_modules within php_module_startup would
point to a vector entirely on the stack (which is of course, wrong).

Use a specialized helper to keep BC with the current php_module_startup()
calling semantics.

Fixes 63159
Thanks to @a-j-k
 2013-12-03 18:20:19 -08:00
Anatol Belski
39e7dcc3bb back to do_alloca() 2013-10-31 21:42:55 +01:00
Anatol Belski
fc707a27ff back to do_alloca(), reverted the wrong replacement 2013-10-30 20:13:14 +01:00
Anatol Belski
cf6ab0e915 applied and fixed the original patch 
initial work on the patch import done
 2013-10-17 10:40:43 +02:00
Michael Wallner
1c15d70cbd Merge branch 'slim-postdata' 
* slim-postdata:
  slim post data
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
 2013-09-17 10:50:49 +02:00
Michael Wallner
2438490add slim post data 2013-08-27 13:31:35 +02:00
Stanislav Malyshev
bf0c6f2858 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
 2013-08-18 14:21:14 -07:00
Stanislav Malyshev
4fbce676bd Merge branch 'pull-request/381' 
* pull-request/381:
  Fixed #65225: PHP_BINARY incorrectly set
 2013-08-18 14:20:46 -07:00
Patrick Allaert
98d29d20a1 Fixed #65225: PHP_BINARY incorrectly set 2013-08-18 14:18:33 -07:00
Xinchen Hui
b6fa0b40f7 Merge branch 'PHP-5.5' 2013-08-14 11:44:53 +08:00
Xinchen Hui
f3d18add08 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-14 11:44:37 +08:00
Xinchen Hui
f4dc2240a0 Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd 2013-08-14 11:42:39 +08:00