diff options
| author | Andrew Clayton <a.clayton@nginx.com> | 2023-01-27 14:16:56 +0000 |
|---|---|---|
| committer | Andrew Clayton <a.clayton@nginx.com> | 2023-01-27 14:46:28 +0000 |
| commit | 3923de987efa79645b3e30a55adca4375e0843e2 (patch) | |
| tree | 64bb2c68e4c87b518319125536fa0c4c9ed1b497 | |
| parent | 0686740f2053abf2b398c6620bb2e74090209fc6 (diff) | |
| download | unit-3923de987efa79645b3e30a55adca4375e0843e2.tar.gz unit-3923de987efa79645b3e30a55adca4375e0843e2.tar.bz2 | |
PHP: Make use of zend_stream_init_filename().
Where possible make use of the zend_stream_init_filename() function
introduced in PHP 7.4.
This is essentially a preparatory patch for switching to using an
already opened file-pointer in nxt_php_execute(). While wrapping this
new code in a PHP version check with a fallback to our own function is
perhaps slightly overkill, it does reduce the diff of the commit that
switches to a FILE *.
Reviewed-by: Alejandro Colomar <alx@nginx.com>
Cc: Andrei Zeliankou <zelenkov@nginx.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
| -rw-r--r-- | src/nxt_php_sapi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c index 0358ebdf..0445533e 100644 --- a/src/nxt_php_sapi.c +++ b/src/nxt_php_sapi.c @@ -106,8 +106,10 @@ static nxt_int_t nxt_php_do_301(nxt_unit_request_info_t *req); static void nxt_php_request_handler(nxt_unit_request_info_t *req); static void nxt_php_dynamic_request(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r); +#if (PHP_VERSION_ID < 70400) static void nxt_zend_stream_init_filename(zend_file_handle *handle, const char *filename); +#endif static void nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r); nxt_inline void nxt_php_vcwd_chdir(nxt_unit_request_info_t *req, u_char *dir); @@ -1111,19 +1113,17 @@ nxt_php_dynamic_request(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r) } +#if (PHP_VERSION_ID < 70400) static void nxt_zend_stream_init_filename(zend_file_handle *handle, const char *filename) { nxt_memzero(handle, sizeof(zend_file_handle)); - handle->type = ZEND_HANDLE_FILENAME; -#if (PHP_VERSION_ID >= 80100) - handle->filename = zend_string_init(filename, strlen(filename), 0); - handle->primary_script = 1; -#else handle->filename = filename; -#endif } +#else +#define nxt_zend_stream_init_filename zend_stream_init_filename +#endif static void |