clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
96,168 Commits 491 Branches 1,363 Tags 844 MiB
90c2b237d6
Commit Graph

41685 Commits

Author SHA1 Message Date
Dmitry Stogov
90c2b237d6 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  #72337 invalid dimensions can lead to segv
  7.0.9 next
 2016-06-07 14:08:41 +03:00
Dmitry Stogov
b12dfbad6a Added test 2016-06-07 14:08:12 +03:00
Dmitry Stogov
5b81f9d92e Fixed bug #72202 (curl_close doesn't close cURL handle) 
Now curl_close() forces connection close, independently of other links to the same resource.

This reverts commit 3ba4f8263d.
 2016-06-07 14:03:14 +03:00
Pierre Joye
4f8a451371 Merge branch 'PHP-5.6' 
* PHP-5.6:
  #72337 invalid dimensions can lead to segv
 2016-06-07 17:19:17 +07:00
Pierre Joye
f80125950c #72337 invalid dimensions can lead to segv 2016-06-07 17:16:40 +07:00
Anatol Belski
3c4edc8c62 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Add test for bug #53735
 2016-06-06 21:08:18 +02:00
Anatol Belski
edb8c3f6e3 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add test for bug #53735
 2016-06-06 21:07:45 +02:00
Anatol Belski
2a0ed8a2eb Add test for bug #53735 2016-06-06 21:06:06 +02:00
Dmitry Stogov
80b39b498a Improve type narrowing (check only SSA definitions). 2016-06-06 14:57:02 +03:00
Nikita Popov
543649bd4c Fix correctness issues with type narrowing 
Fixes bug #72335.
 2016-06-06 14:56:17 +03:00
Anatol Belski
da280d41b6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix ibase handle initialization, mostly compiler warnings
 2016-06-06 13:33:39 +02:00
Anatol Belski
3e6c02b91a fix ibase handle initialization, mostly compiler warnings 2016-06-06 13:30:17 +02:00
Anatol Belski
edf769c023 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix typo
 2016-06-06 08:58:40 +02:00
Anatol Belski
174c3371bd Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix typo
 2016-06-06 08:58:08 +02:00
Anatol Belski
eaef8f6db2 fix typo 2016-06-06 08:56:40 +02:00
Anatol Belski
db68121da8 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix broken skipif and add xfail for now
 2016-06-06 08:23:22 +02:00
Anatol Belski
075c75873e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix broken skipif and add xfail for now
 2016-06-06 08:21:39 +02:00
Anatol Belski
1b2afd478b fix broken skipif and add xfail for now 2016-06-06 08:20:01 +02:00
Anatol Belski
628272ee6c Merge branch 'PHP-7.0' 
* PHP-7.0:
  missing return
 2016-06-06 07:34:34 +02:00
Anatol Belski
6ec8b2c57d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  missing return
 2016-06-06 07:33:36 +02:00
Anatol Belski
c05b417718 missing return 2016-06-06 07:28:12 +02:00
Nikita Popov
e6296f0dcc Fix VERIFY_RETURN_TYPE elision 
This both fixes incorrect elision and allows elision for cases
where we only have a subset (e.g. true of bool).
 2016-06-05 23:44:08 +02:00
Nikita Popov
c5348850df Fix bug71843.phpt 
Is Travis not running opcache tests?
 2016-06-05 23:05:03 +02:00
Nikita Popov
9fa1ab1b22 Check SKIP_SLOW_TESTS in issue0140.phpt 
This test contains two sleeps...
 2016-06-05 23:05:00 +02:00
Nikita Popov
7b4618e396 Fix SSA NOP removal 
NOPs need to be tracked in the shiftlist as well, as there may be
jumps to NOPs.
 2016-06-05 23:00:32 +02:00
Nikita Popov
3be92120ba Fix handling of parse_str() with unpack in optimizer 2016-06-05 22:16:15 +02:00
Nikita Popov
70f0546885 Don't optimize special dynamic calls to non-dynamic 
As it drops the warning. This is more problematic with constant
propagation, as tests would fail.

