clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
114,630 Commits 491 Branches 1,363 Tags 838 MiB
6f0c3386d4
Commit Graph

114630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
6f0c3386d4 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  [ci skip] Add missing NEWS entries
 2020-08-03 11:19:44 +02:00
Christoph M. Becker
17d64af186 [ci skip] Add missing NEWS entries 2020-08-03 11:18:18 +02:00
Christoph M. Becker
cf855ede8a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79877: getimagesize function silently truncates after a null byte
  Fix #79797: Use of freed hash key in the phar_parse_zipfile function
 2020-08-03 11:13:49 +02:00
Christoph M. Becker
4d2560dd6a Fix #79877: getimagesize function silently truncates after a null byte 
We have to check for NUL bytes if `getimagesize()` has been called.
 2020-08-03 01:09:44 -07:00
Christoph M. Becker
9c3171f019 Fix #79797: Use of freed hash key in the phar_parse_zipfile function 
We must not use heap memory after we freed it.
 2020-08-03 01:09:44 -07:00
Christoph M. Becker
d4b32e82c8 Enable libxml entity loader test case on Windows 2020-08-03 09:13:30 +02:00
Stanislav Malyshev
5b29af5c78 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #79877: getimagesize function silently truncates after a null byte
  Fix #79797: Use of freed hash key in the phar_parse_zipfile function
 2020-08-02 23:56:37 -07:00
Christoph M. Becker
ff577b04c0 Fix #79877: getimagesize function silently truncates after a null byte 
We have to check for NUL bytes if `getimagesize()` has been called.
 2020-08-02 15:33:24 -07:00
Christoph M. Becker
7355ab8176 Fix #79797: Use of freed hash key in the phar_parse_zipfile function 
We must not use heap memory after we freed it.
 2020-08-02 15:31:29 -07:00
Christoph M. Becker
fce8061ede Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79919: Stack use-after-scope in define()
 2020-07-31 10:57:02 +02:00
Christoph M. Becker
1e0bc6e30f Fix #79919: Stack use-after-scope in define() 
Instead of the temporary `rv`, we use the `val_free` which is there for
this purpose.
 2020-07-31 10:54:41 +02:00
Christoph M. Becker
4b84a1f9e0 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Amendment to OPcache base file removal
 2020-07-29 18:44:35 +02:00
Christoph M. Becker
d95c53834c Amendment to OPcache base file removal 
We fix the erroneous segment size.  We also keep the segment pointer at
the allocated address, but increase the position instead.
 2020-07-29 18:44:08 +02:00
Christoph M. Becker
2bcc419800 Fix #73060: php failed with error after temp folder cleaned up 
Instead of storing the mapping base address and the address of
`execute_ex()` in a separate file in the temporary folder, we store
them right at the beginning of the memory mapping.
 2020-07-29 18:21:05 +02:00
Nikita Popov
f8ff8bb767 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Consider op1 literal of FETCH_OBJ_R
 2020-07-29 17:05:35 +02:00
Nikita Popov
57ad5b3432 Consider op1 literal of FETCH_OBJ_R 
FETCH_OBJ_R may have an op1 CONST operand, even though it will
always error. We should take this into account when compacting
literals.
 2020-07-29 17:04:23 +02:00
Nikita Popov
c6d539ae01 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test
 2020-07-29 15:04:23 +02:00
Nikita Popov
99c48a2477 Fix test 2020-07-29 15:04:05 +02:00
Christoph M. Becker
826b90a5f0 Revert "Merge branch 'PHP-7.3' into PHP-7.4" 
This reverts commit e1f6ab3388, reversing
changes made to e0ebe56ebf.

There are obviously issues with running tests in parallel, maybe
related to the cache ID.  This needs to be investigated.  Revert for
now.
 2020-07-29 13:32:59 +02:00
Christoph M. Becker
f8792443a2 Prevent test case from stalling 
If the CTRL-C event can't be sent to the child for whatever reason, the
test will never terminate, because `proc_close()` waits for an infinite
amount of time.  Therefore, we `proc_terminate()` the child instead,
after explicitly closing the pipes.
 2020-07-29 12:46:14 +02:00
Nikita Popov
678f5b6068 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79895: support = in PHP_CHECK_GCC_ARG m4 macro
 2020-07-29 12:39:30 +02:00
Santiago M. Mola
e767ca60a0 Fix #79895: support = in PHP_CHECK_GCC_ARG m4 macro 
Closes GH-5890.
 2020-07-29 12:36:52 +02:00
twosee
12bd3cc146 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Handle bindto error
 2020-07-29 17:46:57 +08:00
twosee
0b8c83f593 Handle bindto error 
Closes GH-5903.
 2020-07-29 17:46:27 +08:00
