clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 22:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
95,835 Commits 494 Branches 1,367 Tags 790 MiB
8ba694ebbd
Commit Graph

41527 Commits

Author SHA1 Message Date
Nikita Popov
8ba694ebbd Add $http_response_header tests 
Looks like we didn't have a single test for this functionality :/
 2016-05-06 12:37:21 +02:00
Dmitry Stogov
8ae695cd75 Fixed possible crash 2016-05-06 12:36:21 +03:00
Dmitry Stogov
cca2c8ecc4 Reimplemented Bob's commit bac6fdb0c5 without insignificant renaming and white-space changes 2016-05-06 10:47:58 +03:00
Dmitry Stogov
c19cb70dac Revert "Refactor zval cleanup into single function" 
This reverts commit bac6fdb0c5.
 2016-05-06 10:47:58 +03:00
Anatol Belski
80f91fd9d5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Re-fix #72165
  Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new"
 2016-05-06 09:33:22 +02:00
Anatol Belski
5afba67bfe Re-fix #72165 
Reverted previous wrong patch, throw warning for numeric keys.
Numeric field names are not supported, see "distinguished name"
section here https://www.openssl.org/docs/manmaster/apps/req.html
 2016-05-06 09:30:41 +02:00
Anatol Belski
dd5479ea4c Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new" 
This reverts commit 7277c85765.
 2016-05-06 09:19:04 +02:00
Anatol Belski
20ae634bf0 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72165 Null pointer dereference - openssl_csr_new
 2016-05-06 09:02:14 +02:00
Anatol Belski
7277c85765 Fixed bug #72165 Null pointer dereference - openssl_csr_new 2016-05-06 09:01:27 +02:00
Bob Weinand
bac6fdb0c5 Refactor zval cleanup into single function 
Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor()
 2016-05-05 23:31:57 +02:00
