diff options
| author | Andrea Faulds <ajf@ajf.me> | 2016-09-05 22:13:20 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2016-09-05 22:13:20 +0100 |
| commit | cfc83af9780027e97d1d4a17ab5dedb48f6056b1 (patch) | |
| tree | e204a3f6b02779571345fdc04667cf1673529db9 /ext/standard/streamsfuncs.c | |
| parent | b86e15849e4fd3a996921dfef024b6e3999e3748 (diff) | |
| parent | 009ee6e503fd2f354f6eda2b6a74f13344dca3b0 (diff) | |
| download | php-git-cfc83af9780027e97d1d4a17ab5dedb48f6056b1.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/standard/streamsfuncs.c')
| -rw-r--r-- | ext/standard/streamsfuncs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 3ab362f628..5a5d2513c8 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -996,7 +996,7 @@ PHP_FUNCTION(stream_context_set_option) zval *options; #ifndef FAST_ZPP - if (zend_parse_parameters(, ZEND_NUM_ARGS(), "ra", &zcontext, &options) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ra", &zcontext, &options) == FAILURE) { RETURN_FALSE; } #else @@ -1511,7 +1511,7 @@ PHP_FUNCTION(stream_socket_enable_crypto) zend_bool enable, cryptokindnull; int ret; -#ifdef FAST_ZPP +#ifndef FAST_ZPP if (zend_parse_parameters(ZEND_NUM_ARGS(), "rb|l!r", &zstream, &enable, &cryptokind, &cryptokindnull, &zsessstream) == FAILURE) { RETURN_FALSE; } |