diff options
| author | Sean Finney <seanius@debian.org> | 2010-02-07 22:19:53 +0100 |
|---|---|---|
| committer | Sean Finney <seanius@debian.org> | 2010-02-07 22:27:07 +0100 |
| commit | c852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (patch) | |
| tree | 91f01b0d06916c78262404096bfd466b8e95e5b5 /sapi/isapi/php5isapi.c | |
| parent | 176cbd0bc99e20bb21f92f0b72df728eafc1e2ce (diff) | |
| parent | 0fab6db7cac8d2be99579dd049f812a8ff98e74f (diff) | |
| download | php-c852c28a88fccf6e34a2cb091fdfa72bce2b59c7.tar.gz | |
Merge branch 'upstream-experimental' into upstream-sid
Diffstat (limited to 'sapi/isapi/php5isapi.c')
| -rw-r--r-- | sapi/isapi/php5isapi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sapi/isapi/php5isapi.c b/sapi/isapi/php5isapi.c index 8a490b4d3..0f44efe4a 100644 --- a/sapi/isapi/php5isapi.c +++ b/sapi/isapi/php5isapi.c @@ -16,7 +16,7 @@ | Ben Mansell <ben@zeus.com> (Zeus Support) | +----------------------------------------------------------------------+ */ -/* $Id: php5isapi.c 272374 2008-12-31 11:17:49Z sebastian $ */ +/* $Id: php5isapi.c 278022 2009-03-30 14:24:16Z kalle $ */ #include "php.h" #include <httpext.h> @@ -215,7 +215,7 @@ static int sapi_isapi_ub_write(const char *str, uint str_length TSRMLS_DC) } -static int sapi_isapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC) +static int sapi_isapi_header_handler(sapi_header_struct *sapi_header, sapi_header_op_enum op, sapi_headers_struct *sapi_headers TSRMLS_DC) { return SAPI_HEADER_ADD; } @@ -688,6 +688,7 @@ static sapi_module_struct isapi_sapi_module = { sapi_isapi_register_server_variables, /* register server variables */ NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; |