cvs: php4 /ext/session session.c

zeev Sun Aug 26 22:06:33 2001 EDT Modified files: /php4/ext/session session.c Log: Cleanup Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.244 php4/ext/session/session.c:1.245 --- php4/ext/session/session.c:1.244 Sun Aug 26 20:23:54 2001 +++ php4/ext/session/session.c Sun Aug 26 22:06:32 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.244 2001/08/27 00:23:54 zeev Exp $ */ +/* $Id: session.c,v 1.245 2001/08/27 02:06:32 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -84,25 +84,11 @@ static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC); static void php_session_end_output_handler(TSRMLS_D); -static int session_adapt_uris(const char *src, size_t srclen, char **new, size_t *newlen, zend_bool do_flush TSRMLS_DC) +static void php_session_output_handler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) { if (PS(define_sid) && (PS(session_status) == php_session_active)) { - *new = url_adapt_ext_ex(src, srclen, PS(session_name), PS(id), newlen, do_flush TSRMLS_CC); - return SUCCESS; + *handled_output = url_adapt_ext_ex(output, output_len, PS(session_name), PS(id), handled_output_len, (zend_bool) (mode&PHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC); } else { - return FAILURE; - } -} - - -static void php_session_output_handler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) -{ - zend_bool do_flush; - - if (mode&PHP_OUTPUT_HANDLER_END) { - do_flush=1; - } - if (session_adapt_uris(output, output_len, handled_output, handled_output_len, do_flush TSRMLS_CC)==FAILURE) { *handled_output = NULL; } }