From: Joe Orton <jorton@php.net>
Date: Mon, 17 Jan 2005 12:35:28 +0000 (+0000)
Subject: MFH - Fixed bug #31519: Set r->status_line to SAPI-provided status-line.
X-Git-Tag: php-5.0.4RC1~336
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b02e734f150ef5ad70787168fc233d6d0ca014d5;p=php

MFH - Fixed bug #31519: Set r->status_line to SAPI-provided status-line.
---

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index fa91288f95..c689c30735 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -121,9 +121,17 @@ static int
 php_apache_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
 {
 	php_struct *ctx = SG(server_context);
+	const char *sline = SG(sapi_headers).http_status_line;
 
 	ctx->r->status = SG(sapi_headers).http_response_code;
 
+	/* httpd requires that r->status_line is set to the first digit of
+	 * the status-code: */
+	if (sline && strlen(sline) > 12 && strncmp(sline, "HTTP/1.", 7) == 0 
+		&& sline[8] == ' ') {
+		ctx->r->status_line = apr_pstrdup(ctx->r->pool, sline + 9);
+	}
+
 	return SAPI_HEADER_SENT_SUCCESSFULLY;
 }