sas Tue Sep 2 07:23:58 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/cgi cgi_main.c
Log:
implement get_fd/force_http_10 methods for CGI SAPI
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.45 php-src/sapi/cgi/cgi_main.c:1.190.2.46
--- php-src/sapi/cgi/cgi_main.c:1.190.2.45 Tue Sep 2 07:15:14 2003
+++ php-src/sapi/cgi/cgi_main.c Tue Sep 2 07:23:57 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.190.2.45 2003/09/02 11:15:14 sas Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.46 2003/09/02 11:23:57 sas Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -294,7 +294,7 @@
if(SG(request_info).no_headers == 1) {
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
- /* Check wheater to send RFC2616 style headers compatible with
+ /* Check whether to send RFC 2616 style headers compatible with
* PHP versions 4.2.3 and earlier compatible with web servers
* such as IIS. Default is informal CGI RFC header compatible
* with Apache.
@@ -489,6 +489,16 @@
return SUCCESS;
}
+static int sapi_cgi_get_fd(int *fd TSRMLS_DC)
+{
+ *fd = STDOUT_FILENO;
+ return SUCCESS;
+}
+
+static int sapi_cgi_force_http_10(TSRMLS_D)
+{
+ return SUCCESS;
+}
/* {{{ sapi_module_struct cgi_sapi_module
*/
@@ -524,7 +534,17 @@
sapi_cgi_register_variables, /* register server variables */
sapi_cgi_log_message, /* Log message */
- STANDARD_SAPI_MODULE_PROPERTIES
+ NULL, /* php.ini path
override */
+ NULL, /* block interruptions
*/
+ NULL, /* unblock
interruptions */
+ NULL, /* default post reader
*/
+ NULL, /* treat data */
+ NULL, /* executable location
*/
+
+ 0, /* php.ini
ignore */
+
+ sapi_cgi_get_fd, /* get fd */
+ sapi_cgi_force_http_10, /* force HTTP/1.0 */
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
