From owner-svn-ports-head@freebsd.org Tue Aug 16 17:34:59 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6FEEEBBC0B7; Tue, 16 Aug 2016 17:34:59 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2EFA213DF; Tue, 16 Aug 2016 17:34:59 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7GHYwW7093913; Tue, 16 Aug 2016 17:34:58 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7GHYw7A093911; Tue, 16 Aug 2016 17:34:58 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201608161734.u7GHYw7A093911@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Tue, 16 Aug 2016 17:34:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420295 - in head/www/pecl-http1: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Aug 2016 17:34:59 -0000 Author: pawel Date: Tue Aug 16 17:34:58 2016 New Revision: 420295 URL: https://svnweb.freebsd.org/changeset/ports/420295 Log: - Fix build with PHP 5.6 - Take maintainership PR: 211822 Submitted by: Gasol Wu Added: head/www/pecl-http1/files/ head/www/pecl-http1/files/patch-http__api.c (contents, props changed) Modified: head/www/pecl-http1/Makefile Modified: head/www/pecl-http1/Makefile ============================================================================== --- head/www/pecl-http1/Makefile Tue Aug 16 17:33:56 2016 (r420294) +++ head/www/pecl-http1/Makefile Tue Aug 16 17:34:58 2016 (r420295) @@ -10,7 +10,7 @@ PKGNAMEPREFIX= pecl- PKGNAMESUFFIX= 1 DISTNAME= pecl_http-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= gasol.wu@gmail.com COMMENT= Extended HTTP Support LICENSE= BSD2CLAUSE @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcurl.so:ftp/curl USES= php:ext tar:tgz -IGNORE_WITH_PHP= 56 70 +IGNORE_WITH_PHP= 70 CONFLICTS= pecl-http-* CONFIGURE_ARGS+= --with-http-curl-requests \ Added: head/www/pecl-http1/files/patch-http__api.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/pecl-http1/files/patch-http__api.c Tue Aug 16 17:34:58 2016 (r420295) @@ -0,0 +1,46 @@ +--- http_api.c.orig 2016-07-19 07:12:32 UTC ++++ http_api.c +@@ -349,6 +349,7 @@ PHP_HTTP_API STATUS _http_get_request_bo + *length = 0; + *body = NULL; + ++#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 6) + if (SG(request_info).raw_post_data) { + *length = SG(request_info).raw_post_data_length; + *body = SG(request_info).raw_post_data; +@@ -357,7 +358,9 @@ PHP_HTTP_API STATUS _http_get_request_bo + *body = estrndup(*body, *length); + } + return SUCCESS; +- } else if (sapi_module.read_post && !HTTP_G->read_post_data) { ++ } ++#endif ++ if (sapi_module.read_post && !HTTP_G->read_post_data) { + char *buf = emalloc(4096); + int len; + +@@ -382,8 +385,10 @@ PHP_HTTP_API STATUS _http_get_request_bo + return FAILURE; + } + ++#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 6) + SG(request_info).raw_post_data = *body; + SG(request_info).raw_post_data_length = *length; ++#endif + + if (dup) { + *body = estrndup(*body, *length); +@@ -400,9 +405,13 @@ PHP_HTTP_API php_stream *_http_get_reque + { + php_stream *s = NULL; + ++#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 6) + if (SG(request_info).raw_post_data) { + s = php_stream_open_wrapper("php://input", "rb", 0, NULL); + } else if (sapi_module.read_post && !HTTP_G->read_post_data) { ++#else ++ if (sapi_module.read_post && !HTTP_G->read_post_data) { ++#endif + HTTP_G->read_post_data = 1; + + if ((s = php_stream_temp_new())) {