 |
 |
 |
 |
|
|
Date: 06/26/98
- Next message: Shane Caraveo: "RE: [PHP-DEV] php 3.1 status"
- Previous message: zeev: "[PHP-DEV] CVS update: php31/main"
- Next in thread: shane: "[PHP-DEV] CVS update: php31/sapi"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Friday June 26, 1998 @ 12:53
Author: zeev
Update of /repository/php31/sapi
In directory asf:/tmp/cvs-serv8683/sapi
Modified Files:
apache_sapi.c cgi_sapi.c fhttpd_sapi.c isapi_sapi.c sapi.h
Log Message:
I doubt that's all that missing, but here it is anyway
Index: php31/sapi/apache_sapi.c
diff -c php31/sapi/apache_sapi.c:1.7 php31/sapi/apache_sapi.c:1.8
*** php31/sapi/apache_sapi.c:1.7 Thu Jun 25 20:59:09 1998
--- php31/sapi/apache_sapi.c Fri Jun 26 12:53:41 1998
***************
*** 471,479 ****
/******************************************************************************
! /* code from main.c in hash_environment()
/*****************************************************************************/
! void sapi_hash_server_env(SAPI_GLOBAL_INCLUDE_V){
SAPI_FUNC_VARS;
pval *tmp_ptr, tmp2, tmp;
char *t;
--- 471,479 ----
/******************************************************************************
! /* code from main.c in _php3_hashenvironment()
/*****************************************************************************/
! void sapi__php3_hashserver_env(SAPI_GLOBAL_INCLUDE_V){
SAPI_FUNC_VARS;
pval *tmp_ptr, tmp2, tmp;
char *t;
***************
*** 493,513 ****
tmp.value.str.val = empty_string;
}
tmp.type = IS_STRING;
! if (hash_update(&GLOBAL(symbol_table), t, len + 1, &tmp, sizeof(pval), NULL) == FAILURE) {
STR_FREE(tmp.value.str.val);
}
efree(t);
}
/* insert special variables */
! if (hash_find(&GLOBAL(symbol_table), "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME"), (void **) & tmp_ptr) == SUCCESS) {
tmp2 = *tmp_ptr;
yystype_copy_constructor(&tmp2);
! hash_update(&GLOBAL(symbol_table), "PATH_TRANSLATED", sizeof("PATH_TRANSLATED"), (void *) & tmp2, sizeof(pval), NULL);
}
tmp.value.str.len = strlen(php3_rqst->uri);
tmp.value.str.val = estrndup(php3_rqst->uri, tmp.value.str.len);
tmp.type = IS_STRING;
! hash_update(&GLOBAL(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval), NULL);
}
/*
--- 493,513 ----
tmp.value.str.val = empty_string;
}
tmp.type = IS_STRING;
! if (_php3_hashupdate(&GLOBAL(symbol_table), t, len + 1, &tmp, sizeof(pval), NULL) == FAILURE) {
STR_FREE(tmp.value.str.val);
}
efree(t);
}
/* insert special variables */
! if (_php3_hashfind(&GLOBAL(symbol_table), "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME"), (void **) & tmp_ptr) == SUCCESS) {
tmp2 = *tmp_ptr;
yystype_copy_constructor(&tmp2);
! _php3_hashupdate(&GLOBAL(symbol_table), "PATH_TRANSLATED", sizeof("PATH_TRANSLATED"), (void *) & tmp2, sizeof(pval), NULL);
}
tmp.value.str.len = strlen(php3_rqst->uri);
tmp.value.str.val = estrndup(php3_rqst->uri, tmp.value.str.len);
tmp.type = IS_STRING;
! _php3_hashupdate(&GLOBAL(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval), NULL);
}
/*
***************
*** 556,562 ****
sapi_info->send_header=sapi_send_header;
sapi_info->headers=NULL;
! sapi_info->hash_server_env=sapi_hash_server_env;
sapi_info->register_clean=sapi_register_cleanup;
sapi_info->request_shutdown=sapi_request_shutdown;
#if defined(CRASH_DETECTION)
--- 556,562 ----
sapi_info->send_header=sapi_send_header;
sapi_info->headers=NULL;
! sapi_info->_php3_hashserver_env=sapi__php3_hashserver_env;
sapi_info->register_clean=sapi_register_cleanup;
sapi_info->request_shutdown=sapi_request_shutdown;
#if defined(CRASH_DETECTION)
Index: php31/sapi/cgi_sapi.c
diff -c php31/sapi/cgi_sapi.c:1.16 php31/sapi/cgi_sapi.c:1.17
*** php31/sapi/cgi_sapi.c:1.16 Mon Jun 8 11:13:19 1998
--- php31/sapi/cgi_sapi.c Fri Jun 26 12:53:42 1998
***************
*** 102,110 ****
#endif
/******************************************************************************
! /* code from main.c in hash_environment()
/*****************************************************************************/
! void sapi_hash_server_env(SAPI_GLOBAL_INCLUDE_V){
pval tmp;
/* Build the special-case PHP_SELF variable for the CGI version */
char *sn, *pi;
--- 102,110 ----
#endif
/******************************************************************************
! /* code from main.c in _php3_hashenvironment()
/*****************************************************************************/
! void sapi__php3_hashserver_env(SAPI_GLOBAL_INCLUDE_V){
pval tmp;
/* Build the special-case PHP_SELF variable for the CGI version */
char *sn, *pi;
***************
*** 125,133 ****
tmp.value.str.len = _php3_sprintf(tmp.value.str.val, "%s%s", (sn ? sn : ""), (pi ? pi : "")); /* SAFE */
tmp.type = IS_STRING;
#ifdef THREAD_SAFE
! hash_update(&php3_globals->symbol_table, "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval), NULL);
#else
! hash_update(&symbol_table, "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval), NULL);
#endif
}
--- 125,133 ----
tmp.value.str.len = _php3_sprintf(tmp.value.str.val, "%s%s", (sn ? sn : ""), (pi ? pi : "")); /* SAFE */
tmp.type = IS_STRING;
#ifdef THREAD_SAFE
! _php3_hashupdate(&php3_globals->symbol_table, "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval), NULL);
#else
! _php3_hashupdate(&symbol_table, "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval), NULL);
#endif
}
***************
*** 180,186 ****
sapi_info->page_inode=0;
sapi_info->page_mtime=0;
! sapi_info->hash_server_env=sapi_hash_server_env;
sapi_info->register_clean=sapi_reqister_cleanup;
sapi_info->request_shutdown=sapi_request_shutdown;
#if defined(CRASH_DETECTION)
--- 180,186 ----
sapi_info->page_inode=0;
sapi_info->page_mtime=0;
! sapi_info->_php3_hashserver_env=sapi__php3_hashserver_env;
sapi_info->register_clean=sapi_reqister_cleanup;
sapi_info->request_shutdown=sapi_request_shutdown;
#if defined(CRASH_DETECTION)
Index: php31/sapi/fhttpd_sapi.c
diff -c php31/sapi/fhttpd_sapi.c:1.5 php31/sapi/fhttpd_sapi.c:1.6
*** php31/sapi/fhttpd_sapi.c:1.5 Wed Jun 3 01:45:29 1998
--- php31/sapi/fhttpd_sapi.c Fri Jun 26 12:53:42 1998
***************
*** 124,132 ****
#endif
/******************************************************************************
! /* code from main.c in hash_environment()
/*****************************************************************************/
! void sapi_hash_server_env(void *php3_globals_var){
SAPI_FUNC_VARS;
{
int i, j;
--- 124,132 ----
#endif
/******************************************************************************
! /* code from main.c in _php3_hashenvironment()
/*****************************************************************************/
! void sapi__php3_hashserver_env(void *php3_globals_var){
SAPI_FUNC_VARS;
{
int i, j;
***************
*** 136,142 ****
tmp.value.str.len = strlen(req->lines[i].params[1]);
tmp.value.str.val = estrndup(req->lines[i].params[1], tmp.value.str.len);
tmp.type = IS_STRING;
! if (hash_update(&GLOBAL(symbol_table), req->lines[i].params[0],
strlen(req->lines[i].params[0]) + 1,
&tmp, sizeof(pval), NULL) == FAILURE) {
efree(tmp.value.str.val);
--- 136,142 ----
tmp.value.str.len = strlen(req->lines[i].params[1]);
tmp.value.str.val = estrndup(req->lines[i].params[1], tmp.value.str.len);
tmp.type = IS_STRING;
! if (_php3_hashupdate(&GLOBAL(symbol_table), req->lines[i].params[0],
strlen(req->lines[i].params[0]) + 1,
&tmp, sizeof(pval), NULL) == FAILURE) {
efree(tmp.value.str.val);
***************
*** 148,154 ****
tmp.value.str.len = i;
tmp.value.str.val = estrndup(req->script_name_resolved, i);
tmp.type = IS_STRING;
! if (hash_update(&GLOBAL(symbol_table), "PATH_TRANSLATED",
sizeof("PATH_TRANSLATED"),
&tmp, sizeof(pval), NULL) == FAILURE) {
efree(tmp.value.str.val);
--- 148,154 ----
tmp.value.str.len = i;
tmp.value.str.val = estrndup(req->script_name_resolved, i);
tmp.type = IS_STRING;
! if (_php3_hashupdate(&GLOBAL(symbol_table), "PATH_TRANSLATED",
sizeof("PATH_TRANSLATED"),
&tmp, sizeof(pval), NULL) == FAILURE) {
efree(tmp.value.str.val);
***************
*** 161,167 ****
tmp.value.str.len = j;
tmp.value.str.val = estrndup(req->script_name_resolved, j);
tmp.type = IS_STRING;
! if (hash_update(&GLOBAL(symbol_table), "DOCUMENT_ROOT",
sizeof("DOCUMENT_ROOT"),
&tmp, sizeof(pval), NULL) == FAILURE) {
efree(tmp.value.str.val);
--- 161,167 ----
tmp.value.str.len = j;
tmp.value.str.val = estrndup(req->script_name_resolved, j);
tmp.type = IS_STRING;
! if (_php3_hashupdate(&GLOBAL(symbol_table), "DOCUMENT_ROOT",
sizeof("DOCUMENT_ROOT"),
&tmp, sizeof(pval), NULL) == FAILURE) {
efree(tmp.value.str.val);
Index: php31/sapi/isapi_sapi.c
diff -c php31/sapi/isapi_sapi.c:1.16 php31/sapi/isapi_sapi.c:1.17
*** php31/sapi/isapi_sapi.c:1.16 Thu Jun 25 20:59:09 1998
--- php31/sapi/isapi_sapi.c Fri Jun 26 12:53:42 1998
***************
*** 216,224 ****
#endif
/******************************************************************************
! /* code from main.c in hash_environment()
/*****************************************************************************/
! void sapi_hash_server_env(SAPI_GLOBAL_INCLUDE_V){
SAPI_FUNC_VARS;
pval tmp;
--- 216,224 ----
#endif
/******************************************************************************
! /* code from main.c in _php3_hashenvironment()
/*****************************************************************************/
! void sapi__php3_hashserver_env(SAPI_GLOBAL_INCLUDE_V){
SAPI_FUNC_VARS;
pval tmp;
***************
*** 239,245 ****
tmp.value.str.val = emalloc(l + 1);
tmp.value.str.len = _php3_sprintf(tmp.value.str.val, "%s%s", (sn ? sn : ""), (pi ? pi : "")); /* SAFE */
tmp.type = IS_STRING;
! hash_update(&php3_globals->symbol_table, "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval), NULL);
}
--- 239,245 ----
tmp.value.str.val = emalloc(l + 1);
tmp.value.str.len = _php3_sprintf(tmp.value.str.val, "%s%s", (sn ? sn : ""), (pi ? pi : "")); /* SAFE */
tmp.type = IS_STRING;
! _php3_hashupdate(&php3_globals->symbol_table, "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval), NULL);
}
***************
*** 333,339 ****
sapi_info->send_header=sapi_send_header;
sapi_info->headers=NULL;
! sapi_info->hash_server_env=sapi_hash_server_env;
sapi_info->register_clean=sapi_reqister_cleanup;
sapi_info->request_shutdown=sapi_request_shutdown;
#if defined(CRASH_DETECTION)
--- 333,339 ----
sapi_info->send_header=sapi_send_header;
sapi_info->headers=NULL;
! sapi_info->_php3_hashserver_env=sapi__php3_hashserver_env;
sapi_info->register_clean=sapi_reqister_cleanup;
sapi_info->request_shutdown=sapi_request_shutdown;
#if defined(CRASH_DETECTION)
Index: php31/sapi/sapi.h
diff -c php31/sapi/sapi.h:1.15 php31/sapi/sapi.h:1.16
*** php31/sapi/sapi.h:1.15 Thu Jun 25 20:59:10 1998
--- php31/sapi/sapi.h Fri Jun 26 12:53:42 1998
***************
*** 80,86 ****
void (*unblockalarms)(SAPI_GLOBAL_INCLUDE_V); /*signal blocking*/
/* FIXME these functions need definet work */
! void (*hash_server_env)(SAPI_GLOBAL_INCLUDE_V);
/* so far, apache specific */
void (*register_clean)(SAPI_GLOBAL_INCLUDE void *, void *, void *);
--- 80,86 ----
void (*unblockalarms)(SAPI_GLOBAL_INCLUDE_V); /*signal blocking*/
/* FIXME these functions need definet work */
! void (*_php3_hashserver_env)(SAPI_GLOBAL_INCLUDE_V);
/* so far, apache specific */
void (*register_clean)(SAPI_GLOBAL_INCLUDE void *, void *, void *);
- Next message: Shane Caraveo: "RE: [PHP-DEV] php 3.1 status"
- Previous message: zeev: "[PHP-DEV] CVS update: php31/main"
- Next in thread: shane: "[PHP-DEV] CVS update: php31/sapi"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]