mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-21 16:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
117,351 Commits 503 Branches 1,387 Tags 839 MiB
d2cb200e10
Commit Graph

117351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
d5f26de63d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Revert "Display a message if select in FPM test timeouts"
 2020-01-08 16:32:00 +01:00
Nikita Popov
4b860c06ed Revert "Display a message if select in FPM test timeouts" 
This reverts commit e2361498d5.

Ooops, this occurs normally during some tests, but I didn't notice
because I have slow tests disabled...
 2020-01-08 16:31:33 +01:00
Nikita Popov
c669a1a4da Merge branch 'PHP-7.4' 
* PHP-7.4:
  Display a message if select in FPM test timeouts
 2020-01-08 15:57:21 +01:00
Nikita Popov
e2361498d5 Display a message if select in FPM test timeouts 2020-01-08 15:57:05 +01:00
Nikita Popov
d0d1654a34 Fix #49555: Improve "function must be a string" error message 
Be more specific for the individual cases and provide relevant
type information.
 2020-01-08 14:32:11 +01:00
Nikita Popov
33476ec301 Refer to method rather than function name in error message 2020-01-08 14:26:27 +01:00
Nikita Popov
ae5d7604f6 Fix #65274: Add class name to undef class constant error 2020-01-08 14:18:14 +01:00
George Peter Banyard
4cac97bfb9 Add warning and convert to exception in string offset assignment: 
Convert the empty string assignment to an Error as per RFC [1]
Add a warning that only the first byte will be assigned to the offset if provided
a needle that is longer than one byte.

[1] https://wiki.php.net/rfc/engine_warnings

Closes GH-5063
 2020-01-07 22:55:43 +01:00
George Peter Banyard
483efc7e50 Allow empty needles in mb_strpos and mb_strstr function family. 
MBstring analogous implementation to 6d578482a9

Closes GH-4977
 2020-01-07 22:53:35 +01:00
George Peter Banyard
bfe3f934a3 Add warning and convert to exception in string offset assignment: 
Convert the empty string assignment to an Error as per RFC [1]
Add a warning that only the first byte will be assigned to the offset if provided
a needle that is longer than one byte.

[1] https://wiki.php.net/rfc/engine_warnings
 2020-01-07 21:54:42 +01:00
Christoph M. Becker
b8609e2fa7 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Make test more resilient
 2020-01-07 15:29:51 +01:00
Christoph M. Becker
eaa93f6b8a Make test more resilient 
Depending on the libcurl version and perhaps configuration, it may show
additional info (due to `CURLOPT_VERBOSE` being activated), which we
have to ignore, to avoid spurious test failures.
 2020-01-07 15:28:48 +01:00
Nikita Popov
1e4920c119 Renumber zval types, clarify allowed overlap 
Make it clear that types used for type declarations can overlap
with the rest, and can also overlap in MAY_BE space.

This makes things more robust against the addition of new primitive
types.
 2020-01-07 14:55:52 +01:00
Christoph M. Becker
da48d25ea2 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Increase sleep() time in test case
 2020-01-07 14:27:34 +01:00
Christoph M. Becker
896f7533ee Increase sleep() time in test case 
Apparently, the former increase to `sleep(2)` helped somewhat, but
still the test fails occassionally.
 2020-01-07 14:26:31 +01:00
Christoph M. Becker
3e075cadfb Merge branch 'PHP-7.4' 
* PHP-7.4:
  Bump version
 2020-01-07 11:13:24 +01:00
Christoph M. Becker
1eb2379aa3 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Bump version
 2020-01-07 11:10:55 +01:00
Christoph M. Becker
38c0a53b60 Bump version 2020-01-07 11:03:19 +01:00
Nikita Popov
9b6c0bdcd6 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove support for preloading on Windows
 2020-01-06 22:42:31 +01:00
Nikita Popov
59c3ddab13 Remove support for preloading on Windows 
Due to ASLR restrictions, preloading on Windows does not work with
any code that has preloading dependencies on internal classes.
This effectively makes it unusable for any non-trivial codebase.

Instead of pretending like preloading is going to work, only to
make people realize that it really doesn't once they get beyond
a dummy example, we disable support for preloading on Windows
entirely.

Closes GH-4999.
 2020-01-06 22:41:55 +01:00
Nikita Popov
b22daa3a06 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Throw Error when referencing uninit typed prop in __sleep
 2020-01-06 18:47:44 +01:00
Nikita Popov
846b647953 Throw Error when referencing uninit typed prop in __sleep 
Previously this generated a notice, but would likely generate an
Error when unserializing.

Now we treat it with the same distinction as direct property
accesses, i.e. referencing an unset/undefined normal property
stays a notice, while a typed property becomes an Error exception.

This fixed bug #79002.

Closes GH-5050.
 2020-01-06 18:47:27 +01:00
Christoph M. Becker
d9caf3561b [ci skip] Merge branch 'PHP-7.4' 
Empty merge.
 2020-01-06 15:34:41 +01:00
Christoph M. Becker
56306cc4af [ci skip] Merge branch 'PHP-7.3' into PHP-7.4 
Empty merge.
 2020-01-06 15:33:42 +01:00
