Skip to content

ext/session: Various refactorings #19041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 6, 2025
+114 −125
Merged

ext/session: Various refactorings #19041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3bf0ded
ext/session: convert some globals to zend_string
Girgias Jul 5, 2025
d7eec41
ext/session: copy zstr instead of initializing a new one
Girgias Jul 5, 2025
aae8ba5
ext/session: Concert save_path to zstr
Girgias Jul 5, 2025
6818933
ext/session: Use smart_str_append when possible
Girgias Jul 5, 2025
0623aa2
ext/session: Use ZEND_STRL()
Girgias Jul 5, 2025
0cc6496
ext/session: Use is_numeric_str helper
Girgias Jul 5, 2025
e856173
ext/session: convert global session_name to zstr
Girgias Jul 5, 2025
756a34d
ext/session: Use zend_string for some session globals
Girgias Jul 5, 2025
52669d9
ext/session: Initialize variable with default value
Girgias Jul 5, 2025
6f4acab
ext/session: Minor code cleanups
Girgias Jul 5, 2025
82c1e8c
ext/session: get rid of sname_len field
Girgias Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions ext/session/php_session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ typedef enum {
} php_session_status;

typedef struct _php_session_rfc1867_progress {
size_t sname_len;
zval sid;
smart_str key;

Expand All @@ -139,15 +138,15 @@ typedef struct _php_session_rfc1867_progress {
} php_session_rfc1867_progress;

typedef struct _php_ps_globals {
char *save_path;
char *session_name;
zend_string *save_path;
zend_string *session_name;
zend_string *id;
char *extern_referer_chk;
char *cache_limiter;
zend_string *cache_limiter;
zend_long cookie_lifetime;
char *cookie_path;
char *cookie_domain;
char *cookie_samesite;
zend_string *cookie_path;
zend_string *cookie_domain;
zend_string *cookie_samesite;
bool cookie_secure;
bool cookie_httponly;
const ps_module *mod;
Expand Down Expand Up @@ -191,8 +190,8 @@ typedef struct _php_ps_globals {
zend_long sid_bits_per_character;

php_session_rfc1867_progress *rfc1867_progress;
char *rfc1867_prefix; /* session.upload_progress.prefix */
char *rfc1867_name; /* session.upload_progress.name */
zend_string *rfc1867_prefix; /* session.upload_progress.prefix */
zend_string *rfc1867_name; /* session.upload_progress.name */
zend_long rfc1867_freq; /* session.upload_progress.freq */
double rfc1867_min_freq; /* session.upload_progress.min_freq */
bool rfc1867_enabled; /* session.upload_progress.enabled */
Expand Down
Loading