diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /sapi/apache/sapi_apache.c | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'sapi/apache/sapi_apache.c')
| -rw-r--r-- | sapi/apache/sapi_apache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 466cf6b8ff..f0c54c59ad 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -25,12 +25,12 @@ /* {{{ apache_php_module_main */ -int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) +int apache_php_module_main(request_rec *r, int display_source_mode) { int retval = OK; zend_file_handle file_handle; - if (php_request_startup(TSRMLS_C) == FAILURE) { + if (php_request_startup() == FAILURE) { return FAILURE; } /* sending a file handle to another dll is not working @@ -40,7 +40,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) zend_syntax_highlighter_ini syntax_highlighter_ini; php_get_highlight_struct(&syntax_highlighter_ini); - if (highlight_file(SG(request_info).path_translated, &syntax_highlighter_ini TSRMLS_CC) != SUCCESS) { + if (highlight_file(SG(request_info).path_translated, &syntax_highlighter_ini) != SUCCESS) { retval = NOT_FOUND; } } else { @@ -50,7 +50,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) file_handle.opened_path = NULL; file_handle.free_filename = 0; - (void) php_execute_script(&file_handle TSRMLS_CC); + (void) php_execute_script(&file_handle); } AP(in_request) = 0; |