php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 16:22:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
109,493 Commits 545 Branches 1,479 Tags
bc8f292c052d7647fe0eadda426a4f4fae1d8832
Commit Graph

109493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
bc8f292c05 Merge branch 'mb-limit-73' into PHP-7.3 
* mb-limit-73:
  Add fallbacks for older oniguruma versions
  Add mbstring.regex_stack_limit to php.ini-*
  Implement RF bug #72777 - ensure stack limits on mbstring functions.
 2019-04-01 00:00:14 -07:00
Stanislav Malyshev
d2a86e1c0f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
 2019-03-31 23:11:27 -07:00
Stanislav Malyshev
682d28abf7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
 2019-03-31 23:11:24 -07:00
Stanislav Malyshev
c684d32fb8 Update NEWS 2019-03-31 23:11:15 -07:00
Stanislav Malyshev
9efaac30ae Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
 2019-03-31 23:09:57 -07:00
Stanislav Malyshev
f3ab302270 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
 2019-03-31 23:09:18 -07:00
Stanislav Malyshev
f3aefc6d07 Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s 2019-03-31 23:09:06 -07:00
Christoph M. Becker
d8b7728b0e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77827: preg_match does not ignore \r in regex flags
 2019-03-31 13:33:21 +02:00
Christoph M. Becker
88460c017a Fix #77827: preg_match does not ignore \r in regex flags 2019-03-31 13:31:54 +02:00
Stanislav Malyshev
e12c069d33 Add fallbacks for older oniguruma versions 2019-03-30 23:18:33 -07:00
Anatol Belski
a2c87c7f29 Fix memory leak 2019-03-30 21:28:51 +01:00
Matteo Beccati
263c587854 Fixed SKIPIF when --disable-mbregex is used 2019-03-30 18:29:49 +01:00
Matteo Beccati
f030f34622 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed SKIPIF when --disable-mbregex is used
 2019-03-30 18:29:44 +01:00
Matteo Beccati
0dbb581cf4 Fixed SKIPIF when --disable-mbregex is used 2019-03-30 18:28:33 +01:00
Christoph M. Becker
9d8b913de5 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix test expectation
 2019-03-29 09:56:58 +01:00
Christoph M. Becker
0aa1a2c833 Fix test expectation 
The `W32_SM_SENDMAIL_FROM_MALFORMED` error message will only be shown
if the `$additional_headers` parameter is passed to `mail`, which is
not the case for this test.  Instead we have to expect `BAD_MSG_RPATH`.
 2019-03-29 09:55:04 +01:00
Stanislav Malyshev
bc4cb277d3 Add mbstring.regex_stack_limit to php.ini-* 2019-03-28 22:57:07 -07:00
Stanislav Malyshev
66c35b083b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Validate subject encoding in mb_split and mb_ereg_match
  Validate pattern against mbregex encoding
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
 2019-03-28 00:42:56 -07:00
Stanislav Malyshev
402adc1df1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Validate subject encoding in mb_split and mb_ereg_match
  Validate pattern against mbregex encoding
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
 2019-03-28 00:35:22 -07:00
Yasuo Ohgaki
738016bd88 Implement RF bug #72777 - ensure stack limits on mbstring functions. 
The patch creates new config: mbstring.regex_stack_limit, which
defaults to 100000.
 2019-03-28 00:31:57 -07:00
Joe Watkins
62a652a0d5 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix build: readline support must be disabled by default in phpdbg
 2019-03-28 07:35:15 +01:00
Joe Watkins
b7442f1bb8 fix build: readline support must be disabled by default in phpdbg 2019-03-28 07:34:45 +01:00
Nikita Popov
0ecac37c40 Validate subject encoding in mb_split and mb_ereg_match 
We were already validating the subject encoding in most functions,
but not these two.
 2019-03-27 23:20:27 -07:00
Nikita Popov
40fe50daf6 Validate pattern against mbregex encoding 
Oniguruma does not consistently perform this validation itself (at least
on older versions), so make sure we check pattern encoding validity on the
PHP side.
 2019-03-27 23:19:46 -07:00
