Browse Source

Fix Apache/ZTS build

migration/unlabaled-1.67.2
Zeev Suraski 25 years ago
parent
commit
12318a2068
  1. 1
      sapi/apache/mod_php4.c
  2. 3
      sapi/apache/sapi_apache.c

1
sapi/apache/mod_php4.c

@ -326,7 +326,6 @@ static void php_apache_request_shutdown(void *dummy)
static int php_apache_sapi_activate(TSRMLS_D)
{
request_rec *r = (request_rec *) SG(server_context);
TSRMLS_FETCH();
/*
* For the Apache module version, this bit of code registers a cleanup

3
sapi/apache/sapi_apache.c

@ -60,10 +60,9 @@
/* {{{ apache_php_module_main
*/
int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC TSRMLS_DC)
int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC)
{
zend_file_handle file_handle;
TSRMLS_FETCH();
if (php_request_startup(TSRMLS_C) == FAILURE) {
return FAILURE;

Loading…
Cancel
Save