thetaphi Tue Jan 6 13:46:49 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: the #ifdef was never working. If Sun extends its NSAPI to support
subrequests, much of this code must be rewritten. Because of that it is better
to have a clean start. This commit does not change behaviour.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.15&r2=1.69.2.3.2.16&diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.15
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.16
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.15 Wed Dec 31 11:17:49 2008
+++ php-src/sapi/nsapi/nsapi.c Tue Jan 6 13:46:49 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.15 2008/12/31 11:17:49 sebastian Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.16 2009/01/06 13:46:49 thetaphi Exp $ */
/*
* PHP includes
@@ -225,13 +225,6 @@
*/
static void php_nsapi_init_dynamic_symbols(void)
{
-#if defined(servact_uri2path) && defined(servact_pathchecks) &&
defined(servact_fileinfo) && defined(servact_service)
- /* use functions from nsapi.h if available */
- nsapi_servact_uri2path = &servact_uri2path;
- nsapi_servact_pathchecks = &servact_pathchecks;
- nsapi_servact_fileinfo = &servact_fileinfo;
- nsapi_servact_service = &servact_service;
-#else
/* find address of internal NSAPI functions */
#ifdef PHP_WIN32
register int i;
@@ -265,7 +258,6 @@
nsapi_servact_fileinfo = NULL;
nsapi_servact_service = NULL;
}
-#endif
}
/* }}} */
@@ -302,7 +294,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.3.2.15 $");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.3.2.16 $");
php_info_print_table_row(2, "Server Software", system_version());
php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
(nsapi_servact_service)?((zend_ini_long("zlib.output_compression",
sizeof("zlib.output_compression"), 0))?"not supported with
zlib.output_compression":"enabled"):"not supported on this platform" );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