Joe Watkins
218154e695 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Consider phpdbg as cli
 2019-03-27 10:38:45 +01:00
Samuele Kaplun
79f046f89e Consider phpdbg as cli 
* When configuring extensions, considers the PHPDBG SAPI as CLI thus
  allowing e.g. to have the pcntl extension available within PHPDBG.

Signed-off-by: Samuele Kaplun <kaplun@protonmail.com>
 2019-03-27 10:38:03 +01:00
Joe Watkins
eb405a2192 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77805 phpdbg build fails when readline is shared
 2019-03-27 10:04:07 +01:00
Joe Watkins
7af270eb28 Fix #77805 phpdbg build fails when readline is shared 2019-03-27 10:02:42 +01:00
Joe Watkins
1e4cff9ddb Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  more work on phpdbg conditional breaks
 2019-03-27 00:02:31 +01:00
Joe Watkins
6d3a2b4693 more work on phpdbg conditional breaks 2019-03-27 00:02:15 +01:00
Joe Watkins
e177d26d0e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77800 phpdbg segfaults on conditional breakpoints
 2019-03-26 23:06:15 +01:00
Joe Watkins
7df8e4fc0a Fix #77800 phpdbg segfaults on conditional breakpoints 2019-03-26 23:05:06 +01:00
Peter Kokot
6ef6d31776 [ci skip] Update NEWS 2019-03-25 21:57:20 +01:00
Peter Kokot
58e00df9fe Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  [ci skip] Update NEWS
  Fix #77794: Incorrect Date header format in built-in server
 2019-03-25 21:56:39 +01:00
Peter Kokot
72a2ab39ba [ci skip] Update NEWS 2019-03-25 21:46:41 +01:00
Niklas Keller
7f9872387e Fix #77794: Incorrect Date header format in built-in server 
- Fix the date format to be compliant with https://tools.ietf.org/html/rfc7231#section-7.1.1.2
- Fix date format length and use GMT time
- Previously, local time was used instead of GMT.
- Remove extra whitespace
- Simplify string appends in php_cli_server.c
 2019-03-25 21:41:45 +01:00
Nikita Popov
e4d9d91462 Merge branch 'PHP-7.2' into PHP-7.3 2019-03-25 17:45:03 +01:00
Vlad Temian
ec2ecb7e12 Fix bug #77680: Correctly implement recursive mkdir on FTP stream 
If the root directory was missing, an extra CWD without arguments was
made. Also, the MKD contained an empty string.

Now the CWD will use / and MKDs will be issued starting from the root
directory.
 2019-03-25 17:43:46 +01:00
Nikita Popov
e97577edde Fixed bug #77793 
By making sure that we always first increment the refcount of the
new value before we destroy the old one.
 2019-03-25 17:33:17 +01:00
Nikita Popov
91d4d175ab Merge branch 'PHP-7.2' into PHP-7.3 2019-03-25 16:43:21 +01:00
Nikita Popov
85095dfd09 Fixed bug #72175 
Make sure we don't close the connection we're trying to reuse...
 2019-03-25 16:41:21 +01:00
Joe Watkins
93740a2482 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix bug #76801: phpdbg too many open files error
 2019-03-23 09:48:20 +01:00
Alessandro Chitolina
b8b880932e fix bug #76801: phpdbg too many open files error 2019-03-23 09:47:49 +01:00
Remi Collet
e68fd40e22 ensure pcre.jit=1 for this test 2019-03-22 15:31:36 +01:00
Remi Collet
bb47fb0783 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  ensure pcre.jit=1 for these tests
 2019-03-22 15:01:49 +01:00
Remi Collet
2e9dccef78 ensure pcre.jit=1 for these tests 2019-03-22 15:00:31 +01:00
Nikita Popov
30ddfd49ed Fixed bug #77773 2019-03-22 13:07:00 +01:00
Nikita Popov
620a753185 Merge branch 'PHP-7.2' into PHP-7.3 2019-03-22 12:41:02 +01:00
Nikita Popov
da35fa2cb8 Fixed bug #77772 2019-03-22 12:39:27 +01:00
Remi Collet
5c8d69bf6f fix test 2019-03-21 09:19:42 +01:00