Commit 37680a3

committed

sapi/apache2: apache env with walk_to_top going to the parent request.

up to now, we walked down the oldest request we can find, now if the current request is a subrequest, we just reach to its parent directly. Previous workflow for setting env affects a possible non main request within those internal redirections.

1 parent 780a828 commit 37680a3Copy full SHA for 37680a3

File tree

1 file changed

-14

lines changed

sapi/apache2handler
- php_functions.c

1 file changed

-14

lines changed

`‎sapi/apache2handler/php_functions.c‎`

Lines changed: 9 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -173,9 +173,7 @@ PHP_FUNCTION(apache_request_headers)`
`173`	`173`	`const apr_array_header_t *arr;`
`174`	`174`	`char key, val;`
`175`	`175`
`176`		`- if (zend_parse_parameters_none() == FAILURE) {`
`177`		`- RETURN_THROWS();`
`178`		`- }`
	`176`	`+ ZEND_PARSE_PARAMETERS_NONE();`
`179`	`177`
`180`	`178`	`array_init(return_value);`
`181`	`179`
`@@ -196,9 +194,7 @@ PHP_FUNCTION(apache_response_headers)`
`196`	`194`	`const apr_array_header_t *arr;`
`197`	`195`	`char key, val;`
`198`	`196`
`199`		`- if (zend_parse_parameters_none() == FAILURE) {`
`200`		`- RETURN_THROWS();`
`201`		`- }`
	`197`	`+ ZEND_PARSE_PARAMETERS_NONE();`
`202`	`198`
`203`	`199`	`array_init(return_value);`
`204`	`200`
`@@ -243,13 +239,13 @@ PHP_FUNCTION(apache_note)`
`243`	`239`
`244`	`240`	`/* {{{ Set an Apache subprocess_env variable */`
`245`	`241`	`/*`
`246`		`- * XXX this doesn't look right. shouldn't it be the parent ?*/`
	`242`	`+ */`
`247`	`243`	`PHP_FUNCTION(apache_setenv)`
`248`	`244`	`{`
`249`	`245`	`php_struct *ctx;`
`250`	`246`	`char variable=NULL, string_val=NULL;`
`251`	`247`	`size_t variable_len, string_val_len;`
`252`		`- bool walk_to_top = 0;`
	`248`	`+ bool walk_to_top = false;`
`253`	`249`	`int arg_count = ZEND_NUM_ARGS();`
`254`	`250`	`request_rec *r;`
`255`	`251`
`@@ -262,8 +258,8 @@ PHP_FUNCTION(apache_setenv)`
`262`	`258`	`r = ctx->r;`
`263`	`259`	`if (arg_count == 3) {`
`264`	`260`	`if (walk_to_top) {`
`265`		`- while(r->prev) {`
`266`		`- r = r->prev;`
	`261`	`+ if(r->main) {`
	`262`	`+ r = r->main;`
`267`	`263`	`}`
`268`	`264`	`}`
`269`	`265`	`}`
`@@ -276,14 +272,13 @@ PHP_FUNCTION(apache_setenv)`
`276`	`272`
`277`	`273`	`/* {{{ Get an Apache subprocess_env variable */`
`278`	`274`	`/*`
`279`		`- * XXX: shouldn't this be the parent not the 'prev'`
`280`	`275`	`*/`
`281`	`276`	`PHP_FUNCTION(apache_getenv)`
`282`	`277`	`{`
`283`	`278`	`php_struct *ctx;`
`284`	`279`	`char *variable;`
`285`	`280`	`size_t variable_len;`
`286`		`- bool walk_to_top = 0;`
	`281`	`+ bool walk_to_top = false;`
`287`	`282`	`int arg_count = ZEND_NUM_ARGS();`
`288`	`283`	`char *env_val=NULL;`
`289`	`284`	`request_rec *r;`
`@@ -297,8 +292,8 @@ PHP_FUNCTION(apache_getenv)`
`297`	`292`	`r = ctx->r;`
`298`	`293`	`if (arg_count == 2) {`
`299`	`294`	`if (walk_to_top) {`
`300`		`- while(r->prev) {`
`301`		`- r = r->prev;`
	`295`	`+ if(r->main) {`
	`296`	`+ r = r->main;`
`302`	`297`	`}`
`303`	`298`	`}`
`304`	`299`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 37680a3

File tree

1 file changed

1 file changed

`‎sapi/apache2handler/php_functions.c‎`

0 commit comments