Christoph M. Becker
e1f6ab3388 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #73060: php failed with error after temp folder cleaned up
 2020-07-29 10:11:29 +02:00
Christoph M. Becker
9a744c66e7 Fix #73060: php failed with error after temp folder cleaned up 
Instead of storing the mapping base address and the address of
`execute_ex()` in a separate file in the temporary folder, we store
them right at the beginning of the memory mapping.
 2020-07-29 10:07:23 +02:00
Christoph M. Becker
e0ebe56ebf Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79806: realpath() erroneously resolves link to link
 2020-07-28 14:00:52 +02:00
Christoph M. Becker
c756f82c02 Fix #79806: realpath() erroneously resolves link to link 
After resolving reparse points, the path still may be a reparse point;
in that case we have to resolve that reparse point as well.
 2020-07-28 13:55:22 +02:00
Côme Chilliet
1ba88355d7 Updated NEWS 2020-07-28 10:28:31 +02:00
Côme Chilliet
52eebc5afd Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  fix memory leaks in ext/ldap/ldap.c
 2020-07-28 10:27:52 +02:00
Paweł Tomulik
fef5a9e502 fix memory leaks in ext/ldap/ldap.c 2020-07-28 10:27:22 +02:00
Paweł Tomulik
efe6d96b45 fix memory leaks in ext/ldap/ldap.c 2020-07-28 10:23:10 +02:00
Christoph M. Becker
f02507469d Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Revert "Fix #79806: realpath() erroneously resolves link to link"
 2020-07-27 17:51:56 +02:00
Christoph M. Becker
1aeff522b8 Revert "Fix #79806: realpath() erroneously resolves link to link" 
This reverts commit d5b59b4303.
 2020-07-27 17:50:41 +02:00
Christoph M. Becker
85a26fef11 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79806: realpath() erroneously resolves link to link
 2020-07-27 15:10:22 +02:00
Christoph M. Becker
d5b59b4303 Fix #79806: realpath() erroneously resolves link to link 
After resolving reparse points, the path still may be a reparse point;
in that case we have to resolve that reparse point as well.
 2020-07-27 15:08:39 +02:00
Christoph M. Becker
68aa1329eb Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #77932: File extensions are case-sensitive
 2020-07-27 11:54:54 +02:00
Christoph M. Becker
6f18d7e2f9 Fix #77932: File extensions are case-sensitive 
The file extension to mime type mapping *must* not depend on the file
extension's case for case-insensitive file systems, and *should* not
for case-sensitive file systems.
 2020-07-27 11:52:18 +02:00
Derick Rethans
877a351ea8 PHP-7.4 is 7.4.10-dev now 2020-07-26 10:08:52 +01:00
George Wang
27bd16e71f Merge branch 'PHP-7.3' into PHP-7.4 2020-07-23 15:54:48 -04:00
George Wang
874284d1c9 Merge branch 'PHP-7.2' into PHP-7.3 2020-07-23 15:36:35 -04:00
George Wang
c39f5fe94e Security: update to LiteSpeed SAPI v7.7 to address an buffer overflow, and some log message tunings. 2020-07-23 15:35:32 -04:00
Christoph M. Becker
3deb6b555a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79884: PHP_CONFIG_FILE_PATH is meaningless
 2020-07-23 15:41:20 +02:00
Christoph M. Becker
15efb96d4c Fix #79884: PHP_CONFIG_FILE_PATH is meaningless 
It does not make sense to make assumptions about `PHP_CONFIG_FILE_PATH`
during build time, since that value is never used during run time on
Windows.  Since there is no `--with-config-file-path` on Windows
either, we define `PHP_CONFIG_FILE_PATH` as `""`.
 2020-07-23 15:39:22 +02:00
Christoph M. Becker
0a59a71947 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix brittle test
 2020-07-22 20:46:28 +02:00
Christoph M. Becker
6b99a8be4d Fix brittle test 
This test fails occasionally due to timing issues, because the session
file may have been unlinked by the first `session_start()`'s GC.  We
adapt the test expectation to this reality.
 2020-07-22 20:45:56 +02:00
Christoph M. Becker
c1a80e075a Fix minor memory leak of CG(script_encoding_list) 
This only leaks at the end of the process, so per se not an issue, but
the leak is caught by MSVC's CRT leak checker, so we better properly
clean up to avoid false positives.
 2020-07-22 20:32:48 +02:00
Nikita Popov
657a832a77 Fixed bug #79881 2020-07-22 10:21:24 +02:00
Derick Rethans
973be68c63 Prepare for 7.4.10 2020-07-21 09:23:51 +01:00
Christoph M. Becker
d85b4281d0 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  7.3 is now 7.3.22-dev
 2020-07-21 09:52:04 +02:00