com php-src: Fix wrong merge: ext/dom/document.c ext/gd/gd.c

From: Date: Wed, 10 Jun 2015 12:23:10 +0000
Subject: com php-src: Fix wrong merge: ext/dom/document.c ext/gd/gd.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87188@lists.php.net to get a copy of this message
Commit: db2617fae89782c528a96e95d01404dfdbdf059b Author: Julien Pauli <jpauli@php.net> Wed, 10 Jun 2015 14:15:14 +0200 Parents: bf72e139010bc308fceb6efbc0ee3b104f1312db Branches: PHP-5.5.26 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=db2617fae89782c528a96e95d01404dfdbdf059b Log: Fix wrong merge Changed paths: M ext/dom/document.c M ext/gd/gd.c Diff: diff --git a/ext/dom/document.c b/ext/dom/document.c index a66450d..d82ca92 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -1991,7 +1991,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { return; } diff --git a/ext/gd/gd.c b/ext/gd/gd.c index dd4a9ef..f7c45ec 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -4444,13 +4444,8 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type ) int int_threshold; int x, y; float x_ratio, y_ratio; - long ignore_warning; -<<<<<<< HEAD - -======= -#endif + long ignore_warning; ->>>>>>> f7d7bef... Fix #69719 - more checks for nulls in paths if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "pplll", &f_org, &f_org_len, &f_dest, &f_dest_len, &height, &width, &threshold) == FAILURE) { return; }

« previous php.cvs (#87188) next »