php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,958 Commits 549 Branches 1,485 Tags
3a8a99e662b889403aaa8ff6523a5ad684bcaa67
Commit Graph

1215 Commits

Author SHA1 Message Date
Xinchen Hui 3a8a99e662 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73532 (Null pointer dereference in mb_eregi)
 2016-11-16 15:05:22 +08:00
Xinchen Hui 229024c725 Fixed bug #73532 (Null pointer dereference in mb_eregi) 2016-11-16 15:05:04 +08:00
Kalle Sommer Nielsen 2104bea5d7 Remove Netware support 
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
 2016-11-12 11:20:01 +01:00
Yasuo Ohgaki 7cb1be2ecd Use proper API 2016-10-16 07:29:33 +09:00
Yasuo Ohgaki 2bd34885da Add tests 2016-10-15 21:03:14 +09:00
Yasuo Ohgaki 06b20d973a Fix test and cleanup code a little 2016-10-15 20:51:34 +09:00
Yasuo Ohgaki 4af00876f6 mb_check_encoding()/mb_convert_encoding() - Improve and add recursion detection. 2016-10-15 16:52:17 +09:00
Yasuo Ohgaki 6e530502d2 Implemented Bug #68776 mail() does not have mail header injection prevention for additional headers 
(PR 2060)
 2016-09-15 06:43:57 +09:00
Andrea Faulds 3cc9090101 Remove remaining zpp fallback code (master branch) 
Follow-up to d690014bf3
 2016-09-11 22:50:24 +01:00
Yasuo Ohgaki 8c26b0a6d2 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
 2016-09-08 13:33:07 +09:00
Yasuo Ohgaki 1ecf361c15 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
 2016-09-08 13:32:47 +09:00
Yasuo Ohgaki 379d9a1cfc Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
 2016-09-08 13:32:31 +09:00
Yasuo Ohgaki 8bbd0952e5 Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset 2016-09-08 13:17:10 +09:00
Christoph M. Becker fcc6f2df59 Merge branch 'PHP-7.1' 2016-09-06 14:15:05 +02:00
Christoph M. Becker 68d3501381 Merge branch 'pull-request/2115' into PHP-7.1 2016-09-06 14:14:23 +02:00
Yasuo Ohgaki 98bc11b0cd Fix memleak. 2016-09-06 18:34:52 +09:00
Yasuo Ohgaki 96e59a200e Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed Bug #66964 mb_convert_variables() cannot detect recursion
 2016-09-06 18:22:04 +09:00
Yasuo Ohgaki 2605ceeaca Added array parameter support to mb_convert_encoding() 2016-09-06 18:20:24 +09:00
Yasuo Ohgaki 012232b9a4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed Bug #66964 mb_convert_variables() cannot detect recursion
 2016-09-06 16:42:07 +09:00
Yasuo Ohgaki 6f1a52bfbb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed Bug #66964 mb_convert_variables() cannot detect recursion
 2016-09-06 16:41:52 +09:00
Yasuo Ohgaki a25f6f89cd Fixed Bug #66964 mb_convert_variables() cannot detect recursion 2016-09-06 16:05:34 +09:00
Stanislav Malyshev fca8c2772b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Sync fix for bug #72910 with current upstream
 2016-09-04 19:16:05 -07:00
Stanislav Malyshev 3bfd06061e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Sync fix for bug #72910 with current upstream
 2016-09-04 19:15:45 -07:00
Stanislav Malyshev c3dfe57c23 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Sync fix for bug #72910 with current upstream
 2016-09-04 19:15:30 -07:00
Stanislav Malyshev d1fbc98ff6 Sync fix for bug #72910 with current upstream 2016-09-04 19:13:48 -07:00
Christoph M. Becker 880c13cd03 Merge branch 'PHP-7.1' 2016-09-04 16:53:45 +02:00
Christoph M. Becker 94b66b8793 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-04 16:47:55 +02:00
Christoph M. Becker 7f97d63130 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-04 16:39:45 +02:00
Christoph M. Becker b7259b71b4 Fix #72994: mbc_to_code() out of bounds read 
We're backporting commit 999a3553 to the still supported PHP 5.6.
 2016-09-04 16:37:06 +02:00
Christoph M. Becker 727b422ad9 Fix #72948: Uncatchable "Catchable" fatal error for class to string conversions 
E_RECOVERABLE errors are reported as "Catchable fatal error". This is
misleading, because they actually can't be caught via try-catch statements.
Therefore we change the wording to "Recoverable fatal error" as suggested by
Nikita.
 2016-09-03 13:05:37 +02:00
Stanislav Malyshev 9ca79ad832 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:29:34 -07:00
Stanislav Malyshev 01f4a52aaa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:29:17 -07:00
Stanislav Malyshev ccc8d92d3d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:28:44 -07:00
Stanislav Malyshev e576714f6b Fix bug #72910 
Merge upstream patch from https://github.com/kkos/oniguruma/commit/65bdf2a0d160d06556415e5f396a75f6b11bad5c
 2016-09-01 23:27:06 -07:00
Yasuo Ohgaki b651b96738 Allow array input for mb_check_encoding() 2016-09-02 14:18:34 +09:00
Christoph M. Becker 4c75b00025 Merge branch 'PHP-7.1' 2016-08-30 15:13:30 +02:00
Christoph M. Becker ecdef60d00 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-30 15:12:49 +02:00
Christoph M. Becker 972302d2f0 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-30 15:01:12 +02:00
Christoph M. Becker 2f10db36af Fix #66797: mb_substr only takes 32-bit signed integer 
`from` and `len` are `long`, but get passed to mbfl_substr() which expects
`int`s. Therefore we clamp the values to avoid the undefined conversion
behavior.
 2016-08-30 14:52:47 +02:00
Yasuo Ohgaki 850a0b5fb6 Merge pull request #1098 
Fix bug #69086 enhancement for mb_convert_encoding
 2016-08-10 14:39:23 +09:00
Yasuo Ohgaki 8ad4ef98b6 pull-request/1099 
Request #65081 - implemeting mb_scrub
 2016-08-10 14:09:48 +09:00
Yasuo Ohgaki 087dcd9381 pull-request/1100 
Request #65081 mb_chr() and mb_ord()

Added test cases and little optimization.
 2016-08-10 11:32:10 +09:00
ju1ius 03d03243fa Fix #72711: mb_ereg does not clear the $regs parameter on failure 
When `mb_ereg` failed to match, it didn't update the `$regs` argument.
Now it will always set it to the empty array.
 2016-08-05 13:22:10 +02:00
Christoph M. Becker 9c2814313d Merge branch 'PHP-7.0' into PHP-7.1 2016-07-30 12:04:12 +02:00
Christoph M. Becker e5940aa795 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-30 12:01:29 +02:00
ju1ius 1d32b80903 fixes bad address given to onig_error_code_to_str 
Closes bug #72710

(cherry picked from commit 0fb7eb6723)
 2016-07-30 11:46:34 +02:00
Christoph M. Becker de755310b4 Merge branch 'PHP-7.0' into PHP-7.1 
# Resolved conflicts:
#	ext/mbstring/php_mbregex.c
 2016-07-28 15:50:41 +02:00
Christoph M. Becker 805dc0ea47 Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/mbstring/php_mbregex.c
 2016-07-28 15:26:29 +02:00
Christoph M. Becker ee6900c3de Fix #72694: mb_ereg_search_setpos does not accept a string's last position 
Setting the search position immediately behind the last character should be
allowed, so we fix this off-by-one error.
 2016-07-28 15:21:48 +02:00
Christoph M. Becker 6aaef1ed34 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-28 14:09:29 +02:00