Christoph M. Becker
06e78cad83 Revert "Extend CURLFile to support streams" 
This reverts commit 17a9f1401a, because
this commit would break ABI, and also due to bug #79013.
We keep the commit for PHP 7.4+, though.
 2020-01-06 15:31:49 +01:00
Christoph M. Becker
d7833fd974 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #54298: Using empty additional_headers adding extraneous CRLF
 2020-01-06 14:51:14 +01:00
Christoph M. Becker
09ebeba1af Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #54298: Using empty additional_headers adding extraneous CRLF
 2020-01-06 14:48:46 +01:00
Christoph M. Becker
ae2150692a Fix #54298: Using empty additional_headers adding extraneous CRLF 
If the header string is empty, we pass `NULL` to `php_mail()` to avoid
further checks on the string length.
 2020-01-06 14:47:23 +01:00
Nikita Popov
29df9d13da Rename skeleton stub file 
Add the .php suffix
 2020-01-06 14:43:29 +01:00
Christoph M. Becker
be0b94c220 Fix hypothetical segfault in gdTransformAffineCopy() 
This has been reported to upstream[1], but since ext/gd never calls
`gdTransformAffineCopy()` for a palette image, it is not a bug for PHP.
Therefore we apply the fix to master only.

[1] <https://github.com/libgd/libgd/issues/586>
 2020-01-06 13:25:11 +01:00
Nikita Popov
0b4da7e6da Merge branch 'PHP-7.4' 
* PHP-7.4:
  Don't link against openssl 1.1 in curl
 2020-01-06 10:43:05 +01:00
Nikita Popov
68f6ab7113 Don't link against openssl 1.1 in curl 
OpenSSL 1.1 does not need crypto locking callbacks, so avoid
detecting and linking against it in the first place.
 2020-01-06 10:42:57 +01:00
Christoph M. Becker
5c51a482c9 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79068: gdTransformAffineCopy() changes interpolation method
 2020-01-06 10:39:00 +01:00
Christoph M. Becker
74b11e3315 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79068: gdTransformAffineCopy() changes interpolation method
 2020-01-06 10:38:22 +01:00
Christoph M. Becker
4bec59f175 Fix #79068: gdTransformAffineCopy() changes interpolation method 
We port
<9088591eae>.
 2020-01-06 10:36:48 +01:00
Nikita Popov
730f4f25db Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #79063: Curl openssl does not respect PKG_CONFIG_PATH
  Clean up curl openssl check
 2020-01-06 10:31:34 +01:00
Nikita Popov
b59f760472 Fix bug #79063: Curl openssl does not respect PKG_CONFIG_PATH 2020-01-06 10:31:22 +01:00
Nikita Popov
2d29904f25 Clean up curl openssl check 
Only set HAVE_CURL_OPENSSL flag, and remove Windows specific code,
as all of this is only relevant for OpenSSL < 1.1, which is not
used on Windows.
 2020-01-06 10:17:37 +01:00
Christoph M. Becker
bc04d5e9fc Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79067: gdTransformAffineCopy() may use unitialized values
 2020-01-06 09:38:19 +01:00
Christoph M. Becker
f799f42ec8 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79067: gdTransformAffineCopy() may use unitialized values
 2020-01-06 09:37:40 +01:00
Christoph M. Becker
2c5860517c Fix #79067: gdTransformAffineCopy() may use unitialized values 
We port
<7a06c1669c>.
 2020-01-06 09:35:13 +01:00
Christoph M. Becker
d83f89f076 Remove useless else branch 
Passing `NULL` as `gdTransformAffineGetImage()`'s `src_area` is fine,
but in this case there's no need to calculate the `rect`, and since
`pRect` has already been initialized to `NULL`, we can remove the whole
else branch.
 2020-01-06 08:54:57 +01:00
Máté Kocsis
019e8d438c
Throw exception for unconstructed intl objects 
Closes GH-5052
 2020-01-05 23:55:14 +01:00
Christoph M. Becker
ade217d05c Remove duplicate test cases 
These had originally used other exit codes as mail_basic5.phpt, but
that was changed later with commit d1b12c9[1].

[1] <http://git.php.net/?p=php-src.git;a=commit;h=d1b12c9a3031841302722d6f6706e4598a639d7a>
 2020-01-05 20:08:39 +01:00
Gabriel Caruso
fc99e89baf
Fix slowest tests 2020-01-05 18:30:51 +01:00
Matteo Beccati
0f89d407fc Fix build if SQLITE_RECURSIVE is not supported 2020-01-04 10:27:43 +01:00
Tyson Andre
37a7046d85 Merge branch 'identical-handler' into HEAD 2020-01-03 19:04:20 -05:00
Máté Kocsis
1abea33b1e
Fix usage of RETURN_THROWS() in LDAP extension 2020-01-03 22:40:16 +01:00
Máté Kocsis
aadd3aaed9
Use RETURN_THROWS() in various places 2020-01-03 21:10:24 +01:00
Máté Kocsis
bbcfa66e06
Use RETURN_THROWS() after zend_fetch_resource*() 2020-01-03 19:20:56 +01:00