1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Commit Graph

49120 Commits

Author SHA1 Message Date
bugreportuser cdedc1cb89 mysqli_fork: Fix undefined variable 2018-10-06 14:38:10 -03:00
Pedro Magalhães d87fdd9a96 Merge branch 'PHP-7.3'
* PHP-7.3:
  Remove unstable dns tests
2018-10-06 15:59:05 +01:00
Pedro Magalhães 484b79e868 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Remove unstable dns tests
2018-10-06 15:58:51 +01:00
Pedro Magalhães 608b48e5f4 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Remove unstable dns tests
2018-10-06 15:58:32 +01:00
Pedro Magalhães 49835e1436 Remove unstable dns tests 2018-10-06 15:58:01 +01:00
Pedro Magalhães 418e2264dc Merge branch 'PHP-8.3'
* PHP-7.3:
  Fix #76888 - Remove unstable test
2018-10-06 15:46:30 +01:00
Pedro Magalhães ef36419af4 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix #76888 - Remove unstable test
2018-10-06 15:46:11 +01:00
Pedro Magalhães 82e10f3974 Fix #76888 - Remove unstable test 2018-10-06 15:45:07 +01:00
Pedro Magalhães 7862d9c942 Use the locally defined constants for dns record types 2018-10-06 14:58:11 +01:00
Christoph M. Becker 6083a387a8 Unbundle libsqlite3
Since there is no need to patch libsqlite3 for our purposes, and since
libsqlite3 ≥ 3.3.9 (which is our current requirement) is widely
available on distros, there is no reason anymore to bundle the library.

