thetaphi Tue Jan 6 13:45:30 2009 UTC Modified files: /php-src/sapi/nsapi nsapi.c Log: 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.100&r2=1.101&diff_format=u Index: php-src/sapi/nsapi/nsapi.c diff -u php-src/sapi/nsapi/nsapi.c:1.100 php-src/sapi/nsapi/nsapi.c:1.101 --- php-src/sapi/nsapi/nsapi.c:1.100 Wed Dec 31 11:12:40 2008 +++ php-src/sapi/nsapi/nsapi.c Tue Jan 6 13:45:30 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nsapi.c,v 1.100 2008/12/31 11:12:40 sebastian Exp $ */ +/* $Id: nsapi.c,v 1.101 2009/01/06 13:45:30 thetaphi Exp $ */ /* * PHP includes @@ -238,13 +238,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; @@ -278,7 +271,6 @@ nsapi_servact_fileinfo = NULL; nsapi_servact_service = NULL; } -#endif } /* }}} */ @@ -315,7 +307,7 @@ PHP_MINFO_FUNCTION(nsapi) { php_info_print_table_start(); - php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.100 $"); + php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.101 $"); 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