svn commit: r420295 - in head/www/pecl-http1: . files

[Pawel Pekala]

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 at FreeBSD.org
+MAINTAINER=	gasol.wu at 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())) {