diff options
| author | Ondřej Surý <ondrej@sury.org> | 2010-10-21 08:52:46 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2010-10-21 08:52:46 +0200 |
| commit | 01fcdff3849c3691d9aaeaab735846ab6d8895ca (patch) | |
| tree | 6460876d356113fa7053df36f2aa00baa7db24a9 /sapi/litespeed | |
| parent | 855a09f4eded707941180c9d90acd17c25e29447 (diff) | |
| download | php-01fcdff3849c3691d9aaeaab735846ab6d8895ca.tar.gz | |
Imported Upstream version 5.3.3upstream/5.3.3
Diffstat (limited to 'sapi/litespeed')
| -rw-r--r-- | sapi/litespeed/config.m4 | 3 | ||||
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 17 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sapi/litespeed/config.m4 b/sapi/litespeed/config.m4 index b4f3caa30..3a54bb05e 100644 --- a/sapi/litespeed/config.m4 +++ b/sapi/litespeed/config.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4 264419 2008-08-07 19:32:15Z nlopess $ +dnl $Id: config.m4 301063 2010-07-07 20:03:04Z gwang $ dnl AC_MSG_CHECKING(for LiteSpeed support) @@ -12,6 +12,7 @@ if test "$PHP_LITESPEED" != "no"; then SAPI_LITESPEED_PATH=sapi/litespeed/php PHP_SUBST(SAPI_LITESPEED_PATH) PHP_SELECT_SAPI(litespeed, program, lsapi_main.c lsapilib.c, "", '$(SAPI_LITESPEED_PATH)') + INSTALL_IT="@echo \"Installing PHP LiteSpeed into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_LITESPEED_PATH) \$(INSTALL_ROOT)\$(bindir)/lsphp" case $host_alias in *darwin*) BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index aed599e11..6058e5b60 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: lsapi_main.c 265533 2008-08-26 22:05:17Z gwang $ */ +/* $Id: lsapi_main.c 300764 2010-06-26 16:03:39Z felipe $ */ #include "php.h" #include "SAPI.h" @@ -787,7 +787,10 @@ int main( int argc, char * argv[] ) /* LiteSpeed PHP module starts here */ - +/* {{{ arginfo */ +ZEND_BEGIN_ARG_INFO(arginfo_litespeed__void, 0) +ZEND_END_ARG_INFO() +/* }}} */ PHP_FUNCTION(litespeed_request_headers); PHP_FUNCTION(litespeed_response_headers); @@ -795,11 +798,11 @@ PHP_FUNCTION(litespeed_response_headers); PHP_MINFO_FUNCTION(litespeed); zend_function_entry litespeed_functions[] = { - PHP_FE(litespeed_request_headers, NULL) - PHP_FE(litespeed_response_headers, NULL) - PHP_FALIAS(getallheaders, litespeed_request_headers, NULL) - PHP_FALIAS(apache_request_headers, litespeed_request_headers, NULL) - PHP_FALIAS(apache_response_headers, litespeed_response_headers, NULL) + PHP_FE(litespeed_request_headers, arginfo_litespeed__void) + PHP_FE(litespeed_response_headers, arginfo_litespeed__void) + PHP_FALIAS(getallheaders, litespeed_request_headers, arginfo_litespeed__void) + PHP_FALIAS(apache_request_headers, litespeed_request_headers, arginfo_litespeed__void) + PHP_FALIAS(apache_response_headers, litespeed_response_headers, arginfo_litespeed__void) {NULL, NULL, NULL} }; |