diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2021-03-15 15:03:32 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2021-03-15 15:03:32 +0300 |
| commit | 99337728edbc38ac979b0f23805dbe74920a6bc2 (patch) | |
| tree | f92e7cd361c46e409cb05cd36207808fef683cab | |
| parent | 4c261a7ff8f2b2af08cc2cdee6828af4a1cf7794 (diff) | |
| download | unit-99337728edbc38ac979b0f23805dbe74920a6bc2.tar.gz unit-99337728edbc38ac979b0f23805dbe74920a6bc2.tar.bz2 | |
Fixed building the PHP 5 module with ZTS, broken by dab8544b5440.
This closes #525 issue on GitHub.
Diffstat (limited to '')
| -rw-r--r-- | docs/changes.xml | 7 | ||||
| -rw-r--r-- | src/nxt_php_sapi.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/changes.xml b/docs/changes.xml index 2f68083d..22adc2dd 100644 --- a/docs/changes.xml +++ b/docs/changes.xml @@ -43,6 +43,13 @@ the Ruby module didn't respect user locale for defaults in the Encoding class. </para> </change> +<change type="bugfix"> +<para> +the PHP 5 module failed to build with thread safety enabled; the bug had +appeared in 1.22.0. +</para> +</change> + </changes> diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c index 369e7f32..8fbe7f65 100644 --- a/src/nxt_php_sapi.c +++ b/src/nxt_php_sapi.c @@ -1041,7 +1041,11 @@ nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r) if (r->authorization_field != NXT_UNIT_NONE_FIELD) { f = r->fields + r->authorization_field; +#ifdef NXT_PHP7 php_handle_auth_data(nxt_unit_sptr_get(&f->value)); +#else + php_handle_auth_data(nxt_unit_sptr_get(&f->value) TSRMLS_CC); +#endif } else { SG(request_info).auth_digest = NULL; |