Attachment 173643 Details for Bug 211822 – patch

[patch] patch

devel_pecl-http1.patch (text/plain), 2.21 KB, created by Gasol Wu on 2016-08-14 01:37:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gasol Wu

Created: 2016-08-14 01:37:25 UTC

Size: 2.21 KB

patch

obsolete

>diff -ruN /usr/ports/www/pecl-http1/Makefile ./Makefile
>--- /usr/ports/www/pecl-http1/Makefile	2016-08-03 20:47:05.000000000 +0800
>+++ ./Makefile	2016-08-14 08:30:19.394113000 +0800
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	http
> PORTVERSION=	1.7.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://pecl.php.net/get/
> PKGNAMEPREFIX=	pecl-
>@@ -19,7 +19,7 @@
> 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 \
>diff -ruN /usr/ports/www/pecl-http1/files/patch-http__api.c ./files/patch-http__api.c
>--- /usr/ports/www/pecl-http1/files/patch-http__api.c	1970-01-01 08:00:00.000000000 +0800
>+++ ./files/patch-http__api.c	2016-08-14 08:05:32.627273000 +0800
>@@ -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())) {

Actions: View | Diff

Attachments on bug 211822: 173643 | 173644