diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
| commit | 45d2df5f119d17804ccf6068cbe1132e118579b2 (patch) | |
| tree | e3014245763e4290de480fad0b1142728314b965 /sapi/apache2handler/sapi_apache2.c | |
| parent | b33060af82c648bb3971de9d8fe67e52781cbd7a (diff) | |
| parent | e5ded6e843fc43dde4b6c65405a1d3e2ae026eb4 (diff) | |
| download | php-git-broken-5.6-20140206.tar.gz | |
Merge branch 'datibbaw/pow-operator' into PHP-5.6broken-5.6-20140206
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index d2b3a327ff..37d862f889 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -287,11 +287,10 @@ php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC) } static void -php_apache_sapi_flush(void *server_context) +php_apache_sapi_flush(void *server_context TSRMLS_DC) { php_struct *ctx; request_rec *r; - TSRMLS_FETCH(); ctx = server_context; |