CVS update: php31/main
| From: | zeev | Date: | Sun, 11 Oct 1998 13:11:56 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1818@lists.php.net to get a copy of this message | ||
Date: Sunday October 11, 1998 @ 9:11
Author: zeev
Update of /repository/php31/main
In directory asf:/u2/tmp/cvs-serv1923/main
Modified Files:
main.c variables.c
Log Message:
3.0 patches:
unset() of improperly parsed variables
shutdown function generalization (fixes CGIs)
Index: php31/main/main.c
diff -c php31/main/main.c:2.41 php31/main/main.c:2.42
*** php31/main/main.c:2.41 Tue Sep 22 21:00:32 1998
--- php31/main/main.c Sun Oct 11 09:11:55 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.41 1998/09/23 01:00:32 shane Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.42 1998/10/11 13:11:55 zeev Exp $ */
/* #define CRASH_DETECTION */
***************
*** 697,702 ****
--- 697,704 ----
debug_log("php3_request_shutdown()\n");
#endif
+ php3_call_shutdown_functions();
+
if (GLOBAL(initialized) & INIT_SYMBOL_TABLE) {
_php3_hash_destroy(&GLOBAL(symbol_table));
GLOBAL(initialized) &= ~INIT_SYMBOL_TABLE;
***************
*** 1651,1657 ****
debug_log("%d:start request shutdown\n", GetCurrentThreadId());
#endif
php3_header(); /* Make sure headers have been sent */
- php3_call_shutdown_functions();
php3_request_shutdown((void *) GLOBAL(sapi_rqst) _INLINE_TLS);
#if defined(CRASH_DETECTION)
debug_log("%d:request shutdown done\n", GetCurrentThreadId());
--- 1653,1658 ----
Index: php31/main/variables.c
diff -c php31/main/variables.c:2.7 php31/main/variables.c:2.8
*** php31/main/variables.c:2.7 Sat Sep 19 12:50:32 1998
--- php31/main/variables.c Sun Oct 11 09:11:56 1998
***************
*** 29,35 ****
*/
! /* $Id: variables.c,v 2.7 1998/09/19 16:50:32 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 29,35 ----
*/
! /* $Id: variables.c,v 2.8 1998/10/11 13:11:56 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 457,462 ****
--- 457,464 ----
if (!var_ptr || var_ptr->cs_data.array_write) { /* variable didn't exist before unset(),
remove it completely */
clean_unassigned_variable_top(1 _INLINE_TLS);
+ } else if (!(var=var_ptr->value.varptr.pvalue)) { /* the variable didn't parse properly,
so it was obviously not set */
+ result->value.lval = 1;
} else {
var = var_ptr->value.varptr.pvalue;
pval_destructor(var _INLINE_TLS);
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net