summaryrefslogtreecommitdiff
path: root/ext/session
diff options
context:
space:
mode:
Diffstat (limited to 'ext/session')
-rw-r--r--ext/session/Makefile.am5
-rw-r--r--ext/session/config.h.stub4
-rw-r--r--ext/session/config.m442
-rw-r--r--ext/session/mod_files.c288
-rw-r--r--ext/session/mod_files.h38
-rw-r--r--ext/session/mod_files.sh16
-rw-r--r--ext/session/mod_mm.c342
-rw-r--r--ext/session/mod_mm.h52
-rw-r--r--ext/session/mod_user.c186
-rw-r--r--ext/session/mod_user.h39
-rw-r--r--ext/session/modules.c15
-rw-r--r--ext/session/php_session.h165
-rw-r--r--ext/session/session.c1183
-rw-r--r--ext/session/setup.stub6
14 files changed, 0 insertions, 2381 deletions
diff --git a/ext/session/Makefile.am b/ext/session/Makefile.am
deleted file mode 100644
index 79193f1dcb..0000000000
--- a/ext/session/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-noinst_LTLIBRARIES=libphpext_session.la
-libphpext_session_la_SOURCES=session.c mod_files.c mod_mm.c mod_user.c
-
diff --git a/ext/session/config.h.stub b/ext/session/config.h.stub
deleted file mode 100644
index 24abf8b280..0000000000
--- a/ext/session/config.h.stub
+++ /dev/null
@@ -1,4 +0,0 @@
-/* define if you want to use the session extension */
-
-#undef TRANS_SID
-#undef HAVE_LIBMM
diff --git a/ext/session/config.m4 b/ext/session/config.m4
deleted file mode 100644
index 8db20b3324..0000000000
--- a/ext/session/config.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension session
-dnl don't forget to call PHP_EXTENSION(session)
-
-RESULT=no
-AC_MSG_CHECKING(for mm support)
-AC_ARG_WITH(mm,
-[ --with-mm[=DIR] Include mm support],
-[
- if test "$withval" != "no"; then
- for i in /usr/local /usr $withval; do
- if test -f "$i/include/mm.h"; then
- MM_DIR="$i"
- fi
- done
-
- if test -z "$MM_DIR" ; then
- AC_MSG_ERROR(cannot find mm library)
- fi
-
- AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib)
- AC_ADD_INCLUDE($MM_DIR/include)
- AC_DEFINE(HAVE_LIBMM, 1)
- RESULT=yes
- PHP_EXTENSION(ps_mm)
- fi
-])
-AC_MSG_RESULT($RESULT)
-
-RESULT=no
-AC_MSG_CHECKING(whether to enable transparent session id propagation)
-AC_ARG_ENABLE(trans-sid,
-[ --enable-trans-sid Enable transparent session id propagation],
-[
- if test "$enableval" = "yes" ; then
- AC_DEFINE(TRANS_SID, 1)
- RESULT=yes
- fi
-])
-AC_MSG_RESULT($RESULT)
-
-PHP_EXTENSION(session)
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
deleted file mode 100644
index 6191fc5e9e..0000000000
--- a/ext/session/mod_files.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP version 4.0 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997, 1998, 1999 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.0 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Sascha Schumann <ss@2ns.de> |
- +----------------------------------------------------------------------+
- */
-
-
-#include "php.h"
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#if HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-
-#if HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
-#if WIN32||WINNT
-#define NEEDRDH 1
-#include "win32/readdir.h"
-#endif
-#include <time.h>
-
-#include <fcntl.h>
-#include <errno.h>
-
-#include "php_session.h"
-#include "mod_files.h"
-#include "ext/standard/flock_compat.h"
-
-#define FILE_PREFIX "sess_"
-
-typedef struct {
- int fd;
- char *lastkey;
- char *basedir;
- int dirdepth;
-} ps_files;
-
-ps_module ps_mod_files = {
- PS_MOD(files)
-};
-
-#if WIN32|WINNT
-#define DIR_DELIMITER '\\'
-#else
-#define DIR_DELIMITER '/'
-#endif
-
-static int _ps_files_valid_key(const char *key)
-{
- size_t len;
- const char *p;
- char c;
- int ret = 1;
-
- for(p = key; (c = *p); p++) {
- /* valid characters are a..z,A..Z,0..9 */
- if(!((c >= 'a' && c <= 'z') ||
- (c >= 'A' && c <= 'Z') ||
- (c >= '0' && c <= '9'))) {
- ret = 0;
- break;
- }
- }
-
- len = p - key;
-
- if(len == 0) {
- ret = 0;
- }
-
- return ret;
-}
-
-static char *_ps_files_path_create(char *buf, size_t buflen, ps_files *data, const char *key)
-{
- int keylen;
- const char *p;
- int i;
- int n;
-
- keylen = strlen(key);
- if(keylen <= data->dirdepth || buflen <
- (strlen(data->basedir) + 2 * data->dirdepth + keylen + 5 + sizeof(FILE_PREFIX)))
- return NULL;
- p = key;
- n = sprintf(buf, "%s/", data->basedir);
- for(i = 0; i < data->dirdepth; i++) {
- buf[n++] = *p++;
- buf[n++] = DIR_DELIMITER;
- }
- strcat(buf, FILE_PREFIX);
- strcat(buf, p);
-
- return buf;
-}
-
-static void _ps_files_open(ps_files *data, const char *key)
-{
- char buf[MAXPATHLEN];
-
- if(data->fd < 0 || !data->lastkey || strcmp(key, data->lastkey)) {
- if(data->lastkey) {
- efree(data->lastkey);
- data->lastkey = NULL;
- }
- if(data->fd != -1) {
- close(data->fd);
- data->fd = -1;
- }
-
- if(!_ps_files_valid_key(key) ||
- !_ps_files_path_create(buf, sizeof(buf), data, key))
- return;
-
- data->lastkey = estrdup(key);
-
-#ifdef O_EXCL
- data->fd = open(buf, O_RDWR);
- if (data->fd == -1) {
- if (errno == ENOENT) {
- data->fd = open(buf, O_EXCL | O_RDWR | O_CREAT, 0600);
- }
- } else {
- flock(data->fd, LOCK_EX);
- }
-#else
- data->fd = open(buf, O_CREAT | O_RDWR, 0600);
- if(data->fd != -1) {
- flock(data->fd, LOCK_EX);
- }
-#endif
- }
-}
-
-static void _ps_files_cleanup_dir(const char *dirname, int maxlifetime)
-{
- DIR *dir;
- struct dirent *entry;
- struct stat sbuf;
- char buf[MAXPATHLEN];
- time_t now;
-
- dir = opendir(dirname);
- if(!dir) return;
-
- time(&now);
-
- while((entry = readdir(dir))) {
- /* does the file start with our prefix? */
- if(!strncmp(entry->d_name, FILE_PREFIX, sizeof(FILE_PREFIX) - 1) &&
- /* create full path */
- snprintf(buf, MAXPATHLEN, "%s%c%s", dirname, DIR_DELIMITER,
- entry->d_name) > 0 &&
- /* stat the directory entry */
- stat(buf, &sbuf) == 0 &&
- /* is it expired? */
- (now - sbuf.st_atime) > maxlifetime) {
- unlink(buf);
- }
- }
-
- closedir(dir);
-}
-
-#define PS_FILES_DATA ps_files *data = PS_GET_MOD_DATA()
-
-PS_OPEN_FUNC(files)
-{
- ps_files *data;
- char *p;
-
- data = ecalloc(sizeof(*data), 1);
- PS_SET_MOD_DATA(data);
-
- data->fd = -1;
- if((p = strchr(save_path, ':'))) {
- data->dirdepth = strtol(save_path, NULL, 10);
- save_path = p + 1;
- }
- data->basedir = estrdup(save_path);
-
- return SUCCESS;
-}
-
-PS_CLOSE_FUNC(files)
-{
- PS_FILES_DATA;
-
- if(data->fd > -1) close(data->fd);
- if(data->lastkey) efree(data->lastkey);
- efree(data->basedir);
- efree(data);
- *mod_data = NULL;
-
- return SUCCESS;
-}
-
-PS_READ_FUNC(files)
-{
- int n;
- struct stat sbuf;
- PS_FILES_DATA;
-
- _ps_files_open(data, key);
- if(data->fd < 0) {
- return FAILURE;
- }
-
- if(fstat(data->fd, &sbuf)) {
- return FAILURE;
- }
-
- lseek(data->fd, 0, SEEK_SET);
-
- *vallen = sbuf.st_size;
- *val = emalloc(sbuf.st_size);
-
- n = read(data->fd, *val, sbuf.st_size);
- if(n != sbuf.st_size) {
- efree(*val);
- return FAILURE;
- }
-
- return SUCCESS;
-}
-
-PS_WRITE_FUNC(files)
-{
- PS_FILES_DATA;
-
- _ps_files_open(data, key);
- if(data->fd < 0) {
- return FAILURE;
- }
-
- ftruncate(data->fd, 0);
- lseek(data->fd, 0, SEEK_SET);
- write(data->fd, val, vallen);
-
- return SUCCESS;
-}
-
-PS_DESTROY_FUNC(files)
-{
- char buf[MAXPATHLEN];
- PS_FILES_DATA;
-
- if(!_ps_files_path_create(buf, sizeof(buf), data, key))
- return FAILURE;
-
- unlink(buf);
-
- return SUCCESS;
-}
-
-PS_GC_FUNC(files)
-{
- PS_FILES_DATA;
-
- /* we don't perform any cleanup, if dirdepth is larger than 0.
- we return SUCCESS, since all cleanup should be handled by
- an external entity (i.e. find -ctime x | xargs rm) */
-
- if(data->dirdepth > 0) {
- return SUCCESS;
- }
-
- _ps_files_cleanup_dir(data->basedir, maxlifetime);
-
- return SUCCESS;
-}
diff --git a/ext/session/mod_files.h b/ext/session/mod_files.h
deleted file mode 100644
index 9f40704a42..0000000000
--- a/ext/session/mod_files.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP HTML Embedded Scripting Language Version 4.0 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997,1998 PHP Development Team (See Credits file) |
- +----------------------------------------------------------------------+
- | This program is free software; you can redistribute it and/or modify |
- | it under the terms of one of the following licenses: |
- | |
- | A) the GNU General Public License as published by the Free Software |
- | Foundation; either version 2 of the License, or (at your option) |
- | any later version. |
- | |
- | B) the PHP License as published by the PHP Development Team and |
- | included in the distribution in the file: LICENSE |
- | |
- | This program is distributed in the hope that it will be useful, |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
- | GNU General Public License for more details. |
- | |
- | You should have received a copy of both licenses referred to here. |
- | If you did not, or have any questions about PHP licensing, please |
- | contact core@php.net. |
- +----------------------------------------------------------------------+
- | Authors: Sascha Schumann <ss@2ns.de> |
- +----------------------------------------------------------------------+
- */
-
-#ifndef MOD_FILES_H
-#define MOD_FILES_H
-
-extern ps_module ps_mod_files;
-#define ps_files_ptr &ps_mod_files
-
-PS_FUNCS(files);
-
-#endif
diff --git a/ext/session/mod_files.sh b/ext/session/mod_files.sh
deleted file mode 100644
index 4d6a681d9c..0000000000
--- a/ext/session/mod_files.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-if test "$2" = ""; then
- echo "usage: $0 basedir depth"
- exit 1
-fi
-
-if test "$2" = "0"; then
- exit 0
-fi
-
-for i in a b c d e f 0 1 2 3 4 5 6 7 8 9; do
- newpath="$1/$i"
- mkdir $newpath || exit 1
- sh $0 $newpath `expr $2 - 1`
-done
diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
deleted file mode 100644
index 26f5789350..0000000000
--- a/ext/session/mod_mm.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP version 4.0 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997, 1998, 1999 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.0 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Sascha Schumann <ss@2ns.de> |
- +----------------------------------------------------------------------+
- */
-
-
-#include "php.h"
-
-#ifdef HAVE_LIBMM
-
-#include <mm.h>
-#include <time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-
-#include "php_session.h"
-#include "mod_mm.h"
-
-#define PS_MM_PATH "/tmp/session_mm"
-
-/*
- * this list holds all data associated with one session
- */
-
-typedef struct ps_sd {
- struct ps_sd *next, *prev;
- time_t ctime;
- char *key;
- void *data;
- size_t datalen;
-} ps_sd;
-
-typedef struct {
- MM *mm;
- ps_sd **hash;
-} ps_mm;
-
-static ps_mm *ps_mm_instance = NULL;
-
-/* should be a prime */
-#define HASH_SIZE 577
-
-#if 0
-#define ps_mm_debug(a...) fprintf(stderr, a)
-#else
-#define ps_mm_debug(a...)
-#endif
-
-#define BITS_IN_int (sizeof(int) * CHAR_BIT)
-#define THREE_QUARTERS ((int) ((BITS_IN_int * 3) / 4))
-#define ONE_EIGTH ((int) (BITS_IN_int / 8))
-#define HIGH_BITS (~((unsigned int)(~0) >> ONE_EIGTH))
-
-/*
- * Weinberger's generic hash algorithm, adapted by Holub
- * (published in [Holub 1990])
- */
-
-static unsigned int ps_sd_hash(const char *data)
-{
- unsigned int val, i;
-
- for(val = 0; *data; data++) {
- val = (val << ONE_EIGTH) + *data;
- if((i = val & HIGH_BITS) != 0) {
- val = (val ^ (i >> THREE_QUARTERS)) & -HIGH_BITS;
- }
- }
-
- return val;
-}
-
-
-static ps_sd *ps_sd_new(ps_mm *data, const char *key, const void *sdata, size_t sdatalen)
-{
- unsigned int h;
- ps_sd *sd;
-
- h = ps_sd_hash(key) % HASH_SIZE;
-
- sd = mm_malloc(data->mm, sizeof(*sd));
- if(!sd) {
- return NULL;
- }
- sd->ctime = 0;
-
- sd->data = mm_malloc(data->mm, sdatalen);
- if(!sd->data) {
- mm_free(data->mm, sd);
- return NULL;
- }
-
- sd->datalen = sdatalen;
-
- sd->key = mm_strdup(data->mm, key);
- if(!sd->key) {
- mm_free(data->mm, sd->data);
- mm_free(data->mm, sd);
- return NULL;
- }
-
- memcpy(sd->data, sdata, sdatalen);
-
- if((sd->next = data->hash[h]))
- sd->next->prev = sd;
- sd->prev = NULL;
-
- ps_mm_debug("inserting %s(%x) into %d\n", key, sd, h);
-
- data->hash[h] = sd;
-
- return sd;
-}
-
-static void ps_sd_destroy(ps_mm *data, ps_sd *sd)
-{
- unsigned int h;
-
- h = ps_sd_hash(sd->key) % HASH_SIZE;
-
- if(sd->next)
- sd->next->prev = sd->prev;
- if(sd->prev)
- sd->prev->next = sd->next;
-
- if(data->hash[h] == sd)
- data->hash[h] = sd->next;
-
- mm_free(data->mm, sd->key);
- if(sd->data) mm_free(data->mm, sd->data);
- mm_free(data->mm, sd);
-}
-
-static ps_sd *ps_sd_lookup(ps_mm *data, const char *key, int rw)
-{
- unsigned int h;
- ps_sd *ret;
-
- h = ps_sd_hash(key) % HASH_SIZE;
-
- for(ret = data->hash[h]; ret; ret = ret->next)
- if(!strcmp(ret->key, key)) break;
-
- if(ret && rw && ret != data->hash[h]) {
- data->hash[h]->prev = ret;
- ret->next = data->hash[h];
- data->hash[h] = ret;
- ps_mm_debug("optimizing\n");
- }
-
- ps_mm_debug(stderr, "lookup(%s): ret=%x,h=%d\n", key, ret, h);
-
- return ret;
-}
-
-ps_module ps_mod_mm = {
- PS_MOD(mm)
-};
-
-#define PS_MM_DATA ps_mm *data = PS_GET_MOD_DATA()
-
-static int ps_mm_initialize(ps_mm *data, const char *path)
-{
- data->mm = mm_create(0, path);
-
- data->hash = mm_calloc(data->mm, HASH_SIZE, sizeof(*data->hash));
-
- return SUCCESS;
-}
-
-static void ps_mm_destroy(ps_mm *data)
-{
- int h;
- ps_sd *sd, *next;
-
- for(h = 0; h < HASH_SIZE; h++) {
- for(sd = data->hash[h]; sd; sd = next) {
- next = sd->next;
- ps_sd_destroy(data, sd);
- }
- }
-
- mm_free(data->mm, data->hash);
- mm_destroy(data->mm);
-}
-
-PHP_GINIT_FUNCTION(ps_mm)
-{
- ps_mm_instance = calloc(sizeof(*ps_mm_instance), 1);
- ps_mm_initialize(ps_mm_instance, PS_MM_PATH);
- return SUCCESS;
-}
-
-PHP_GSHUTDOWN_FUNCTION(ps_mm)
-{
- ps_mm_destroy(ps_mm_instance);
- free(ps_mm_instance);
- return SUCCESS;
-}
-
-PS_OPEN_FUNC(mm)
-{
- ps_mm_debug("open: ps_mm_instance=%x\n", ps_mm_instance);
-
- if(!ps_mm_instance) {
- return FAILURE;
- }
-
- PS_SET_MOD_DATA(ps_mm_instance);
-
- return SUCCESS;
-}
-
-PS_CLOSE_FUNC(mm)
-{
- PS_SET_MOD_DATA(NULL);
-
- return SUCCESS;
-}
-
-PS_READ_FUNC(mm)
-{
- PS_MM_DATA;
- ps_sd *sd;
- int ret = FAILURE;
-
- mm_lock(data->mm, MM_LOCK_RD);
-
- sd = ps_sd_lookup(data, key, 0);
- if(sd) {
- *vallen = sd->datalen;
- *val = emalloc(sd->datalen);
- memcpy(*val, sd->data, sd->datalen);
- ret = SUCCESS;
- }
-
- mm_unlock(data->mm);
-
- return ret;
-}
-
-PS_WRITE_FUNC(mm)
-{
- PS_MM_DATA;
- ps_sd *sd;
-
- mm_lock(data->mm, MM_LOCK_RW);
-
- sd = ps_sd_lookup(data, key, 1);
- if(!sd) {
- sd = ps_sd_new(data, key, val, vallen);
- ps_mm_debug(stderr, "new one for %s\n", key);
- } else {
- ps_mm_debug(stderr, "found existing one for %s\n", key);
- mm_free(data->mm, sd->data);
- sd->datalen = vallen;
- sd->data = mm_malloc(data->mm, vallen);
- if(!sd->data) {
- ps_sd_destroy(data, sd);
- sd = NULL;
- } else {
- memcpy(sd->data, val, vallen);
- }
- }
-
- if(sd) time(&sd->ctime);
-
- mm_unlock(data->mm);
-
- return sd ? SUCCESS : FAILURE;
-}
-
-PS_DESTROY_FUNC(mm)
-{
- PS_MM_DATA;
- ps_sd *sd;
-
- mm_lock(data->mm, MM_LOCK_RW);
-
- sd = ps_sd_lookup(data, key, 0);
- if(sd) {
- ps_sd_destroy(data, sd);
- }
-
- mm_unlock(data->mm);
-
- return SUCCESS;
-}
-
-PS_GC_FUNC(mm)
-{
- PS_MM_DATA;
- int h;
- time_t now;
- ps_sd *sd, *next;
-
- ps_mm_debug("gc\n");
-
- mm_lock(data->mm, MM_LOCK_RW);
-
- time(&now);
-
- for(h = 0; h < HASH_SIZE; h++) {
- for(sd = data->hash[h]; sd; sd = next) {
- next = sd->next;
- ps_mm_debug("looking at %s\n", sd->key);
- if((now - sd->ctime) > maxlifetime) {
- ps_sd_destroy(data, sd);
- }
- }
- }
-
- mm_unlock(data->mm);
-
- return SUCCESS;
-}
-
-zend_module_entry php_session_mm_module = {
- "Session MM",
- NULL,
- NULL, NULL,
- NULL, NULL,
- NULL,
- PHP_GINIT(ps_mm), PHP_GSHUTDOWN(ps_mm),
- STANDARD_MODULE_PROPERTIES_EX
-};
-
-#endif
diff --git a/ext/session/mod_mm.h b/ext/session/mod_mm.h
deleted file mode 100644
index 69d9a7d3e1..0000000000
--- a/ext/session/mod_mm.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP HTML Embedded Scripting Language Version 4.0 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997,1998 PHP Development Team (See Credits file) |
- +----------------------------------------------------------------------+
- | This program is free software; you can redistribute it and/or modify |
- | it under the terms of one of the following licenses: |
- | |
- | A) the GNU General Public License as published by the Free Software |
- | Foundation; either version 2 of the License, or (at your option) |
- | any later version. |
- | |
- | B) the PHP License as published by the PHP Development Team and |
- | included in the distribution in the file: LICENSE |
- | |
- | This program is distributed in the hope that it will be useful, |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
- | GNU General Public License for more details. |
- | |
- | You should have received a copy of both licenses referred to here. |
- | If you did not, or have any questions about PHP licensing, please |
- | contact core@php.net. |
- +----------------------------------------------------------------------+
- | Authors: Sascha Schumann <ss@2ns.de> |
- +----------------------------------------------------------------------+
- */
-
-#ifndef MOD_MM_H
-#define MOD_MM_H
-
-#ifdef HAVE_LIBMM
-
-#include "php_session.h"
-
-extern ps_module ps_mod_mm;
-#define ps_mm_ptr &ps_mod_mm
-
-extern zend_module_entry php_session_mm_module;
-#define phpext_ps_mm_ptr &php_session_mm_module
-
-PS_FUNCS(mm);
-
-#else
-
-#define ps_mm_ptr NULL
-#define phpext_ps_mm_ptr NULL
-
-#endif
-
-#endif
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c
deleted file mode 100644
index 62c5c7759a..0000000000
--- a/ext/session/mod_user.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP version 4.0 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997, 1998, 1999 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.0 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Sascha Schumann <ss@2ns.de> |
- +----------------------------------------------------------------------+
- */
-
-#include "php.h"
-#include "php_session.h"
-#include "mod_user.h"
-
-ps_module ps_mod_user = {
- PS_MOD(user)
-};
-
-#define ZVAL_LONG(val, a) \
-{ \
- MAKE_STD_ZVAL(a); \
- a->type = IS_LONG; \
- a->value.lval = val; \
-}
-
-#define ZVAL_STRING(vl, a) \
-{ \
- int len = strlen(vl); \
- MAKE_STD_ZVAL(a); \
- a->type = IS_STRING; \
- a->value.str.len = len; \
- a->value.str.val = estrndup(vl, len); \
-}
-
-#define ZVAL_STRINGN(vl, ln, a) \
-{ \
- MAKE_STD_ZVAL(a); \
- a->type = IS_STRING; \
- a->value.str.len = ln; \
- a->value.str.val = estrndup(vl, ln); \
-}
-
-
-static zval *ps_call_handler(char *name, int argc, zval **argv)
-{
- int i;
- zval *retval = NULL;
- ELS_FETCH();
-
- if(name && name[0] != '\0') {
- zval *func;
-
- ZVAL_STRING(name, func);
- MAKE_STD_ZVAL(retval);
-
- if(call_user_function(EG(function_table), NULL, func, retval,
- argc, argv) == FAILURE) {
- zval_dtor(retval);
- efree(retval);
- retval = NULL;
- }
- zval_dtor(func);
- efree(func);
- }
-
- for(i = 0; i < argc; i++) {
- zval_dtor(argv[i]);
- efree(argv[i]);
- }
-
- return retval;
-}
-
-#define STDVARS \
- zval *retval; \
- int ret = FAILURE; \
- ps_user *mdata = PS_GET_MOD_DATA(); \
- if(!mdata) return FAILURE
-
-#define PSF(a) mdata->name.ps_##a
-
-#define FINISH \
- if(retval) { \
- convert_to_long(retval); \
- ret = retval->value.lval; \
- zval_dtor(retval); \
- efree(retval); \
- } \
- return ret
-
-PS_OPEN_FUNC(user)
-{
- zval *args[2];
- STDVARS;
-
- ZVAL_STRING(save_path, args[0]);
- ZVAL_STRING(session_name, args[1]);
-
- retval = ps_call_handler(PSF(open), 2, args);
-
- FINISH;
-}
-
-PS_CLOSE_FUNC(user)
-{
- int i;
- STDVARS;
-
- retval = ps_call_handler(PSF(close), 0, NULL);
-
- for(i = 0; i < 6; i++) {
- efree(mdata->names[i]);
- }
- efree(mdata);
-
- PS_SET_MOD_DATA(NULL);
-
- FINISH;
-}
-
-PS_READ_FUNC(user)
-{
- zval *args[1];
- STDVARS;
-
- ZVAL_STRING(key, args[0]);
-
- retval = ps_call_handler(PSF(read), 1, args);
-
- if(retval) {
- if(retval->type == IS_STRING) {
- *val = estrndup(retval->value.str.val, retval->value.str.len);
- *vallen = retval->value.str.len;
- ret = SUCCESS;
- }
- zval_dtor(retval);
- efree(retval);
- }
-
- return ret;
-}
-
-PS_WRITE_FUNC(user)
-{
- zval *args[2];
- STDVARS;
-
- ZVAL_STRING(key, args[0]);
- ZVAL_STRINGN(val, vallen, args[1]);
-
- retval = ps_call_handler(PSF(write), 2, args);
-
- FINISH;
-}
-
-PS_DESTROY_FUNC(user)
-{
- zval *args[1];
- STDVARS;
-
- ZVAL_STRING(key, args[0]);
-
- retval = ps_call_handler(PSF(destroy), 1, args);
-
- FINISH;
-}
-
-PS_GC_FUNC(user)
-{
- zval *args[1];
- STDVARS;
-
- ZVAL_LONG(maxlifetime, args[0]);
-
- retval = ps_call_handler(PSF(gc), 1, args);
-
- FINISH;
-}
diff --git a/ext/session/mod_user.h b/ext/session/mod_user.h
deleted file mode 100644
index 3d91050ab7..0000000000
--- a/ext/session/mod_user.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP version 4.0 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997, 1998, 1999 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.0 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Sascha Schumann <ss@2ns.de> |
- +----------------------------------------------------------------------+
- */
-
-#ifndef MOD_USER_H
-#define MOD_USER_H
-
-typedef union {
- char *names[6];
- struct {
- char *ps_open;
- char *ps_close;
- char *ps_read;
- char *ps_write;
- char *ps_destroy;
- char *ps_gc;
- } name;
-} ps_user;
-
-extern ps_module ps_mod_user;
-#define ps_user_ptr &ps_mod_user
-
-PS_FUNCS(user);
-
-#endif
diff --git a/ext/session/modules.c b/ext/session/modules.c
deleted file mode 100644
index f866a42333..0000000000
--- a/ext/session/modules.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * To add a PHP session module, #include its header file and
- * add a ps_xxx_ptr in the struct...
- */
-
-#include "mod_files.h"
-#include "mod_mm.h"
-#include "mod_user.h"
-
-static ps_module *ps_modules[] = {
- ps_files_ptr,
- ps_mm_ptr,
- ps_user_ptr,
-};
-
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
deleted file mode 100644
index 005b451295..0000000000
--- a/ext/session/php_session.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP HTML Embedded Scripting Language Version 4.0 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997,1998 PHP Development Team (See Credits file) |
- +----------------------------------------------------------------------+
- | This program is free software; you can redistribute it and/or modify |
- | it under the terms of one of the following licenses: |
- | |
- | A) the GNU General Public License as published by the Free Software |
- | Foundation; either version 2 of the License, or (at your option) |
- | any later version. |
- | |
- | B) the PHP License as published by the PHP Development Team and |
- | included in the distribution in the file: LICENSE |
- | |
- | This program is distributed in the hope that it will be useful, |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
- | GNU General Public License for more details. |
- | |
- | You should have received a copy of both licenses referred to here. |
- | If you did not, or have any questions about PHP licensing, please |
- | contact core@php.net. |
- +----------------------------------------------------------------------+
- | Authors: Sascha Schumann <ss@2ns.de> |
- +----------------------------------------------------------------------+
- */
-
-#ifndef PHP_SESSION_H
-#define PHP_SESSION_H
-
-#define PS_OPEN_ARGS void **mod_data, const char *save_path, const char *session_name
-#define PS_CLOSE_ARGS void **mod_data
-#define PS_READ_ARGS void **mod_data, const char *key, char **val, int *vallen
-#define PS_WRITE_ARGS void **mod_data, const char *key, const char *val, const int vallen
-#define PS_DESTROY_ARGS void **mod_data, const char *key
-#define PS_GC_ARGS void **mod_data, int maxlifetime
-
-typedef struct ps_module_struct {
- const char *name;
- int (*open)(PS_OPEN_ARGS);
- int (*close)(PS_CLOSE_ARGS);
- int (*read)(PS_READ_ARGS);
- int (*write)(PS_WRITE_ARGS);
- int (*destroy)(PS_DESTROY_ARGS);
- int (*gc)(PS_GC_ARGS);
-} ps_module;
-
-#define PS_GET_MOD_DATA() *mod_data
-#define PS_SET_MOD_DATA(a) *mod_data = (a)
-
-#define PS_OPEN_FUNC(x) int _ps_open_##x(PS_OPEN_ARGS)
-#define PS_CLOSE_FUNC(x) int _ps_close_##x(PS_CLOSE_ARGS)
-#define PS_READ_FUNC(x) int _ps_read_##x(PS_READ_ARGS)
-#define PS_WRITE_FUNC(x) int _ps_write_##x(PS_WRITE_ARGS)
-#define PS_DESTROY_FUNC(x) int _ps_delete_##x(PS_DESTROY_ARGS)
-#define PS_GC_FUNC(x) int _ps_gc_##x(PS_GC_ARGS)
-
-#define PS_FUNCS(x) \
- PS_OPEN_FUNC(x); \
- PS_CLOSE_FUNC(x); \
- PS_READ_FUNC(x); \
- PS_WRITE_FUNC(x); \
- PS_DESTROY_FUNC(x); \
- PS_GC_FUNC(x)
-
-
-#define PS_MOD(x) \
- #x, _ps_open_##x, _ps_close_##x, _ps_read_##x, _ps_write_##x, \
- _ps_delete_##x, _ps_gc_##x
-
-typedef struct {
- char *save_path;
- char *session_name;
- char *id;
- char *extern_referer_chk;
- char *entropy_file;
- char *cache_limiter;
- int entropy_length;
- int cookie_lifetime;
- char *cookie_path;
- char *cookie_domain;
- zend_bool define_sid;
- zend_bool use_cookies;
- ps_module *mod;
- void *mod_data;
- HashTable vars;
- int nr_open_sessions;
- int gc_probability;
- int gc_maxlifetime;
- int module_number;
- int cache_expire;
- const struct ps_serializer_struct *serializer;
- zval *http_state_vars;
-} php_ps_globals;
-
-extern zend_module_entry session_module_entry;
-#define phpext_session_ptr &session_module_entry
-
-PHP_FUNCTION(session_name);
-PHP_FUNCTION(session_module_name);
-PHP_FUNCTION(session_save_path);
-PHP_FUNCTION(session_id);
-PHP_FUNCTION(session_decode);
-PHP_FUNCTION(session_register);
-PHP_FUNCTION(session_unregister);
-PHP_FUNCTION(session_is_registered);
-PHP_FUNCTION(session_encode);
-PHP_FUNCTION(session_start);
-PHP_FUNCTION(session_destroy);
-PHP_FUNCTION(session_unset);
-PHP_FUNCTION(session_set_save_handler);
-
-#ifdef ZTS
-#define PSLS_D php_ps_globals *ps_globals
-#define PSLS_DC , PSLS_D
-#define PSLS_C ps_globals
-#define PSLS_CC , PSLS_C
-#define PS(v) (ps_globals->v)
-#define PSLS_FETCH() php_ps_globals *ps_globals = ts_resource(ps_globals_id)
-#else
-#define PSLS_D void
-#define PSLS_DC
-#define PSLS_C
-#define PSLS_CC
-#define PS(v) (ps_globals.v)
-#define PSLS_FETCH()
-#endif
-
-#define PS_SERIALIZER_ENCODE_ARGS char **newstr, int *newlen PSLS_DC
-#define PS_SERIALIZER_DECODE_ARGS const char *val, int vallen PSLS_DC
-
-typedef struct ps_serializer_struct {
- const char *name;
- int (*encode)(PS_SERIALIZER_ENCODE_ARGS);
- int (*decode)(PS_SERIALIZER_DECODE_ARGS);
-} ps_serializer;
-
-#define PS_SERIALIZER_ENCODE_FUNC(x) \
- int _ps_srlzr_encode_##x(PS_SERIALIZER_ENCODE_ARGS)
-#define PS_SERIALIZER_DECODE_FUNC(x) \
- int _ps_srlzr_decode_##x(PS_SERIALIZER_DECODE_ARGS)
-
-#define PS_SERIALIZER_FUNCS(x) \
- PS_SERIALIZER_ENCODE_FUNC(x); \
- PS_SERIALIZER_DECODE_FUNC(x)
-
-#define PS_SERIALIZER_ENTRY(x) \
- { #x, _ps_srlzr_encode_##x, _ps_srlzr_decode_##x }
-
-#ifdef TRANS_SID
-void session_adapt_uris(const char *, uint, char **, uint *);
-#else
-#define session_adapt_uris(a,b,c,d) do { } while(0)
-#endif
-
-void _php_session_auto_start(void *data);
-
-#if HAVE_WDDX
-#define WDDX_SERIALIZER
-#include "ext/wddx/php_wddx_api.h"
-#endif
-
-#endif
diff --git a/ext/session/session.c b/ext/session/session.c
deleted file mode 100644
index bbbaff098d..0000000000
--- a/ext/session/session.c
+++ /dev/null
@@ -1,1183 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP version 4.0 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997, 1998, 1999 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.0 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Sascha Schumann <ss@schumann.cx> |
- | Andrei Zmievski <andrei@ispi.net> |
- +----------------------------------------------------------------------+
- */
-
-#if !(WIN32|WINNT)
-#include <sys/time.h>
-#else
-#include "win32/time.h"
-#endif
-
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "php.h"
-#include "php_ini.h"
-#include "SAPI.h"
-
-#include "php_session.h"
-#include "ext/standard/md5.h"
-#include "ext/standard/php_var.h"
-#include "ext/standard/datetime.h"
-#include "ext/standard/php_lcg.h"
-#include "ext/standard/url_scanner.h"
-
-#ifdef ZTS
-int ps_globals_id;
-#else
-static php_ps_globals ps_globals;
-#endif
-
-#include "modules.c"
-
-function_entry session_functions[] = {
- PHP_FE(session_name, NULL)
- PHP_FE(session_module_name, NULL)
- PHP_FE(session_save_path, NULL)
- PHP_FE(session_id, NULL)
- PHP_FE(session_decode, NULL)
- PHP_FE(session_register, NULL)
- PHP_FE(session_unregister, NULL)
- PHP_FE(session_is_registered, NULL)
- PHP_FE(session_encode, NULL)
- PHP_FE(session_start, NULL)
- PHP_FE(session_destroy, NULL)
- PHP_FE(session_unset, NULL)
- PHP_FE(session_set_save_handler, NULL)
- {0}
-};
-
-PHP_INI_BEGIN()
- PHP_INI_ENTRY("session.save_path", "/tmp", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.name", "PHPSESSID", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.save_handler", "files", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.auto_start", "0", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.gc_probability", "1", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.gc_maxlifetime", "1440", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.serialize_handler", "php", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.cookie_lifetime", "0", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.cookie_path", "/", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.cookie_domain", "", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.use_cookies", "1", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.referer_check", "", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.entropy_file", "", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.entropy_length", "0", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.cache_limiter", "nocache", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("session.cache_expire", "180", PHP_INI_ALL, NULL)
- /* Commented out until future discussion */
- /* PHP_INI_ENTRY("session.encode_sources", "globals,track", PHP_INI_ALL, NULL) */
-PHP_INI_END()
-
-PS_SERIALIZER_FUNCS(php);
-#ifdef WDDX_SERIALIZER
-PS_SERIALIZER_FUNCS(wddx);
-#endif
-
-
-const static ps_serializer ps_serializers[] = {
-#ifdef WDDX_SERIALIZER
- PS_SERIALIZER_ENTRY(wddx),
-#endif
- PS_SERIALIZER_ENTRY(php),
- {0}
-};
-
-PHP_MINIT_FUNCTION(session);
-PHP_RINIT_FUNCTION(session);
-PHP_MSHUTDOWN_FUNCTION(session);
-PHP_RSHUTDOWN_FUNCTION(session);
-PHP_MINFO_FUNCTION(session);
-
-static void php_rinit_session_globals(PSLS_D);
-static void php_rshutdown_session_globals(PSLS_D);
-
-zend_module_entry session_module_entry = {
- "Session Management",
- session_functions,
- PHP_MINIT(session), PHP_MSHUTDOWN(session),
- PHP_RINIT(session), PHP_RSHUTDOWN(session),
- PHP_MINFO(session),
- STANDARD_MODULE_PROPERTIES,
-};
-
-typedef struct {
- char *name;
- void (*func)(PSLS_D);
-} php_session_cache_limiter;
-
-#define CACHE_LIMITER_FUNC(name) void _php_cache_limiter_##name(PSLS_D)
-#define CACHE_LIMITER(name) { #name, _php_cache_limiter_##name },
-
-#define ADD_COOKIE(a) sapi_add_header(estrdup(a), strlen(a));
-
-#define STR_CAT(P,S,I) {\
- pval *__p = (P);\
- ulong __i = __p->value.str.len;\
- __p->value.str.len += (I);\
- if (__p->value.str.val) {\
- __p->value.str.val = (char *)erealloc(__p->value.str.val, __p->value.str.len + 1);\
- } else {\
- __p->value.str.val = emalloc(__p->value.str.len + 1);\
- *__p->value.str.val = 0;\
- }\
- strcat(__p->value.str.val + __i, (S));\
-}
-
-#define MAX_STR 512
-#define STD_FMT "%s|"
-#define NOTFOUND_FMT "!%s|"
-
-#define PS_ADD_VARL(name,namelen) \
- zend_hash_update(&PS(vars), name, namelen + 1, 0, 0, NULL)
-
-#define PS_ADD_VAR(name) PS_ADD_VARL(name, strlen(name))
-
-#define PS_DEL_VARL(name,namelen) \
- zend_hash_del(&PS(vars), name, namelen + 1);
-
-#define PS_DEL_VAR(name) PS_DEL_VARL(name, strlen(name))
-
-#define ENCODE_VARS \
- char *key; \
- ulong num_key; \
- zval **struc; \
- ELS_FETCH()
-
-#define ENCODE_LOOP(code) \
- for(zend_hash_internal_pointer_reset(&PS(vars)); \
- zend_hash_get_current_key(&PS(vars), &key, &num_key) == HASH_KEY_IS_STRING; \
- zend_hash_move_forward(&PS(vars))) { \
- if(php_get_session_var(key, strlen(key), &struc PSLS_CC ELS_CC) == SUCCESS) { \
- code; \
- } \
- efree(key); \
- }
-
-static void php_set_session_var(char *name, size_t namelen,
- zval *state_val PSLS_DC)
-{
- zval *state_val_copy;
- PLS_FETCH();
- ELS_FETCH();
-
- state_val_copy = (zval *)emalloc(sizeof(zval));
- *state_val_copy = *state_val;
- zval_copy_ctor(state_val_copy);
- state_val_copy->refcount = 0;
-
- if (PG(gpc_globals) && PG(track_vars)) {
- zend_set_hash_symbol(state_val_copy, name, namelen, 1, 2, PS(http_state_vars)->value.ht, &EG(symbol_table));
- } else {
- if (PG(gpc_globals)) {
- zend_set_hash_symbol(state_val_copy, name, namelen, 0, 1, &EG(symbol_table));
- }
-
- if (PG(track_vars)) {
- zend_set_hash_symbol(state_val_copy, name, namelen, 0, 1, PS(http_state_vars)->value.ht);
- }
- }
-}
-
-static int php_get_session_var(char *name, size_t namelen, zval ***state_var PSLS_DC ELS_DC)
-{
- return zend_hash_find(&EG(symbol_table), name, namelen + 1, (void **)state_var);
-}
-
-PS_SERIALIZER_ENCODE_FUNC(php)
-{
- zval *buf;
- char strbuf[MAX_STR + 1];
- ENCODE_VARS;
-
- buf = ecalloc(sizeof(*buf), 1);
- buf->type = IS_STRING;
- buf->refcount++;
-
- ENCODE_LOOP(
- snprintf(strbuf, MAX_STR, STD_FMT, key);
- STR_CAT(buf, strbuf, strlen(strbuf));
- php_var_serialize(buf, struc);
- } else {
- snprintf(strbuf, MAX_STR, NOTFOUND_FMT, key);
- STR_CAT(buf, strbuf, strlen(strbuf));
- );
-
- if(newlen) *newlen = buf->value.str.len;
- *newstr = buf->value.str.val;
- efree(buf);
-
- return SUCCESS;
-}
-
-PS_SERIALIZER_DECODE_FUNC(php)
-{
- const char *p, *q;
- char *name;
- const char *endptr = val + vallen;
- zval *current;
- int namelen;
- int has_value;
-
- current = (zval *) ecalloc(sizeof(zval), 1);
- for(p = q = val; (p < endptr) && (q = strchr(p, '|')); p = q) {
- if(p[0] == '!') {
- p++;
- has_value = 0;
- } else {
- has_value = 1;
- }
-
- namelen = q - p;
- name = estrndup(p, namelen);
- q++;
-
- if(has_value) {
- if(php_var_unserialize(&current, &q, endptr)) {
- php_set_session_var(name, namelen, current PSLS_CC);
- zval_dtor(current);
- }
- }
- PS_ADD_VAR(name);
- efree(name);
- }
- efree(current);
-
- return SUCCESS;
-}
-
-#ifdef WDDX_SERIALIZER
-
-PS_SERIALIZER_ENCODE_FUNC(wddx)
-{
- wddx_packet *packet;
- ENCODE_VARS;
-
- packet = _php_wddx_constructor();
- if(!packet) return FAILURE;
-
- _php_wddx_packet_start(packet, NULL);
- _php_wddx_add_chunk(packet, WDDX_STRUCT_S);
-
- ENCODE_LOOP(
- _php_wddx_serialize_var(packet, *struc, key);
- );
-
- _php_wddx_add_chunk(packet, WDDX_STRUCT_E);
- _php_wddx_packet_end(packet);
- *newstr = _php_wddx_gather(packet);
- _php_wddx_destructor(packet);
-
- if(newlen) *newlen = strlen(*newstr);
-
- return SUCCESS;
-}
-
-PS_SERIALIZER_DECODE_FUNC(wddx)
-{
- zval *retval;
- zval **ent;
- char *key;
- char tmp[128];
- ulong idx;
- int hash_type;
- int dofree = 1;
-
- if(vallen == 0) return FAILURE;
-
- MAKE_STD_ZVAL(retval);
-
- _php_wddx_deserialize_ex((char *)val, vallen, retval);
-
- for(zend_hash_internal_pointer_reset(retval->value.ht);
- zend_hash_get_current_data(retval->value.ht, (void **) &ent) == SUCCESS;
- zend_hash_move_forward(retval->value.ht)) {
- hash_type = zend_hash_get_current_key(retval->value.ht, &key, &idx);
-
- switch(hash_type) {
- case HASH_KEY_IS_LONG:
- sprintf(tmp, "%ld", idx);
- key = tmp;
- dofree = 0;
- case HASH_KEY_IS_STRING:
- php_set_session_var(key, strlen(key), *ent PSLS_CC);
- PS_ADD_VAR(key);
- if(dofree) efree(key);
- dofree = 1;
- }
- }
-
- zval_dtor(retval);
- efree(retval);
-
- return SUCCESS;
-}
-
-#endif
-
-static void php_session_track_init(void)
-{
- PSLS_FETCH();
- ELS_FETCH();
-
- if (zend_hash_find(&EG(symbol_table), "HTTP_STATE_VARS", sizeof("HTTP_STATE_VARS"),
- (void **)&PS(http_state_vars)) == FAILURE || PS(http_state_vars)->type != IS_ARRAY) {
- MAKE_STD_ZVAL(PS(http_state_vars));
- array_init(PS(http_state_vars));
- ZEND_SET_GLOBAL_VAR_WITH_LENGTH("HTTP_STATE_VARS", sizeof("HTTP_STATE_VARS"), PS(http_state_vars), 1, 0);
- } else
- zend_hash_clean(PS(http_state_vars)->value.ht);
-}
-
-static char *_php_session_encode(int *newlen PSLS_DC)
-{
- char *ret = NULL;
-
- if(PS(serializer)->encode(&ret, newlen PSLS_CC) == FAILURE) {
- ret = NULL;
- }
-
- return ret;
-}
-
-static void _php_session_decode(const char *val, int vallen PSLS_DC)
-{
- PLS_FETCH();
-
- if (PG(track_vars))
- php_session_track_init();
- PS(serializer)->decode(val, vallen PSLS_CC);
-}
-
-static char *_php_create_id(int *newlen PSLS_DC)
-{
- PHP3_MD5_CTX context;
- unsigned char digest[16];
- char buf[256];
- struct timeval tv;
- int i;
-
- gettimeofday(&tv, NULL);
- PHP3_MD5Init(&context);
-
- sprintf(buf, "%ld%ld%0.8f", tv.tv_sec, tv.tv_usec, php_combined_lcg() * 10);
- PHP3_MD5Update(&context, buf, strlen(buf));
-
- if(PS(entropy_length) > 0) {
- int fd;
-
- fd = open(PS(entropy_file), O_RDONLY);
- if(fd >= 0) {
- char *p;
- int n;
-
- p = emalloc(PS(entropy_length));
- n = read(fd, p, PS(entropy_length));
- if(n > 0) {
- PHP3_MD5Update(&context, p, n);
- }
- efree(p);
- close(fd);
- }
- }
-
- PHP3_MD5Final(digest, &context);
-
- for(i = 0; i < 16; i++)
- sprintf(buf + (i << 1), "%02x", digest[i]);
- buf[i << 1] = '\0';
-
- if(newlen) *newlen = i << 1;
- return estrdup(buf);
-}
-
-static void _php_session_initialize(PSLS_D)
-{
- char *val;
- int vallen;
-
- if(PS(mod)->open(&PS(mod_data), PS(save_path), PS(session_name)) == FAILURE) {
- php_error(E_ERROR, "failed to initialize session module");
- return;
- }
- if(PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen) == SUCCESS) {
- _php_session_decode(val, vallen PSLS_CC);
- efree(val);
- }
-}
-
-static void _php_session_save_current_state(PSLS_D)
-{
- char *val;
- int vallen;
-
- val = _php_session_encode(&vallen PSLS_CC);
- if(val) {
- PS(mod)->write(&PS(mod_data), PS(id), val, vallen);
- efree(val);
- } else {
- PS(mod)->write(&PS(mod_data), PS(id), "", 0);
- }
- PS(mod)->close(&PS(mod_data));
-}
-
-static char *month_names[] = {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static char *week_days[] = {
- "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
-};
-
-static void strcat_gmt(char *ubuf, time_t *when)
-{
- char buf[MAX_STR];
- struct tm tm;
-
- gmtime_r(when, &tm);
-
- /* we know all components, thus it is safe to use sprintf */
- sprintf(buf, "%s, %d %s %d %02d:%02d:%02d GMT", week_days[tm.tm_wday], tm.tm_mday, month_names[tm.tm_mon], tm.tm_year + 1900, tm.tm_hour, tm.tm_min, tm.tm_sec);
- strcat(ubuf, buf);
-}
-
-static void last_modified(void)
-{
- char *path;
- struct stat sb;
- char buf[MAX_STR + 1];
- SLS_FETCH();
-
- path = SG(request_info).path_translated;
- if (path) {
- if (stat(path, &sb) == -1) {
- return;
- }
-
- strcpy(buf, "Last-Modified: ");
- strcat_gmt(buf, &sb.st_mtime);
- ADD_COOKIE(buf);
- }
-}
-
-CACHE_LIMITER_FUNC(public)
-{
- char buf[MAX_STR + 1];
- time_t now;
-
- time(&now);
- now += PS(cache_expire) * 60;
- strcpy(buf, "Expires: ");
- strcat_gmt(buf, &now);
- ADD_COOKIE(buf);
-
- sprintf(buf, "Cache-Control: public, max-age=%d", PS(cache_expire) * 60);
- ADD_COOKIE(buf);
-
- last_modified();
-}
-
-CACHE_LIMITER_FUNC(private)
-{
- char buf[MAX_STR + 1];
-
- ADD_COOKIE("Expires: Thu, 19 Nov 1981 08:52:00 GMT");
- sprintf(buf, "Cache-Control: private, max-age=%d", PS(cache_expire) * 60);
- ADD_COOKIE(buf);
-
- last_modified();
-}
-
-CACHE_LIMITER_FUNC(nocache)
-{
- ADD_COOKIE("Expires: Thu, 19 Nov 1981 08:52:00 GMT");
- /* For HTTP/1.1 conforming clients */
- ADD_COOKIE("Cache-Control: no-cache");
- /* For HTTP/1.0 conforming clients */
- ADD_COOKIE("Pragma: no-cache");
-}
-
-static php_session_cache_limiter php_session_cache_limiters[] = {
- CACHE_LIMITER(public)
- CACHE_LIMITER(private)
- CACHE_LIMITER(nocache)
- {0}
-};
-
-
-static void _php_session_cache_limiter(PSLS_D)
-{
- php_session_cache_limiter *lim;
-
- for (lim = php_session_cache_limiters; lim->name; lim++) {
- if (!strcasecmp(lim->name, PS(cache_limiter))) {
- lim->func(PSLS_C);
- break;
- }
- }
-}
-
-#define COOKIE_FMT "Set-Cookie: %s=%s"
-#define COOKIE_EXPIRES "; expires="
-#define COOKIE_PATH "; path="
-#define COOKIE_DOMAIN "; domain="
-
-static void _php_session_send_cookie(PSLS_D)
-{
- int len;
- int pathlen;
- int domainlen;
- char *cookie;
- char *date_fmt = NULL;
-
- len = strlen(PS(session_name)) + strlen(PS(id)) + sizeof(COOKIE_FMT);
- if (PS(cookie_lifetime) > 0) {
- date_fmt = php3_std_date(time(NULL) + PS(cookie_lifetime));
- len += sizeof(COOKIE_EXPIRES) + strlen(date_fmt);
- }
-
- pathlen = strlen(PS(cookie_path));
- if (pathlen > 0) {
- len += pathlen + sizeof(COOKIE_PATH);
- }
-
- domainlen = strlen(PS(cookie_domain));
- if (domainlen > 0) {
- len += domainlen + sizeof(COOKIE_DOMAIN);
- }
-
- cookie = ecalloc(len + 1, 1);
-
- len = snprintf(cookie, len, COOKIE_FMT, PS(session_name), PS(id));
- if (PS(cookie_lifetime) > 0) {
- strcat(cookie, COOKIE_EXPIRES);
- strcat(cookie, date_fmt);
- len += strlen(COOKIE_EXPIRES) + strlen(date_fmt);
- efree(date_fmt);
- }
-
- if (pathlen > 0) {
- strcat(cookie, COOKIE_PATH);
- strcat(cookie, PS(cookie_path));
- }
-
- if (domainlen > 0) {
- strcat(cookie, COOKIE_DOMAIN);
- strcat(cookie, PS(cookie_domain));
- }
-
- sapi_add_header(cookie, len);
-}
-
-static ps_module *_php_find_ps_module(char *name PSLS_DC)
-{
- ps_module *ret = NULL;
- ps_module **mod;
- ps_module **end = ps_modules + (sizeof(ps_modules)/sizeof(ps_module*));
-
- for(mod = ps_modules; mod < end; mod++) {
- if(*mod && !strcasecmp(name, (*mod)->name)) {
- ret = *mod;
- break;
- }
- }
-
- return ret;
-}
-
-static const ps_serializer *_php_find_ps_serializer(char *name PSLS_DC)
-{
- const ps_serializer *ret = NULL;
- const ps_serializer *mod;
-
- for(mod = ps_serializers; mod->name; mod++) {
- if(!strcasecmp(name, mod->name)) {
- ret = mod;
- break;
- }
- }
-
- return ret;
-}
-
-static void _php_session_start(PSLS_D)
-{
- pval **ppid;
- pval **data;
- char *p;
- int send_cookie = 1;
- int define_sid = 1;
- int module_number = PS(module_number);
- int nrand;
- int lensess;
- ELS_FETCH();
-
- if (PS(nr_open_sessions) != 0) return;
-
- lensess = strlen(PS(session_name));
-
- /* check whether a symbol with the name of the session exists
- in the global symbol table */
-
- if(!PS(id) &&
- zend_hash_find(&EG(symbol_table), PS(session_name),
- lensess + 1, (void **) &ppid) == SUCCESS) {
- convert_to_string((*ppid));
- PS(id) = estrndup((*ppid)->value.str.val, (*ppid)->value.str.len);
- send_cookie = 0;
- }
-
- /* if the previous section was successful, we check whether
- a symbol with the name of the session exists in the global
- HTTP_COOKIE_VARS array */
-
- if(!send_cookie &&
- zend_hash_find(&EG(symbol_table), "HTTP_COOKIE_VARS",
- sizeof("HTTP_COOKIE_VARS"), (void **) &data) == SUCCESS &&
- (*data)->type == IS_ARRAY &&
- zend_hash_find((*data)->value.ht, PS(session_name),
- lensess + 1, (void **) &ppid) == SUCCESS) {
- define_sid = 0;
- }
-
- /* check the REQUEST_URI symbol for a string of the form
- '<session-name>=<session-id>' to allow URLs of the form
- http://yoursite/<session-name>=<session-id>/script.php */
-
- if(!PS(id) &&
- zend_hash_find(&EG(symbol_table), "REQUEST_URI",
- sizeof("REQUEST_URI"), (void **) &data) == SUCCESS &&
- (*data)->type == IS_STRING &&
- (p = strstr((*data)->value.str.val, PS(session_name))) &&
- p[lensess] == '=') {
- char *q;
-
- p += lensess + 1;
- if((q = strpbrk(p, "/?\\")))
- PS(id) = estrndup(p, q - p);
- }
-
- /* check whether the current request was referred to by
- an external site which invalidates the previously found id */
-
- if(PS(id) &&
- PS(extern_referer_chk)[0] != '\0' &&
- zend_hash_find(&EG(symbol_table), "HTTP_REFERER",
- sizeof("HTTP_REFERER"), (void **) &data) == SUCCESS &&
- (*data)->type == IS_STRING &&
- (*data)->value.str.len != 0 &&
- strstr((*data)->value.str.val, PS(extern_referer_chk)) == NULL) {
- efree(PS(id));
- PS(id) = NULL;
- send_cookie = 1;
- define_sid = 1;
- }
-
- if(!PS(id)) {
- PS(id) = _php_create_id(NULL PSLS_CC);
- }
-
- if(!PS(use_cookies) && send_cookie) {
- define_sid = 1;
- send_cookie = 0;
- }
-
- if(send_cookie) {
- _php_session_send_cookie(PSLS_C);
- }
-
- if(define_sid) {
- char *buf;
-
- buf = emalloc(strlen(PS(session_name)) + strlen(PS(id)) + 5);
- sprintf(buf, "%s=%s", PS(session_name), PS(id));
- REGISTER_STRING_CONSTANT("SID", buf, 0);
- } else {
- REGISTER_STRING_CONSTANT("SID", empty_string, 0);
- }
- PS(define_sid) = define_sid;
-
- PS(nr_open_sessions)++;
-
- _php_session_cache_limiter(PSLS_C);
- _php_session_initialize(PSLS_C);
-
- if(PS(mod_data) && PS(gc_probability) > 0) {
- srand(time(NULL));
- nrand = (int) (100.0*rand()/RAND_MAX);
- if(nrand < PS(gc_probability))
- PS(mod)->gc(&PS(mod_data), PS(gc_maxlifetime));
- }
-}
-
-static void _php_session_destroy(PSLS_D)
-{
- if(PS(nr_open_sessions) == 0)
- {
- php_error(E_WARNING, "Trying to destroy uninitialized session");
- return;
- }
-
- PS(mod)->destroy(&PS(mod_data), PS(id));
- php_rshutdown_session_globals(PSLS_C);
- php_rinit_session_globals(PSLS_C);
-}
-
-/* {{{ proto string session_name([string newname])
- return the current session name. if newname is given, the session name is replaced with newname */
-PHP_FUNCTION(session_name)
-{
- pval **p_name;
- int ac = ARG_COUNT(ht);
- char *old;
- PSLS_FETCH();
-
- old = estrdup(PS(session_name));
-
- if(ac < 0 || ac > 1 || getParametersEx(ac, &p_name) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- if(ac == 1) {
- convert_to_string_ex(p_name);
- efree(PS(session_name));
- PS(session_name) = estrndup((*p_name)->value.str.val, (*p_name)->value.str.len);
- }
-
- RETVAL_STRING(old, 0);
-}
-/* }}} */
-
-/* {{{ proto string session_module_name([string newname])
- return the current module name used for accessing session data. if newname is given, the module name is replaced with newname */
-PHP_FUNCTION(session_module_name)
-{
- pval **p_name;
- int ac = ARG_COUNT(ht);
- char *old;
- PSLS_FETCH();
-
- old = estrdup(PS(mod)->name);
-
- if(ac < 0 || ac > 1 || getParametersEx(ac, &p_name) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- if(ac == 1) {
- ps_module *tempmod;
-
- convert_to_string_ex(p_name);
- tempmod = _php_find_ps_module((*p_name)->value.str.val PSLS_CC);
- if(tempmod) {
- if(PS(mod_data))
- PS(mod)->close(&PS(mod_data));
- PS(mod_data) = tempmod;
- } else {
- efree(old);
- php_error(E_ERROR, "Cannot find named PHP session module (%s)",
- (*p_name)->value.str.val);
- RETURN_FALSE;
- }
- }
-
- RETVAL_STRING(old, 0);
-}
-/* }}} */
-
-/* {{{ proto void session_set_save_handler(string open, string close, string read, string write, string destroy, string gc)
- sets user-level functions */
-PHP_FUNCTION(session_set_save_handler)
-{
- zval **args[6];
- int i;
- ps_user *mdata;
- PSLS_FETCH();
-
- if(ARG_COUNT(ht) != 6 || getParametersArrayEx(6, args) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- if(PS(nr_open_sessions) > 0) {
- RETURN_FALSE;
- }
-
- PS(mod) = _php_find_ps_module("user" PSLS_CC);
-
- mdata = emalloc(sizeof *mdata);
-
- for(i = 0; i < 6; i++) {
- convert_to_string_ex(args[i]);
- mdata->names[i] = estrdup((*args[i])->value.str.val);
- }
-
- PS(mod_data) = (void *) mdata;
-
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto string session_save_path([string newname])
- return the current save path passed to module_name. if newname is given, the save path is replaced with newname */
-PHP_FUNCTION(session_save_path)
-{
- pval **p_name;
- int ac = ARG_COUNT(ht);
- char *old;
- PSLS_FETCH();
-
- old = estrdup(PS(save_path));
-
- if(ac < 0 || ac > 1 || getParametersEx(ac, &p_name) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- if(ac == 1) {
- convert_to_string_ex(p_name);
- efree(PS(save_path));
- PS(save_path) = estrndup((*p_name)->value.str.val, (*p_name)->value.str.len);
- }
-
- RETVAL_STRING(old, 0);
-}
-/* }}} */
-
-/* {{{ proto string session_id([string newid])
- return the current session id. if newid is given, the session id is replaced with newid */
-PHP_FUNCTION(session_id)
-{
- pval **p_name;
- int ac = ARG_COUNT(ht);
- char *old = empty_string;
- PSLS_FETCH();
-
- if(PS(id))
- old = estrdup(PS(id));
-
- if(ac < 0 || ac > 1 || getParametersEx(ac, &p_name) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- if(ac == 1) {
- convert_to_string_ex(p_name);
- if(PS(id)) efree(PS(id));
- PS(id) = estrndup((*p_name)->value.str.val, (*p_name)->value.str.len);
- }
-
- RETVAL_STRING(old, 0);
-}
-/* }}} */
-
-
-/* {{{ static void php_register_var(zval** entry PSLS_DC PLS_DC) */
-static void php_register_var(zval** entry PSLS_DC PLS_DC)
-{
- zval** value;
-
- if ((*entry)->type == IS_ARRAY) {
- zend_hash_internal_pointer_reset((*entry)->value.ht);
-
- while(zend_hash_get_current_data((*entry)->value.ht, (void**)&value) == SUCCESS) {
- php_register_var(value PSLS_CC PLS_CC);
- zend_hash_move_forward((*entry)->value.ht);
- }
- } else if (!PG(track_vars) || strcmp((*entry)->value.str.val, "HTTP_STATE_VARS") != 0) {
- convert_to_string_ex(entry);
-
- PS_ADD_VARL((*entry)->value.str.val, (*entry)->value.str.len);
- }
-}
-/* }}} */
-
-
-/* {{{ proto bool session_register(string var_name | array var_names [, ... ])
- adds varname(s) to the list of variables which are freezed at the session end */
-PHP_FUNCTION(session_register)
-{
- zval*** args;
- int argc = ARG_COUNT(ht);
- int i;
- PSLS_FETCH();
- PLS_FETCH();
-
- if (argc <= 0) {
- RETURN_FALSE;
- } else
- args = (zval ***)emalloc(argc * sizeof(zval **));
-
- if (getParametersArrayEx(argc, args) == FAILURE) {
- efree(args);
- WRONG_PARAM_COUNT;
- }
-
- if(!PS(nr_open_sessions)) _php_session_start(PSLS_C);
-
- for (i=0; i<argc; i++)
- {
- if ((*args[i])->type == IS_ARRAY) {
- SEPARATE_ZVAL(args[i]);
- }
- php_register_var(args[i] PSLS_CC PLS_CC);
- }
-
- efree(args);
-
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool session_unregister(string varname)
- removes varname from the list of variables which are freezed at the session end */
-PHP_FUNCTION(session_unregister)
-{
- pval **p_name;
- int ac = ARG_COUNT(ht);
- PSLS_FETCH();
-
- if(ac != 1 || getParametersEx(ac, &p_name) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- convert_to_string_ex(p_name);
-
- PS_DEL_VAR((*p_name)->value.str.val);
-
- RETURN_TRUE;
-}
-/* }}} */
-
-
-/* {{{ proto bool session_is_registered(string varname)
- checks if a variable is registered in session */
-PHP_FUNCTION(session_is_registered)
-{
- pval **p_name;
- pval *p_var;
- int ac = ARG_COUNT(ht);
- PSLS_FETCH();
-
- if(ac != 1 || getParametersEx(ac, &p_name) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- convert_to_string_ex(p_name);
-
- if (zend_hash_find(&PS(vars), (*p_name)->value.str.val, (*p_name)->value.str.len+1,
- (void **)&p_var) == SUCCESS) {
- RETURN_TRUE;
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-
-/* {{{ proto string session_encode()
- serializes the current setup and returns the serialized representation */
-PHP_FUNCTION(session_encode)
-{
- int len;
- char *enc;
- PSLS_FETCH();
-
- enc = _php_session_encode(&len PSLS_CC);
- RETVAL_STRINGL(enc, len, 0);
-}
-/* }}} */
-
-/* {{{ proto session_decode(string data)
- deserializes data and reinitializes the variables */
-PHP_FUNCTION(session_decode)
-{
- pval **str;
- PSLS_FETCH();
-
- if(ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- convert_to_string_ex(str);
-
- _php_session_decode((*str)->value.str.val, (*str)->value.str.len PSLS_CC);
-}
-/* }}} */
-
-/* {{{ proto session_start()
- Begin session - reinitializes freezed variables, registers browsers etc */
-PHP_FUNCTION(session_start)
-{
- PSLS_FETCH();
-
- _php_session_start(PSLS_C);
-
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto session_destroy()
- Destroy the current session and all data associated with it */
-PHP_FUNCTION(session_destroy)
-{
- PSLS_FETCH();
-
- _php_session_destroy(PSLS_C);
-}
-/* }}} */
-
-#ifdef TRANS_SID
-void session_adapt_uris(const char *src, uint srclen, char **new, uint *newlen)
-{
- char *data;
- size_t len;
- char buf[512];
- PSLS_FETCH();
-
- if(PS(define_sid) && PS(nr_open_sessions) > 0) {
- snprintf(buf, sizeof(buf), "%s=%s", PS(session_name), PS(id));
- data = url_adapt(src, srclen, buf, &len);
- *new = data;
- *newlen = len;
- }
-}
-#endif
-
-/* {{{ proto session_unset()
- Unset all registered variables */
-PHP_FUNCTION(session_unset)
-{
- zval **tmp;
- char *variable;
- ulong num_key;
- ELS_FETCH();
- PSLS_FETCH();
-
- for(zend_hash_internal_pointer_reset(&PS(vars));
- zend_hash_get_current_key(&PS(vars), &variable, &num_key) == HASH_KEY_IS_STRING;
- zend_hash_move_forward(&PS(vars))) {
- if(zend_hash_find(&EG(symbol_table), variable, strlen(variable) + 1, (void **) &tmp)
- == SUCCESS) {
- zend_hash_del(&EG(symbol_table), variable, strlen(variable) + 1);
- }
- efree(variable);
- }
-}
-/* }}} */
-
-static void php_rinit_session_globals(PSLS_D)
-{
- PS(mod) = _php_find_ps_module(INI_STR("session.save_handler") PSLS_CC);
- PS(serializer) = \
- _php_find_ps_serializer(INI_STR("session.serialize_handler") PSLS_CC);
-
- zend_hash_init(&PS(vars), 0, NULL, NULL, 0);
- PS(define_sid) = 0;
- PS(use_cookies) = INI_BOOL("session.use_cookies");
- PS(save_path) = estrdup(INI_STR("session.save_path"));
- PS(session_name) = estrdup(INI_STR("session.name"));
- PS(entropy_file) = estrdup(INI_STR("session.entropy_file"));
- PS(entropy_length) = INI_INT("session.entropy_length");
- PS(gc_probability) = INI_INT("session.gc_probability");
- PS(gc_maxlifetime) = INI_INT("session.gc_maxlifetime");
- PS(extern_referer_chk) = estrdup(INI_STR("session.referer_check"));
- PS(id) = NULL;
- PS(cookie_lifetime) = INI_INT("session.cookie_lifetime");
- PS(cookie_path) = estrdup(INI_STR("session.cookie_path"));
- PS(cookie_domain) = estrdup(INI_STR("session.cookie_domain"));
- PS(cache_limiter) = estrdup(INI_STR("session.cache_limiter"));
- PS(cache_expire) = INI_INT("session.cache_expire");
- PS(nr_open_sessions) = 0;
- PS(mod_data) = NULL;
-}
-
-static void php_rshutdown_session_globals(PSLS_D)
-{
- if(PS(mod_data))
- PS(mod)->close(&PS(mod_data));
- if(PS(entropy_file)) efree(PS(entropy_file));
- if(PS(extern_referer_chk)) efree(PS(extern_referer_chk));
- if(PS(save_path)) efree(PS(save_path));
- if(PS(session_name)) efree(PS(session_name));
- if(PS(id)) efree(PS(id));
- efree(PS(cache_limiter));
- efree(PS(cookie_path));
- efree(PS(cookie_domain));
- zend_hash_destroy(&PS(vars));
-}
-
-void _php_session_auto_start(void *data)
-{
- PSLS_FETCH();
-
- _php_session_start(PSLS_C);
-}
-
-PHP_RINIT_FUNCTION(session)
-{
- PSLS_FETCH();
-
- php_rinit_session_globals(PSLS_C);
-
- if(PS(mod) == NULL) {
- /* current status is unusable */
- PS(nr_open_sessions) = -1;
- return SUCCESS;
- }
-
- if (INI_INT("session.auto_start")) {
- php_register_post_request_startup(_php_session_auto_start, NULL);
- }
-
- return SUCCESS;
-}
-
-PHP_RSHUTDOWN_FUNCTION(session)
-{
- PSLS_FETCH();
-
- if(PS(nr_open_sessions) > 0) {
- _php_session_save_current_state(PSLS_C);
- PS(nr_open_sessions)--;
- }
- php_rshutdown_session_globals(PSLS_C);
- return SUCCESS;
-}
-
-PHP_MINIT_FUNCTION(session)
-{
-#ifdef ZTS
- php_ps_globals *ps_globals;
-
- ps_globals_id = ts_allocate_id(sizeof(php_ps_globals), NULL, NULL);
- ps_globals = ts_resource(ps_globals_id);
-#endif
-
- PS(module_number) = module_number;
- REGISTER_INI_ENTRIES();
- return SUCCESS;
-}
-
-PHP_MSHUTDOWN_FUNCTION(session)
-{
- UNREGISTER_INI_ENTRIES();
- return SUCCESS;
-}
-
-
-PHP_MINFO_FUNCTION(session)
-{
- DISPLAY_INI_ENTRIES();
-}
diff --git a/ext/session/setup.stub b/ext/session/setup.stub
deleted file mode 100644
index 33ca6e8664..0000000000
--- a/ext/session/setup.stub
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Source$
-# $Id$
-
-define_option with-session 'session support?' yesnodir no \
-' Whether to build the session extension.'
-
View Lorry Controller Status