Commit adba504ea87 for php.net
commit adba504ea87634b75b3335d8dfc0eec05a1ac037
Author: Giovanni Giacobbi <giovanni@giacobbi.net>
Date: Wed Mar 18 13:24:35 2026 +0100
ext/session: code cleanup - space after control flow keywords
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 73b10fc6d87..9902dacf7a9 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -183,7 +183,7 @@ static void ps_files_open(ps_files *data, /* const */ zend_string *key)
#else
/* Check to make sure that the opened file is not outside of allowable dirs.
This is not 100% safe but it's hard to do something better without O_NOFOLLOW */
- if(PG(open_basedir) && lstat(buf, &sbuf) == 0 && S_ISLNK(sbuf.st_mode) && php_check_open_basedir(buf)) {
+ if (PG(open_basedir) && lstat(buf, &sbuf) == 0 && S_ISLNK(sbuf.st_mode) && php_check_open_basedir(buf)) {
return;
}
data->fd = VCWD_OPEN_MODE(buf, O_CREAT | O_RDWR | O_BINARY, data->filemode);
@@ -258,7 +258,7 @@ static zend_result ps_files_write(ps_files *data, zend_string *key, zend_string
buf = wrote > -1 ? buf + wrote : 0;
to_write = wrote > -1 ? SESS_FILE_BUF_SIZE(ZSTR_LEN(val) - n) : 0;
- } while(wrote > 0);
+ } while (wrote > 0);
}
#else
n = write(data->fd, ZSTR_VAL(val), ZSTR_LEN(val));
@@ -508,7 +508,7 @@ PS_READ_FUNC(files)
buf = read_in > -1 ? buf + read_in : 0;
to_read = read_in > -1 ? SESS_FILE_BUF_SIZE(ZSTR_LEN(*val) - n) : 0;
- } while(read_in > 0);
+ } while (read_in > 0);
}
#else
@@ -684,7 +684,7 @@ PS_CREATE_SID_FUNC(files)
return NULL;
}
}
- } while(!sid);
+ } while (!sid);
return sid;
}
diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
index 8af6dc77068..521e553d54f 100644
--- a/ext/session/mod_mm.c
+++ b/ext/session/mod_mm.c
@@ -464,7 +464,7 @@ PS_CREATE_SID_FUNC(mm)
return NULL;
}
}
- } while(!sid);
+ } while (!sid);
return sid;
}
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index 0588d217703..7596c3a3368 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -272,7 +272,7 @@ PHPAPI zend_result php_session_reset_id(void);
} \
} ZEND_HASH_FOREACH_END(); \
zval_ptr_dtor(&_zv); \
-} while(0)
+} while (0)
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(ps)
diff --git a/ext/session/session.c b/ext/session/session.c
index 9ce808ea239..1af2479187d 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -823,12 +823,12 @@ static PHP_INI_MH(OnUpdateSessionDivisor)
static PHP_INI_MH(OnUpdateRfc1867Freq)
{
int tmp = ZEND_ATOL(ZSTR_VAL(new_value));
- if(tmp < 0) {
+ if (tmp < 0) {
php_error_docref(NULL, E_WARNING, "session.upload_progress.freq must be greater than or equal to 0");
return FAILURE;
}
- if(ZSTR_LEN(new_value) > 0 && ZSTR_VAL(new_value)[ZSTR_LEN(new_value)-1] == '%') {
- if(tmp > 100) {
+ if (ZSTR_LEN(new_value) > 0 && ZSTR_VAL(new_value)[ZSTR_LEN(new_value)-1] == '%') {
+ if (tmp > 100) {
php_error_docref(NULL, E_WARNING, "session.upload_progress.freq must be less than or equal to 100%%");
return FAILURE;
}
@@ -2577,7 +2577,7 @@ PHP_FUNCTION(session_start)
zend_argument_value_error(1, "must be of type array with keys as string");
RETURN_THROWS();
}
- switch(Z_TYPE_P(value)) {
+ switch (Z_TYPE_P(value)) {
case IS_STRING:
case IS_TRUE:
case IS_FALSE:
@@ -3071,7 +3071,7 @@ static zend_result php_session_rfc1867_callback(unsigned int event, void *event_
progress = PS(rfc1867_progress);
- switch(event) {
+ switch (event) {
case MULTIPART_EVENT_START: {
const multipart_event_start *data = event_data;
progress = ecalloc(1, sizeof(php_session_rfc1867_progress));