diff options
Diffstat (limited to 'sapi/litespeed/lsapi_main.c')
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 54b7ef9166..05e8a52afe 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -126,7 +126,7 @@ static void sapi_lsapi_ini_defaults(HashTable *configuration_hash) /* {{{ sapi_lsapi_ub_write */ -static int sapi_lsapi_ub_write(const char *str, uint str_length TSRMLS_DC) +static int sapi_lsapi_ub_write(const char *str, uint str_length) { int ret; int remain; @@ -155,7 +155,7 @@ static int sapi_lsapi_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{ sapi_lsapi_flush */ -static void sapi_lsapi_flush( void * server_context TSRMLS_DC ) +static void sapi_lsapi_flush( void * server_context ) { if ( lsapi_mode ) { if ( LSAPI_Flush() == -1) { @@ -168,7 +168,7 @@ static void sapi_lsapi_flush( void * server_context TSRMLS_DC ) /* {{{ sapi_lsapi_deactivate */ -static int sapi_lsapi_deactivate(TSRMLS_D) +static int sapi_lsapi_deactivate(void) { if ( SG(request_info).path_translated ) { @@ -184,7 +184,7 @@ static int sapi_lsapi_deactivate(TSRMLS_D) /* {{{ sapi_lsapi_getenv */ -static char *sapi_lsapi_getenv( char * name, size_t name_len TSRMLS_DC ) +static char *sapi_lsapi_getenv( char * name, size_t name_len ) { if ( lsapi_mode ) { return LSAPI_GetEnv( name ); @@ -209,7 +209,7 @@ static int add_variable( const char * pKey, int keyLen, const char * pValue, int char * new_val = (char *) pValue; unsigned int new_val_len; - if (sapi_module.input_filter(filter_arg, (char *)pKey, &new_val, valLen, &new_val_len TSRMLS_CC)) { + if (sapi_module.input_filter(filter_arg, (char *)pKey, &new_val, valLen, &new_val_len)) { php_register_variable_safe((char *)pKey, new_val, new_val_len, (zval *)arg ); } return 1; @@ -236,7 +236,7 @@ static int add_variable( const char * pKey, int keyLen, const char * pValue, int } */ -static void litespeed_php_import_environment_variables(zval *array_ptr TSRMLS_DC) +static void litespeed_php_import_environment_variables(zval *array_ptr) { char buf[128]; char **env, *p, *t = buf; @@ -295,7 +295,7 @@ static void litespeed_php_import_environment_variables(zval *array_ptr TSRMLS_DC } memcpy(t, *env, nlen); t[nlen] = '\0'; - add_variable(t, nlen, p + 1, strlen( p + 1 ), array_ptr TSRMLS_CC); + add_variable(t, nlen, p + 1, strlen( p + 1 ), array_ptr); } if (t != buf && t != NULL) { efree(t); @@ -327,14 +327,14 @@ static int add_variable_magic_quote( const char * pKey, int keyLen, const char * /* {{{ sapi_lsapi_register_variables */ -static void sapi_lsapi_register_variables(zval *track_vars_array TSRMLS_DC) +static void sapi_lsapi_register_variables(zval *track_vars_array) { char * php_self = ""; if ( lsapi_mode ) { if ( (SG(request_info).request_uri ) ) php_self = (SG(request_info).request_uri ); - litespeed_php_import_environment_variables(track_vars_array TSRMLS_CC); + litespeed_php_import_environment_variables(track_vars_array); #if ((PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4) || PHP_MAJOR_VERSION < 5) if (!PG(magic_quotes_gpc)) { @@ -350,13 +350,13 @@ static void sapi_lsapi_register_variables(zval *track_vars_array TSRMLS_DC) } #endif } else { - php_import_environment_variables(track_vars_array TSRMLS_CC); + php_import_environment_variables(track_vars_array); - php_register_variable("PHP_SELF", php_self, track_vars_array TSRMLS_CC); - php_register_variable("SCRIPT_NAME", php_self, track_vars_array TSRMLS_CC); - php_register_variable("SCRIPT_FILENAME", script_filename, track_vars_array TSRMLS_CC); - php_register_variable("PATH_TRANSLATED", script_filename, track_vars_array TSRMLS_CC); - php_register_variable("DOCUMENT_ROOT", "", track_vars_array TSRMLS_CC); + php_register_variable("PHP_SELF", php_self, track_vars_array); + php_register_variable("SCRIPT_NAME", php_self, track_vars_array); + php_register_variable("SCRIPT_FILENAME", script_filename, track_vars_array); + php_register_variable("PATH_TRANSLATED", script_filename, track_vars_array); + php_register_variable("DOCUMENT_ROOT", "", track_vars_array); } } @@ -365,7 +365,7 @@ static void sapi_lsapi_register_variables(zval *track_vars_array TSRMLS_DC) /* {{{ sapi_lsapi_read_post */ -static int sapi_lsapi_read_post(char *buffer, uint count_bytes TSRMLS_DC) +static int sapi_lsapi_read_post(char *buffer, uint count_bytes) { if ( lsapi_mode ) { return LSAPI_ReadReqBody( buffer, (unsigned long long)count_bytes ); @@ -380,7 +380,7 @@ static int sapi_lsapi_read_post(char *buffer, uint count_bytes TSRMLS_DC) /* {{{ sapi_lsapi_read_cookies */ -static char *sapi_lsapi_read_cookies(TSRMLS_D) +static char *sapi_lsapi_read_cookies(void) { if ( lsapi_mode ) { return LSAPI_GetHeader( H_COOKIE ); @@ -393,7 +393,7 @@ static char *sapi_lsapi_read_cookies(TSRMLS_D) /* {{{ sapi_lsapi_send_headers */ -static int sapi_lsapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) +static int sapi_lsapi_send_headers(sapi_headers_struct *sapi_headers) { sapi_header_struct *h; zend_llist_position pos; @@ -412,7 +412,7 @@ static int sapi_lsapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) int len; char headerBuf[SAPI_LSAPI_MAX_HEADER_LENGTH]; - hd = sapi_get_default_content_type(TSRMLS_C); + hd = sapi_get_default_content_type(); len = snprintf( headerBuf, SAPI_LSAPI_MAX_HEADER_LENGTH - 1, "Content-type: %s", hd ); efree(hd); @@ -430,7 +430,7 @@ static int sapi_lsapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) /* {{{ sapi_lsapi_send_headers */ -static void sapi_lsapi_log_message(char *message TSRMLS_DC) +static void sapi_lsapi_log_message(char *message) { char buf[8192]; int len = strlen( message ); @@ -489,7 +489,7 @@ static sapi_module_struct lsapi_sapi_module = }; /* }}} */ -static int init_request_info( TSRMLS_D ) +static int init_request_info( void ) { char * pContentType = LSAPI_GetHeader( H_CONTENT_TYPE ); char * pAuth; @@ -505,7 +505,7 @@ static int init_request_info( TSRMLS_D ) SG(sapi_headers).http_response_code = 200; pAuth = LSAPI_GetHeader( H_AUTHORIZATION ); - php_handle_auth_data(pAuth TSRMLS_CC); + php_handle_auth_data(pAuth); } static char s_cur_chdir[4096] = ""; @@ -564,7 +564,7 @@ static int lsapi_fopen_primary_script( zend_file_handle * file_handle ) return 0; } -static int lsapi_execute_script( zend_file_handle * file_handle TSRMLS_DC) +static int lsapi_execute_script( zend_file_handle * file_handle) { char *p; int len; @@ -583,26 +583,26 @@ static int lsapi_execute_script( zend_file_handle * file_handle TSRMLS_DC) len = 0; memccpy( p, SG(request_info).path_translated + len, 0, 46 ); - php_execute_script(file_handle TSRMLS_CC); + php_execute_script(file_handle); return 0; } -static int lsapi_module_main(int show_source TSRMLS_DC) +static int lsapi_module_main(int show_source) { zend_file_handle file_handle = {0}; - if (php_request_startup(TSRMLS_C) == FAILURE ) { + if (php_request_startup() == FAILURE ) { return -1; } if (show_source) { zend_syntax_highlighter_ini syntax_highlighter_ini; php_get_highlight_struct(&syntax_highlighter_ini); - highlight_file(SG(request_info).path_translated, &syntax_highlighter_ini TSRMLS_CC); + highlight_file(SG(request_info).path_translated, &syntax_highlighter_ini); } else { - lsapi_execute_script( &file_handle TSRMLS_CC); + lsapi_execute_script( &file_handle); } zend_try { php_request_shutdown(NULL); @@ -658,7 +658,7 @@ static void override_ini() } -static int processReq( TSRMLS_D ) +static int processReq( void ) { int ret = 0; zend_first_try { @@ -670,9 +670,9 @@ static int processReq( TSRMLS_D ) override_ini(); if ( engine ) { - init_request_info( TSRMLS_C ); + init_request_info( ); - if ( lsapi_module_main( source_highlight TSRMLS_CC ) == -1 ) { + if ( lsapi_module_main( source_highlight ) == -1 ) { ret = -1; } } else { @@ -684,7 +684,7 @@ static int processReq( TSRMLS_D ) return ret; } -static void cli_usage( TSRMLS_D ) +static void cli_usage( void ) { static const char * usage = "Usage: php\n" @@ -705,12 +705,12 @@ static void cli_usage( TSRMLS_D ) "\n" " args... Arguments passed to script.\n"; php_output_startup(); - php_output_activate(TSRMLS_C); + php_output_activate(); php_printf( "%s", usage ); #ifdef PHP_OUTPUT_NEWAPI - php_output_end_all(TSRMLS_C); + php_output_end_all(); #else - php_end_ob_buffers(1 TSRMLS_CC); + php_end_ob_buffers(1); #endif } @@ -826,28 +826,28 @@ static int cli_main( int argc, char * argv[] ) case 'q': break; case 'i': - if (php_request_startup(TSRMLS_C) != FAILURE) { - php_print_info(0xFFFFFFFF TSRMLS_CC); + if (php_request_startup() != FAILURE) { + php_print_info(0xFFFFFFFF); #ifdef PHP_OUTPUT_NEWAPI - php_output_end_all(TSRMLS_C); + php_output_end_all(); #else - php_end_ob_buffers(1 TSRMLS_CC); + php_end_ob_buffers(1); #endif php_request_shutdown( NULL ); ret = 0; } break; case 'v': - if (php_request_startup(TSRMLS_C) != FAILURE) { + if (php_request_startup() != FAILURE) { #if ZEND_DEBUG php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #else php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #endif #ifdef PHP_OUTPUT_NEWAPI - php_output_end_all(TSRMLS_C); + php_output_end_all(); #else - php_end_ob_buffers(1 TSRMLS_CC); + php_end_ob_buffers(1); #endif php_request_shutdown( NULL ); ret = 0; @@ -864,7 +864,7 @@ static int cli_main( int argc, char * argv[] ) case 'h': case '?': default: - cli_usage(TSRMLS_C); + cli_usage(); ret = 0; break; @@ -885,7 +885,7 @@ static int cli_main( int argc, char * argv[] ) SG(request_info).argc = argc - (p - argv); SG(request_info).argv = p; - if (php_request_startup(TSRMLS_C) == FAILURE ) { + if (php_request_startup() == FAILURE ) { fclose( file_handle.handle.fp ); ret = 2; } else { @@ -893,12 +893,12 @@ static int cli_main( int argc, char * argv[] ) zend_syntax_highlighter_ini syntax_highlighter_ini; php_get_highlight_struct(&syntax_highlighter_ini); - highlight_file(SG(request_info).path_translated, &syntax_highlighter_ini TSRMLS_CC); + highlight_file(SG(request_info).path_translated, &syntax_highlighter_ini); } else if (source_highlight == 2) { file_handle.filename = *p; file_handle.free_filename = 0; file_handle.opened_path = NULL; - ret = php_lint_script(&file_handle TSRMLS_CC); + ret = php_lint_script(&file_handle); if (ret==SUCCESS) { zend_printf("No syntax errors detected in %s\n", file_handle.filename); } else { @@ -910,7 +910,7 @@ static int cli_main( int argc, char * argv[] ) file_handle.free_filename = 0; file_handle.opened_path = NULL; - php_execute_script(&file_handle TSRMLS_CC); + php_execute_script(&file_handle); ret = EG(exit_status); } @@ -920,13 +920,13 @@ static int cli_main( int argc, char * argv[] ) php_printf("Could not open input file: %s.\n", *p); } } else { - cli_usage(TSRMLS_C); + cli_usage(); } } }zend_end_try(); - php_module_shutdown(TSRMLS_C); + php_module_shutdown(); #ifdef ZTS tsrm_shutdown(); @@ -1115,7 +1115,7 @@ int main( int argc, char * argv[] ) if ( slow_script_msec ) { gettimeofday( &tv_req_begin, NULL ); } - ret = processReq(TSRMLS_C); + ret = processReq(); if ( slow_script_msec ) { gettimeofday( &tv_req_end, NULL ); n = ((long) tv_req_end.tv_sec - tv_req_begin.tv_sec ) * 1000 @@ -1135,7 +1135,7 @@ int main( int argc, char * argv[] ) break; } } - php_module_shutdown(TSRMLS_C); + php_module_shutdown(); #ifdef ZTS tsrm_shutdown(); |