cvs: php4 /ext/session php_session.h session.c /ext/standard url_scanner_ex.c url_scanner_ex.h url_scanner_ex.re

thies Sun May 5 12:39:49 2002 EDT Modified files: /php4/ext/session php_session.h session.c /php4/ext/standard url_scanner_ex.c url_scanner_ex.h url_scanner_ex.re Log: re-add accidentily nuked session_adapt_url() Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.78 php4/ext/session/php_session.h:1.79 --- php4/ext/session/php_session.h:1.78 Fri May 3 04:00:35 2002 +++ php4/ext/session/php_session.h Sun May 5 12:39:49 2002 @@ -171,6 +171,8 @@ #define PS_SERIALIZER_ENTRY(x) \ { #x, PS_SERIALIZER_ENCODE_NAME(x), PS_SERIALIZER_DECODE_NAME(x) } +PHPAPI void session_adapt_url(const char *, size_t, char **, size_t * TSRMLS_DC); + void php_set_session_var(char *name, size_t namelen, zval *state_val, php_unserialize_data_t *var_hash TSRMLS_DC); int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC); Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.302 php4/ext/session/session.c:1.303 --- php4/ext/session/session.c:1.302 Sat May 4 14:33:12 2002 +++ php4/ext/session/session.c Sun May 5 12:39:49 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.302 2002/05/04 18:33:12 sas Exp $ */ +/* $Id: session.c,v 1.303 2002/05/05 16:39:49 thies Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1375,13 +1375,16 @@ } /* }}} */ +PHPAPI void session_adapt_url(const char *url, size_t urllen, char **new, size_t *newlen TSRMLS_DC) +{ + if (PS(apply_trans_sid) && (PS(session_status) == php_session_active)) { + *new = php_url_scanner_adapt_single_url(url, urllen, PS(session_name), PS(id), newlen TSRMLS_CC); + } +} static void php_rinit_session_globals(TSRMLS_D) { zend_hash_init(&PS(vars), 0, NULL, NULL, 0); -#if I_KNOW_WHAT_THE_PURPOSE_OF_THIS_IS - php_url_scanner_reset_vars(TSRMLS_C); /* save even if we haven't registered */ -#endif PS(id) = NULL; PS(session_status) = php_session_none; PS(mod_data) = NULL; @@ -1461,7 +1464,7 @@ zend_register_auto_global("_SESSION", sizeof("_SESSION")-1 TSRMLS_CC); - PS(module_number) = module_number; + PS(module_number) = module_number; /* if we really need this var we need to init it in zts mode as well! */ REGISTER_INI_ENTRIES(); return SUCCESS; } Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.63 php4/ext/standard/url_scanner_ex.c:1.64 --- php4/ext/standard/url_scanner_ex.c:1.63 Sat May 4 22:07:33 2002 +++ php4/ext/standard/url_scanner_ex.c Sun May 5 12:39:49 2002 @@ -1,5 +1,5 @@ -/* Generated by re2c 0.5 on Sat May 4 21:06:57 2002 */ -#line 1 "/home/sas/src/php4/ext/standard/url_scanner_ex.re" +/* Generated by re2c 0.5 on Sun May 5 18:39:23 2002 */ +#line 1 "/home/thies/devel/php4/ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ | PHP Version 4 | @@ -795,6 +795,28 @@ if (rest) memmove(ctx->buf.c, start, rest); ctx->buf.len = rest; +} + +char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const char *name, const char *value, size_t *newlen TSRMLS_DC) +{ + smart_str surl = {0}; + smart_str buf = {0}; + smart_str url_app = {0}; + + smart_str_setl(&surl, url, urllen); + + smart_str_appends(&url_app, name); + smart_str_appendc(&url_app, '='); + smart_str_appends(&url_app, value); + + append_modified_url(&surl, &buf, &url_app, PG(arg_separator).output); + + smart_str_0(&buf); + if (newlen) *newlen = buf.len; + + smart_str_free(&url_app); + + return buf.c; } Index: php4/ext/standard/url_scanner_ex.h diff -u php4/ext/standard/url_scanner_ex.h:1.20 php4/ext/standard/url_scanner_ex.h:1.21 --- php4/ext/standard/url_scanner_ex.h:1.20 Sat May 4 14:33:13 2002 +++ php4/ext/standard/url_scanner_ex.h Sun May 5 12:39:49 2002 @@ -25,6 +25,8 @@ PHP_RINIT_FUNCTION(url_scanner_ex); PHP_RSHUTDOWN_FUNCTION(url_scanner_ex); +char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const char *name, const char *value, size_t *newlen TSRMLS_DC); + int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC); int php_url_scanner_reset_vars(TSRMLS_D); Index: php4/ext/standard/url_scanner_ex.re diff -u php4/ext/standard/url_scanner_ex.re:1.55 php4/ext/standard/url_scanner_ex.re:1.56 --- php4/ext/standard/url_scanner_ex.re:1.55 Sat May 4 22:07:16 2002 +++ php4/ext/standard/url_scanner_ex.re Sun May 5 12:39:49 2002 @@ -313,6 +313,28 @@ ctx->buf.len = rest; } +char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const char *name, const char *value, size_t *newlen TSRMLS_DC) +{ + smart_str surl = {0}; + smart_str buf = {0}; + smart_str url_app = {0}; + + smart_str_setl(&surl, url, urllen); + + smart_str_appends(&url_app, name); + smart_str_appendc(&url_app, '='); + smart_str_appends(&url_app, value); + + append_modified_url(&surl, &buf, &url_app, PG(arg_separator).output); + + smart_str_0(&buf); + if (newlen) *newlen = buf.len; + + smart_str_free(&url_app); + + return buf.c; +} + static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool do_flush TSRMLS_DC) {