thetaphi Fri Oct 31 07:17:45 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/nsapi nsapi.c
Log:
Send correct default content type from php.ini not static text/html (important for
other charsets than iso-8859-1)
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.28.2.21 php-src/sapi/nsapi/nsapi.c:1.28.2.22
--- php-src/sapi/nsapi/nsapi.c:1.28.2.21 Mon Aug 4 08:46:38 2003
+++ php-src/sapi/nsapi/nsapi.c Fri Oct 31 07:17:43 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.28.2.21 2003/08/04 12:46:38 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.28.2.22 2003/10/31 12:17:43 thetaphi Exp $ */
/*
* PHP includes
@@ -208,7 +208,7 @@
NULL,
NULL,
PHP_MINFO(nsapi),
- "$Revision: 1.28.2.21 $",
+ "$Revision: 1.28.2.22 $",
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -511,8 +511,11 @@
* don't know what the implication of doing it there is.
*/
if (SG(sapi_headers).send_default_content_type) {
+ char *hd;
param_free(pblock_remove("content-type", rc->rq->srvhdrs));
- pblock_nvinsert("content-type", "text/html", rc->rq->srvhdrs);
+ hd = sapi_get_default_content_type(TSRMLS_C);
+ pblock_nvinsert("content-type", hd, rc->rq->srvhdrs);
+ efree(hd);
}
protocol_status(rc->sn, rc->rq, SG(sapi_headers).http_response_code, NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