Besides removing the bundled libsqlite, and adapting the configuration
respectively, we also fix the use of the SQLITE_ENABLE_COLUMN_METADATA
compile time constant to detect whether sqlite3_column_table_name() is
available by a working feature detection (otherwise bug_42589.phpt
would fail).  We also skip bug73068.phpt for libsqlite 3.11.0 to
3.14.1 which have a bug (<https://sqlite.org/src/info/ef360601>).

We also completely drop support for the obscure pdo_sqlite_external
extension (which could have been enabled on Windows only by passing
`--pdo-sqlite-external` to configure), since it is not needed anymore.

Furthermore, we remove references to the bundled libsqlite from
Makefile.gcov, CONTRIBUTING.md and README.REDIST.BINS.
2018-10-06 12:36:55 +02:00
Christoph M. Becker 61330b0faf Fix PHPT ENV sections
run-tests.php assumes the contents of an ENV section are a simple list
of key-value-pairs, instead of evaluating the section contents as PHP
script which server-tests.php did.  Since server-tests.php is gone, we
remove the superfluous and confusing scripting.
2018-10-06 12:29:04 +02:00
Anatol Belski 72df422d69 Add test for bug #76942 2018-10-05 22:54:50 +02:00
Anatol Belski 55e0bc9532 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Add test for bug #76942
  Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
2018-10-05 22:53:11 +02:00
Anatol Belski a7754286d2 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Add test for bug #76942
  Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
2018-10-05 22:52:53 +02:00
Anatol Belski c2a956de6f Add test for bug #76942 2018-10-05 22:51:58 +02:00
Anatol Belski 534684d104 Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
ref bug #74484
2018-10-05 22:50:34 +02:00
Nikita Popov cb0505d1c5 Merge branch 'PHP-7.3' 2018-10-05 21:34:04 +02:00
twosee 05a884f639 Optimize MySQL statement execute without parameters 2018-10-05 21:33:38 +02:00
Nikita Popov 3169e25a3c Merge branch 'PHP-7.3' 2018-10-05 18:42:45 +02:00
Nikita Popov aa376cc1d5 Merge branch 'PHP-7.2' into PHP-7.3 2018-10-05 18:41:57 +02:00
Nikita Popov fde2ae3721 Merge branch 'PHP-7.1' into PHP-7.2 2018-10-05 18:41:28 +02:00
Manuel Mausz bb4a2e8bb7 Fix #76972: FTP data truncation due to forceful ssl socket shutdown
Do a correct bidirectional shutdown instead
2018-10-05 18:40:50 +02:00
Pedro Magalhães 7b10e71b9d Use the locally defined constants for dns record types 2018-10-05 16:38:06 +01:00
Nikita Popov f48ee1ff58 Clarify that the get_properties handler is required
Some places were checking for non-null get_properties, some weren't.
Make it clear that the handler is required and such checks are not
necessary.
2018-10-04 12:46:50 +02:00
Nikita Popov 74d138e4a3 Fix incorrect printf modifier after size_t changes 2018-10-04 12:13:46 +02:00
Remi Collet 1ac97c77cb Merge branch 'PHP-7.3'
* PHP-7.3:
  Allow to disable pcre.jit when system library is used as it is for now broken on some arch (s390x...)
2018-10-04 11:46:37 +02:00
Remi Collet bbfea4b470 Allow to disable pcre.jit when system library is used
as it is for now broken on some arch (s390x...)
2018-10-04 11:45:35 +02:00
Pierrick Charron e450679dcd Merge branch 'PHP-7.3' 2018-10-03 19:44:46 -04:00
Pierrick Charron 02b2dbb724 Add constants from curl 7.50 to 7.55 2018-10-03 19:43:59 -04:00
Kalle Sommer Nielsen d604f65de5 Merge branch 'master' of git.php.net:/php-src 2018-10-03 13:36:30 +02:00
Kalle Sommer Nielsen 5268f367ce Hopefully last round of size_t fixes, this makes the remaining php_hash_ops use size_t over an int 2018-10-03 13:36:05 +02:00
Remi Collet 4778578b56 Merge branch 'PHP-7.3'
* PHP-7.3:
  bump zip extension version
2018-10-03 12:59:46 +02:00
Remi Collet 726a77cfdd Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  bump zip extension version
2018-10-03 12:59:31 +02:00
Remi Collet da05b7e81e bump zip extension version 2018-10-03 12:59:01 +02:00
Kalle Sommer Nielsen c116326793 Remove $ext_shared usage for ext/hash in the Unix build script (Thanks Christoph for the notice) 2018-10-03 11:36:11 +02:00
Kalle Sommer Nielsen 0d7d2a2011 Merge branch 'master' of git.php.net:/php-src 2018-10-03 11:33:15 +02:00
Kalle Sommer Nielsen 84b0d0faba Second round of fixing compiler warnings in ext/hash. Lots of the signatures that previously was unsigned int is now size_t, there was a fair bit of inconsistency there already and this commit should make it all sync nicely 2018-10-03 11:32:57 +02:00
Nikita Popov 1e14b7a369 Write to correct smart_str
Mixed this up during the migration to ZEND_HASH_FOREACH.
2018-10-03 11:03:55 +02:00
Nikita Popov a659d16adf Merge branch 'PHP-7.3' 2018-10-03 10:50:38 +02:00
Nikita Popov 9f3ea20320 Merge branch 'PHP-7.2' into PHP-7.3 2018-10-03 10:50:27 +02:00
Nikita Popov 54aa76167b Merge branch 'PHP-7.1' into PHP-7.2 2018-10-03 10:50:16 +02:00
Nikita Popov 945f315506 Reflection: Copy invoke function also in the variadic case
It doesn't matter how the parameters are provided, we always have
to copy the trampoline invoke function.
2018-10-03 10:48:42 +02:00
Nikita Popov ac96a57818 Remove uses of apply_with_arguments API in reflection
Instead of ZEND_HASH_FOREACH. As a side-effect, this fixes a latent
bug in _addmethod, where a zval was interpreted as a zval*.

Also apply some optimizations to getProperties() while at it: For
declared properties, use the HT key instead of unmangling the
property name. For dynamic properties check INDIRECT instead of
looking up prop info to determine if the property is dynamic.
2018-10-03 10:37:42 +02:00
Kalle Sommer Nielsen f7991ca656 Revert "Fix compiler warnings in ext/hash"
This reverts commit 596fbf7393.
2018-10-03 10:37:20 +02:00
Kalle Sommer Nielsen 596fbf7393 Fix compiler warnings in ext/hash 2018-10-03 08:48:27 +02:00
Kalle Sommer Nielsen f73c0102d6 Update hash tests for consistency in their titles and remove the skipif sections (except for the mhash related tests) 2018-10-03 08:48:11 +02:00
Kalle Sommer Nielsen bf34442581 Implemented RFC "Always available hash extension" 2018-10-03 08:47:07 +02:00
Nikita Popov 10b1ab9275 Some reflection cleanups
Use zend_string and zend_string_tolower in more places, clean up
__invoke handling slightly.
2018-10-02 23:14:13 +02:00
Nikita Popov 784579d99a Merge branch 'PHP-7.3' 2018-10-02 18:20:30 +02:00
Nikita Popov a42801abe3 Merge branch 'PHP-7.2' into PHP-7.3 2018-10-02 18:20:25 +02:00