php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 21:41:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
118,246 Commits 547 Branches 1,483 Tags
ea0110f0de79124e298eba7724149b9513845fcb
Commit Graph

497 Commits

Author SHA1 Message Date
Máté Kocsis
36935e42ea Improve undefined variable error messages 
Closes GH-5312
 2020-03-31 13:02:32 +02:00
Christoph M. Becker
12ca4fe65d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79413: session_create_id() fails for active sessions
 2020-03-31 08:41:08 +02:00
Christoph M. Becker
d533fa15e6 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79413: session_create_id() fails for active sessions
 2020-03-31 08:39:54 +02:00
Christoph M. Becker
b510250b8e Fix #79413: session_create_id() fails for active sessions 
The comment on `PS_VALIDATE_SID_FUNC(files)` is very clear that the
function is supposed to return `SUCCESS` if the session already exists.
So to detect a collision, we have to check for `SUCCESS`, not
`FAILURE`.

We also fix the wrong condition in session_regenerate_id() as well.
 2020-03-31 08:38:23 +02:00
Christoph M. Becker
b31f73b1c8 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Enclose INI values containing {TMP} in quotes
 2020-03-09 22:53:23 +01:00
Christoph M. Becker
fea2994ff8 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Enclose INI values containing {TMP} in quotes
 2020-03-09 22:51:11 +01:00
Christoph M. Becker
d5e206620b Enclose INI values containing {TMP} in quotes 
At least on Windows, the temporary directory may contain tilde signs,
which would result in an INI parse error.
 2020-03-09 22:49:08 +01:00
Máté Kocsis
960318ed95 Change argument error message format 
Closes GH-5211
 2020-02-26 15:00:08 +01:00
Máté Kocsis
ac0853eb26 Make type error messages more consistent 
Closes GH-5092
 2020-02-17 14:22:17 +01:00
Stanislav Malyshev
90ae1818d5 Fix bug #79221 - Null Pointer Dereference in PHP Session Upload Progress 2020-02-17 00:20:31 -08:00
Stanislav Malyshev
282bfb109e Fix bug #79221 - Null Pointer Dereference in PHP Session Upload Progress 2020-02-17 00:20:17 -08:00
Stanislav Malyshev
409965fe1c Fix bug #79221 - Null Pointer Dereference in PHP Session Upload Progress 2020-02-17 00:19:30 -08:00
Nikita Popov
f8d795820e Reindent phpt files 2020-02-03 22:52:20 +01:00
Stanislav Malyshev
545f77d313 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update NEWS
  Fix bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`)
  Fix #79099: OOB read in php_strip_tags_ex
  Fix #79091: heap use-after-free in session_create_id()
 2020-01-20 22:47:28 -08:00
Stanislav Malyshev
a29c793381 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Update NEWS
  Fix bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`)
  Fix #79099: OOB read in php_strip_tags_ex
  Fix #79091: heap use-after-free in session_create_id()
 2020-01-20 22:47:01 -08:00
