summaryrefslogtreecommitdiff
path: root/sapi/apache/sapi_apache.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-07-28 11:36:37 +0000
committerZeev Suraski <zeev@php.net>2001-07-28 11:36:37 +0000
commitd87cc976e1156b839fc6d4aa6b473a126802b8e3 (patch)
tree8acb068dd7458e1c8df3a7d8ecb87d065990fdb1 /sapi/apache/sapi_apache.c
parentb4f3b9d3ce9f55cf040fb5aa8f201c64646cab43 (diff)
downloadphp-git-d87cc976e1156b839fc6d4aa6b473a126802b8e3.tar.gz
Redesigned thread safety mechanism - nua nua
Diffstat (limited to 'sapi/apache/sapi_apache.c')
-rw-r--r--sapi/apache/sapi_apache.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 1ad8807f9d..e34f6701f9 100644
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -60,12 +60,12 @@
/* {{{ apache_php_module_main
*/
-int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC TSRMLS_DC PLS_DC SLS_DC)
+int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC TSRMLS_DC)
{
zend_file_handle file_handle;
- APLS_FETCH();
+ TSRMLS_FETCH();
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
return FAILURE;
}
/* sending a file handle to another dll is not working
@@ -88,7 +88,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC TSRMLS
file_handle.opened_path = NULL;
file_handle.free_filename = 0;
- (void) php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ (void) php_execute_script(&file_handle TSRMLS_CC);
}
AP(in_request) = 0;