Attachment 84242 Details for Bug 120204 – php5.diff

[patch] php5.diff

php5.diff (text/plain), 1.91 KB, created by Daniel Gerzo on 2008-02-01 13:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Gerzo

Created: 2008-02-01 13:50:00 UTC

Size: 1.91 KB

patch

obsolete

>diff -ruN php5.orig/Makefile php5/Makefile
>--- php5.orig/Makefile	2008-01-29 11:14:36.000000000 +0100
>+++ php5/Makefile	2008-02-01 14:22:36.000000000 +0100
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	php5
> PORTVERSION=	5.2.5
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> CATEGORIES?=	lang devel www
> MASTER_SITES=	${MASTER_SITE_PHP}
> MASTER_SITE_SUBDIR=	distributions
>diff -ruN php5.orig/files/patch-main_SAPI.c php5/files/patch-main_SAPI.c
>--- php5.orig/files/patch-main_SAPI.c	2006-05-06 15:26:47.000000000 +0200
>+++ php5/files/patch-main_SAPI.c	2008-02-01 14:37:27.000000000 +0100
>@@ -1,6 +1,31 @@
>---- main/SAPI.c.orig	Sun Jan  1 13:50:17 2006
>-+++ main/SAPI.c	Wed May  3 09:38:09 2006
>-@@ -602,7 +602,7 @@
>+--- main/SAPI.c.orig	2007-05-25 11:20:01.000000000 +0200
>++++ main/SAPI.c	2008-02-01 14:36:51.000000000 +0100
>+@@ -18,7 +18,7 @@
>+    +----------------------------------------------------------------------+
>+ */
>+ 
>+-/* $Id: SAPI.c,v 1.202.2.7.2.15 2007/05/25 09:20:01 rasmus Exp $ */
>++/* $Id: SAPI.c,v 1.202.2.7.2.16 2007/12/03 16:04:26 dmitry Exp $ */
>+ 
>+ #include <ctype.h>
>+ #include <sys/stat.h>
>+@@ -301,6 +301,7 @@
>+ 
>+ 	/* SG(sapi_headers).http_response_code = 200; */ 
>+ 	SG(sapi_headers).http_status_line = NULL;
>++	SG(sapi_headers).mimetype = NULL;
>+ 	SG(read_post_bytes) = 0;
>+ 	SG(request_info).post_data = NULL;
>+ 	SG(request_info).raw_post_data = NULL;
>+@@ -340,6 +341,7 @@
>+ 	SG(sapi_headers).http_response_code = 200;
>+ 	*/
>+ 	SG(sapi_headers).http_status_line = NULL;
>++	SG(sapi_headers).mimetype = NULL;
>+ 	SG(headers_sent) = 0;
>+ 	SG(read_post_bytes) = 0;
>+ 	SG(request_info).post_data = NULL;
>+@@ -604,7 +606,7 @@
>  					ptr++;
>  					len--;
>  				}
>@@ -9,7 +34,7 @@
>  				if(!strncmp(ptr, "image/", sizeof("image/")-1)) {
>  					zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
>  				}
>-@@ -756,7 +756,7 @@
>+@@ -758,7 +760,7 @@
>  		return SUCCESS;
>  	}

Actions: View | Diff

Attachments on bug 120204: 84242