gschlossnagle Mon Oct 7 22:17:02 2002 EDT Modified files: (Branch: apache_hooks) /php4/sapi/apache mod_php4.c php_apache.c Log: sync with head. add optional content type param to send_http_header Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.120.2.9 php4/sapi/apache/mod_php4.c:1.120.2.10 --- php4/sapi/apache/mod_php4.c:1.120.2.9 Fri Aug 30 15:12:28 2002 +++ php4/sapi/apache/mod_php4.c Mon Oct 7 22:17:02 2002 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.120.2.9 2002/08/30 19:12:28 gschlossnagle Exp $ */ +/* $Id: mod_php4.c,v 1.120.2.10 2002/10/08 02:17:02 gschlossnagle Exp $ */ #include "php_apache_http.h" @@ -410,8 +410,7 @@ */ static int php_apache_startup(sapi_module_struct *sapi_module) { - if (php_module_startup(sapi_module) == FAILURE - || zend_startup_module(&apache_module_entry) == FAILURE) { + if (php_module_startup(sapi_module, &apache_module_entry, 1) == FAILURE) { return FAILURE; } else { return SUCCESS; Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.45.4.6 php4/sapi/apache/php_apache.c:1.45.4.7 --- php4/sapi/apache/php_apache.c:1.45.4.6 Wed Aug 28 17:23:12 2002 +++ php4/sapi/apache/php_apache.c Mon Oct 7 22:17:02 2002 @@ -17,7 +17,7 @@ | David Sklar <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.45.4.6 2002/08/28 21:23:12 gschlossnagle Exp $ */ +/* $Id: php_apache.c,v 1.45.4.7 2002/10/08 02:17:02 gschlossnagle Exp $ */ #include "php_apache_http.h" @@ -958,8 +958,15 @@ { zval *id; request_rec *r; + char *type = NULL; + int typelen; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &type, &typelen) == +FAILURE) + return; APREQ_GET_REQUEST(id, r); + if(type) { + r->content_type = pstrdup(r->pool, type); + } ap_send_http_header(r); AP(headers_sent) = 1; RETURN_TRUE; @@ -1324,6 +1331,7 @@ #undef some_auth_required #undef update_mtime #undef send_http_header +#undef send_header_field #undef basic_http_header #undef send_http_trace #undef send_http_options
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php