Dmitry Stogov
6d52492906 Update comments consistently (#var0 -> #v) 2016-05-05 14:41:34 +03:00
Dmitry Stogov
542402afdb Refactor DFA pass for better readability 2016-05-05 14:37:41 +03:00
Xinchen Hui
23e362a46e Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72164 (Null Pointer Dereference - mb_ereg_replace)
 2016-05-05 17:27:58 +08:00
Xinchen Hui
395863b1d1 Fixed bug #72164 (Null Pointer Dereference - mb_ereg_replace) 2016-05-05 17:27:34 +08:00
Xinchen Hui
5eecd61b89 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72154 (pcntl_wait/pcntl_waitpid array internal structure overwrite)
 2016-05-05 15:18:24 +08:00
Xinchen Hui
c15b6134f6 Fixed bug #72154 (pcntl_wait/pcntl_waitpid array internal structure overwrite) 2016-05-05 15:18:17 +08:00
Xinchen Hui
768bdc132a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72157 (use-after-free caused by dba_open)
 2016-05-05 11:12:24 +08:00
Xinchen Hui
1a5d58b28f Fixed bug #72157 (use-after-free caused by dba_open) 2016-05-05 11:12:17 +08:00
Nikita Popov
35e7573a33 Merge branch 'PHP-7.0' 
Conflicts:
	ext/opcache/Optimizer/block_pass.c
 2016-05-05 00:01:56 +02:00
Nikita Popov
0691e7a8e1 Fix JMPZ, JMPZNZ_EX chain optimization 
The result_type was not copied, resulting in a corrupted JMPZ_EX.
Fix can be verified by inspecting the opcodes of the following
function (it should not contain any _EX opcodes):

function test() {
    if ($a && $b) {
        echo "a";
    }

    if ($b || $c || $d) {
        echo "b";
    }
}

Conflicts:
	ext/opcache/Optimizer/block_pass.c
 2016-05-05 00:00:56 +02:00
Dmitry Stogov
172d8552fc Fixed type inference rules. 2016-05-04 23:59:17 +03:00
Anatol Belski
ee551106bc Merge branch 'PHP-7.0' 
* PHP-7.0:
  add test fo rbug 71805
 2016-05-03 19:11:15 +02:00
Anatol Belski
2d0081cebd Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add test fo rbug 71805
 2016-05-03 19:10:40 +02:00
Anatol Belski
5351151352 add test fo rbug 71805 2016-05-03 19:09:11 +02:00
Joe Watkins
1b5a005367 hide implementation details in tests 2016-05-02 22:16:56 +01:00
Bob Weinand
eb72b0ee06 Merge remote-tracking branch 'origin/PHP-7.0' 2016-05-02 18:22:35 +02:00
Chris Wright
e8abb70fc9 Implement socket_export_stream() 2016-05-02 17:08:15 +02:00
Nikita Popov
4b0f9586db Add missing update_constants in ReflectionClassConstant 
Also fix indentation of __toString().
 2016-05-02 11:43:01 +02:00
Christopher Jones
d59d8c9dc6 Ensure an ORDER BY gets the expected row order 2016-05-02 16:08:48 +10:00
Anatol Belski
770a6d1342 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test if unlink fails occasionally
  fix dir separator in test
 2016-05-01 19:27:13 +02:00
Anatol Belski
5360b3de33 fix test if unlink fails occasionally 2016-05-01 19:25:39 +02:00
Nikita Popov
359af7c64b Merge branch 'PHP-7.0' 2016-05-01 13:07:13 +02:00
Nikita Popov
8e855534b7 Fix posix build 2016-05-01 13:07:01 +02:00
Xinchen Hui
6151151036 Merge branch 'PHP-7.0' 2016-05-01 11:04:48 +08:00
Xinchen Hui
895337ddbd Fixed bug #72133 (php_posix_group_to_array crashes if gr_passwd is NULL) 2016-05-01 11:00:41 +08:00
Anatol Belski
71df61adad fix test 2016-04-30 21:15:57 +02:00
Nikita Popov
0615c59a4f Mark all $php_errormsg as refs to inhibit optimization 2016-04-30 12:34:01 +02:00
Sara Golemon
bdfa6aeebb Merge branch 'PHP-7.0' 
* PHP-7.0:
  Create temporary sqlite db in test dir rather than cwd (and clean it up)
 2016-04-30 06:05:18 +00:00
Sara Golemon
d0b952260e Create temporary sqlite db in test dir rather than cwd (and clean it up) 
Well behaved tests do not leave their droppings all over the filesystem.
 2016-04-30 06:02:01 +00:00
Nikita Popov
5595dd5ffa Revert code to use DUP instead of COPY 
In a1c405e0c5 next to the actual fix
I have also switched some (effective) ZVAL_DUPs to ZVAL_COPYs. I'm
reverting this part as those were probably there for a reason
(presumably issues with non-atomic refcounting on ZTS).
 2016-04-29 22:02:31 +02:00
Anatol Belski
2c5704bdc2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test
  Expose some of the new curl constants to PHP userspace
 2016-04-29 14:31:49 +02:00
Anatol Belski
8c74f03c10 fix test 2016-04-29 14:30:19 +02:00
Pierrick Charron
3c92f113e4 Expose some of the new curl constants to PHP userspace 2016-04-29 14:19:55 +02:00
Nikita Popov
a1c405e0c5 Fix usages of zend_update_constant_ex 
If an in-place update in an external zval is performed, it needs
to incref'd beforehand, not afterwards.
 2016-04-29 14:06:39 +02:00
Joe Watkins
3aaf90df49 Merge branch 'master' of https://github.com/php/php-src 2016-04-29 12:26:18 +01:00
Joe Watkins
66fc5a3436 Implement #51879 stream context socket option tcp_nodelay 2016-04-29 12:11:58 +01:00
Dmitry Stogov
0091d81668 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  fix constants availability
  fix size_t signed comparison
 2016-04-29 13:13:59 +03:00
Anatol Belski
9db8cefa3c fix constants availability 
The issue here is that winsock2 defines IP protocols as an enum,
so the preprocessor won't catch it. However all the items related
are available as of winxp (see ws2def.h), so it's safe just to have.
 2016-04-29 11:37:19 +02:00
Dmitry Stogov
e2340a17bd Merge branch 'PHP-7.0' 
* PHP-7.0:
  Simplified condition
 2016-04-29 12:34:09 +03:00
Dmitry Stogov
37f7c71f3e Simplified condition 2016-04-29 12:33:54 +03:00