Stanislav Malyshev
25ec7eb346 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
  Fix bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`)
  Fix #79099: OOB read in php_strip_tags_ex
  Fix #79091: heap use-after-free in session_create_id()
 2020-01-20 22:46:29 -08:00
Christoph M. Becker
f79c774274 Fix #79091: heap use-after-free in session_create_id() 
If the `new_id` is released, we must not use it again.
 2020-01-20 21:43:42 -08:00
Nikita Popov
d8bd113b51 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add test for bug #79031
  Revert "Increase serialize_lock while decoding session"
 2019-12-30 11:31:56 +01:00
Nikita Popov
fcaf7cbd64 Add test for bug #79031 
Fixed by preceding revert.
 2019-12-30 11:31:27 +01:00
Fabien Villepinte
a555cc0b3d Clean DONE tags from tests 
Remove most of the `===DONE===` tags and its variations.
Keep `===DONE===` if the test output otherwise becomes empty.

Closes GH-4872.
 2019-11-07 21:31:47 +01:00
Nikita Popov
4802df5b3c Merge branch 'PHP-7.4' 2019-10-07 16:44:44 +02:00
Nikita Popov
638ac2efc4 Merge branch 'PHP-7.3' into PHP-7.4 2019-10-07 16:44:39 +02:00
Nikita Popov
2624c9a505 Merge branch 'PHP-7.2' into PHP-7.3 2019-10-07 16:44:31 +02:00
Nikita Popov
7d19668f60 Set session.gc_probability=0 in bug78624.phpt 
We only want to test manually triggered session GC.
Avoid spurious output due to automatic GC.
 2019-10-07 16:43:19 +02:00
Joe Watkins
26baf5454b Merge branch 'PHP-7.4' 
* PHP-7.4:
  fix #78624: session_gc return value for user defined session handlers
 2019-10-04 06:16:41 +02:00
Joe Watkins
74ca3a5cad Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  fix #78624: session_gc return value for user defined session handlers
 2019-10-04 06:16:18 +02:00
Joe Watkins
f45eb353d1 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix #78624: session_gc return value for user defined session handlers
 2019-10-04 06:12:29 +02:00
Brent Shaffer
a6d219630c fix #78624: session_gc return value for user defined session handlers 2019-10-04 06:12:02 +02:00
Nikita Popov
2f92957fd3 Convert some notices to warnings 
Part of https://wiki.php.net/rfc/engine_warnings.
 2019-10-02 10:34:08 +02:00
Nikita Popov
0ebf2bdba0 Convert "Illegal offset type" warnings to exceptions 2019-09-27 13:00:07 +02:00
Fabien Villepinte
7e8f11531e Make some session tests more robust 2019-09-16 15:20:32 +02:00
Christoph M. Becker
68edbbfe76 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add the last missing SKIPIF
 2019-09-04 08:54:07 +02:00
Fabien Villepinte
ced5bb7d88 Add the last missing SKIPIF 2019-09-04 08:53:35 +02:00
Peter Kokot
221494f4de Merge branch 'PHP-7.4' 
* PHP-7.4:
  Sync HAVE_HASH, HAVE_HASH_EXT, PHAR_HASH_OK symbols
 2019-06-27 23:29:11 +02:00
Peter Kokot
033cafacbd Sync HAVE_HASH, HAVE_HASH_EXT, PHAR_HASH_OK symbols 
The hash extension is always available since PHP-7.4. The symbol
HAVE_HASH_EXT is kept for BC reasons and removed in PHP-8.0.

This patch also removes the PHAR_HASH_OK since it is no longer
relevant.
 2019-06-27 23:25:33 +02:00
Christoph M. Becker
77f02cda53 Merge branch 'PHP-7.4' 
* PHP-7.4:
  use {TMP} placeholder in phpt tests
 2019-05-21 09:03:51 +02:00
Christoph M. Becker
c982a4c3f9 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  use {TMP} placeholder in phpt tests
 2019-05-21 09:03:20 +02:00
Christoph M. Becker
11740abd6b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  use {TMP} placeholder in phpt tests
 2019-05-21 09:03:01 +02:00
Holly Li (WIPRO LIMITED)
202e6936d6 use {TMP} placeholder in phpt tests 2019-05-21 09:02:37 +02:00
Peter Kokot
6426420f61 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace dirname(__FILE__) by __DIR__ in tests
 2019-03-15 23:36:47 +01:00
Fabien Villepinte
26dfce7f36 Replace dirname(__FILE__) by __DIR__ in tests 2019-03-15 22:55:30 +01:00
Nikita Popov
852485d8ec Adjust tests for zpp TypeError change 2019-03-11 11:32:20 +01:00
Gabriel Caruso
726919e4b5 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Use EXPECT when possible
  Fix tests filenames
 2019-03-11 00:07:32 -03:00
Gabriel Caruso
c67c2c4d8f Fix tests filenames 2019-03-10 23:57:32 -03:00
Nikita Popov
19e4abd7ec Merge branch 'PHP-7.4' 2019-03-07 15:55:13 +01:00
Nikita Popov
c8e10c6119 More zpp error/variation test removals 2019-03-07 15:54:31 +01:00
Nikita Popov
c8e2b333cb Merge branch 'PHP-7.4' 2019-02-20 11:22:31 +01:00
Nikita Popov
c0e15a3b7f Implement fine-grained conflict handling 
Tests can specify conflict keys, either in --CONFLICTS-- or
a per-directory CONFLICTS file. Non-conflicting tests may be run
in parallel.
 2019-02-20 11:20:40 +01:00
Nikita Popov
689521af8e Remove two more zpp variation tests 
These are normal zpp arguments in PHP 8. Also not adjusted for
32-bit systems...
 2019-02-07 15:38:43 +01:00
Nikita Popov
d750f0a192 Merge branch 'PHP-7.4' 2019-02-05 09:41:08 +01:00