technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PHP: Simplify ctx->script_filename.start in nxt_php_execute().

Browse Source 
Create a const char *filename variable to hold
ctx->script_filename.start, which is a much more manageable name and
will negate the need for any more casting in the following commit when
we switch to using a FILE * instead of a filename in
php_execute_script().

Reviewed-by: Alejandro Colomar <alx@nginx.com>
Cc: Andrei Zeliankou <zelenkov@nginx.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This commit is contained in:
Andrew Clayton
2023-01-25 21:46:01 +00:00
parent 3923de987e
commit fafdb7a57a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nxt_php_sapi.c
View File

@@ -1132,11 +1132,13 @@ nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r)
#if (PHP_VERSION_ID < 50600) #if (PHP_VERSION_ID < 50600)
void *read_post; void *read_post;
#endif #endif
const char *filename;
nxt_unit_field_t *f; nxt_unit_field_t *f;
zend_file_handle file_handle; zend_file_handle file_handle;
nxt_unit_req_debug(ctx->req, "PHP execute script %s", filename = (const char *) ctx->script_filename.start;
ctx->script_filename.start);
nxt_unit_req_debug(ctx->req, "PHP execute script %s", filename);
SG(server_context) = ctx; SG(server_context) = ctx;
SG(options) |= SAPI_OPTION_NO_CHDIR; SG(options) |= SAPI_OPTION_NO_CHDIR;
@@ -1196,8 +1198,7 @@ nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r)
nxt_php_vcwd_chdir(ctx->req, ctx->script_dirname.start); nxt_php_vcwd_chdir(ctx->req, ctx->script_dirname.start);
} }
nxt_zend_stream_init_filename(&file_handle, nxt_zend_stream_init_filename(&file_handle, filename);
(const char *) ctx->script_filename.start);
php_execute_script(&file_handle TSRMLS_CC); php_execute_script(&file_handle TSRMLS_CC);