Skip to content

Commit

Permalink
PHP: Simplify ctx->script_filename.start in nxt_php_execute().
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Andrei Zeliankou <[email protected]>
Signed-off-by: Andrew Clayton <[email protected]>
  • Loading branch information
ac000 committed Jan 31, 2023
1 parent d571838 commit 83d8b85
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/nxt_php_sapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1132,11 +1132,13 @@ nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r)
#if (PHP_VERSION_ID < 50600)
void *read_post;
#endif
const char *filename;
nxt_unit_field_t *f;
zend_file_handle file_handle;

nxt_unit_req_debug(ctx->req, "PHP execute script %s",
ctx->script_filename.start);
filename = (const char *) ctx->script_filename.start;

nxt_unit_req_debug(ctx->req, "PHP execute script %s", filename);

SG(server_context) = ctx;
SG(options) |= SAPI_OPTION_NO_CHDIR;
Expand Down Expand Up @@ -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_zend_stream_init_filename(&file_handle,
(const char *) ctx->script_filename.start);
nxt_zend_stream_init_filename(&file_handle, filename);

php_execute_script(&file_handle TSRMLS_CC);

Expand Down

0 comments on commit 83d8b85

Please sign in to comment.