Fix bad merge

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 97ffe694535f0e6ac53d0f92389b681cd54a5464..4804e49338b8d5a114d14ff92b04e0eb10f42c6c 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -344,7 +344,7 @@ PHP_FUNCTION(flock)
        php_stream *stream;
        zend_long operation = 0;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &res, &operation, &wouldblock) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z/", &res, &operation, &wouldblock) == FAILURE) {
                return;
        }
 
@@ -1207,8 +1207,10 @@ PHPAPI PHP_FUNCTION(fwrite)
 
        if (ZEND_NUM_ARGS() == 2) {
                num_bytes = inputlen;
+       } else if (maxlen <= 0) {
+               num_bytes = 0;
        } else {
-               num_bytes = MAX(0, MIN((size_t) maxlen, inputlen));
+               num_bytes = MIN((size_t) maxlen, inputlen);
        }
 
        if (!num_bytes) {