diff options
author | Xinchen Hui <laruence@php.net> | 2012-04-15 01:17:56 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2012-04-15 01:17:56 +0800 |
commit | 579d234f5078fc87b0b21a333a5fdfc60e9df124 (patch) | |
tree | 5a983ed10dfbc0178345b855d720b2d418650aa7 /main/main.c | |
parent | c62a41860e151b3c95ccd05d1ad7d25797219563 (diff) | |
parent | 3b42f184cdcf512fdc1f944052bfa296f17a035f (diff) | |
download | php-git-579d234f5078fc87b0b21a333a5fdfc60e9df124.tar.gz |
Merge branch 'PHP-5.4'
Diffstat (limited to 'main/main.c')
-rw-r--r-- | main/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/main.c b/main/main.c index 6ec8d79c08..feb1e9fe2f 100644 --- a/main/main.c +++ b/main/main.c @@ -1740,22 +1740,22 @@ void php_request_shutdown(void *dummy) } } zend_end_try(); - /* 4. Shutdown output layer (send the set HTTP headers, cleanup output handlers, etc.) */ - zend_try { - php_output_deactivate(TSRMLS_C); - } zend_end_try(); - - /* 5. Reset max_execution_time (no longer executing php code after response sent) */ + /* 4. Reset max_execution_time (no longer executing php code after response sent) */ zend_try { zend_unset_timeout(TSRMLS_C); } zend_end_try(); - /* 6. Call all extensions RSHUTDOWN functions */ + /* 5. Call all extensions RSHUTDOWN functions */ if (PG(modules_activated)) { zend_deactivate_modules(TSRMLS_C); php_free_shutdown_functions(TSRMLS_C); } + /* 6. Shutdown output layer (send the set HTTP headers, cleanup output handlers, etc.) */ + zend_try { + php_output_deactivate(TSRMLS_C); + } zend_end_try(); + /* 7. Destroy super-globals */ zend_try { int i; |