Extract a zend_optimizer_classify_function() function, as its now
needed by zend_cfg and update_opN.
 2016-06-05 22:04:36 +02:00
Jakub Zelenka
da83e4295a Merge branch 'PHP-7.0' 2016-06-05 17:31:05 +01:00
Jakub Zelenka
1f7535234e Merge branch 'PHP-5.6' into PHP-7.0 2016-06-05 17:30:03 +01:00
Jakub Zelenka
d4615d1118 Add new test for openssl_pkey_new 2016-06-05 17:27:47 +01:00
Jakub Zelenka
497fe33d6f Add test for openssl_error_string 
This test is important for making sure that the error strings
from OpenSSL works as expected and we can safely add a fix
for storing the strings that is prepared.
 2016-06-05 17:23:05 +01:00
Jakub Zelenka
5e9f387175 Remove openssl_x509_parse for OpenSSL 0.9.x 
The test is unstable and it actually fails with latest 0.9.8
 2016-06-05 16:28:50 +01:00
Anatol Belski
5cf8c72dfb added test for bug #47517 2016-06-02 23:06:20 +02:00
Mic
0112b64a34 Fixed bug #69398 IntlDateFormatter formatObject returns wrong value when time style is NONE 2016-06-02 22:40:27 +02:00
Mic
527ddacd20 Fixed bug #69374 IntlDateFormatter formatObject returns wrong utf8 value 
Relying on invariant strings is a mistake. Not only UTF-8, but also
many charsets are not single byte. Actual date formats can be mixed
with arbitrary strings, and this can bring erroneous results in the
out. Thus, instead it is more convenient to say, that a format string
can consist either on UTF-8 or on pure ASCII as its subset. This is
what is currently being done in other classes like Formatter, etc.
as well.
 2016-06-02 22:27:48 +02:00
Jani Ollikainen
0a04f61448 Added backwards compability with php_log_err by using macro 2016-06-02 13:25:29 +02:00
Jani Ollikainen
3edf7d960c Logging to syslog with dynamic error levels (related to #49467) 2016-06-02 13:25:29 +02:00
Anatol Belski
22336db97f Fixed bug #70484 selectordinal doesn't work with named parameters 2016-06-02 12:17:42 +02:00
Elizabeth Marie Smith
72c9324d70 Fix ODBC bug for varchars returning with length zero 2016-06-02 12:04:10 +02:00
Anatol Belski
2ca86bb860 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Add test for bug #72294
  Fixed bug #72294 Segmentation fault/invalid pointer in connection with pgsql_stmt_dtor
 2016-06-01 11:57:00 +02:00
Anatol Belski
79b978db9a Add test for bug #72294 2016-06-01 11:55:35 +02:00
Anatol Belski
af8fa8e937 Fixed bug #72294 Segmentation fault/invalid pointer in connection with pgsql_stmt_dtor 2016-06-01 11:55:35 +02:00
Xinchen Hui
1afcf15c85 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Also include ini_get
 2016-06-01 10:46:22 +08:00
Xinchen Hui
cf1ad54b64 Also include ini_get 2016-06-01 10:46:04 +08:00
Xinchen Hui
fb3aadea4c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Forgotten test script for bug #72300
 2016-06-01 10:44:37 +08:00
Xinchen Hui
f5bc7e881b Forgotten test script for bug #72300 2016-06-01 10:43:53 +08:00
Sara Golemon
51b3be7e76 Correct inline comments regarding pass1/pass2 actions 
BRK/CONT no longer reach the optimizing following 8542befa7b
Pre-evaluate constant function calls is in pass1, not pass2
 2016-05-31 22:41:37 +00:00
Anatol Belski
b4a07fa5db Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test portability
 2016-05-31 18:53:37 +02:00
Anatol Belski
1d4d8c7436 fix test portability 2016-05-31 18:42:40 +02:00
Xinchen Hui
02571c2a7b Merge branch 'PHP-7.0' 2016-05-31 07:24:22 -07:00