CVS update: php31/main
| From: | shane | Date: | Fri, 21 Aug 1998 16:41:06 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-424@lists.php.net to get a copy of this message | ||
Date: Friday August 21, 1998 @ 12:41
Author: shane
Update of /repository/php31/main
In directory asf:/tmp/cvs-serv28030/main
Modified Files:
control_structures_inline.h language-parser.y main.c main.h
php.h
Log Message:
Get everything fixed for windows, cgi working again, now will backtrack to get
interactive mode working.
Index: php31/main/control_structures_inline.h
diff -c php31/main/control_structures_inline.h:2.7 php31/main/control_structures_inline.h:2.8
*** php31/main/control_structures_inline.h:2.7 Thu Aug 20 23:48:56 1998
--- php31/main/control_structures_inline.h Fri Aug 21 12:41:05 1998
***************
*** 29,35 ****
*/
! /* $Id: control_structures_inline.h,v 2.7 1998/08/21 03:48:56 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 29,35 ----
*/
! /* $Id: control_structures_inline.h,v 2.8 1998/08/21 16:41:05 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 663,670 ****
GLOBAL(ExecuteFlag) = DONT_EXECUTE;
GLOBAL(Execute) = SHOULD_EXECUTE;
} else {
- int retval;
-
if (!end_current_file_execution(_INLINE_TLS_VOID)) {
/* the scanner return 0, terminate execution completely (behave like exit()) */
php3_header();
--- 663,668 ----
Index: php31/main/language-parser.y
diff -c php31/main/language-parser.y:2.5 php31/main/language-parser.y:2.6
*** php31/main/language-parser.y:2.5 Thu Aug 20 23:48:56 1998
--- php31/main/language-parser.y Fri Aug 21 12:41:05 1998
***************
*** 31,37 ****
*/
! /* $Id: language-parser.y,v 2.5 1998/08/21 03:48:56 zeev Exp $ */
/*
--- 31,37 ----
*/
! /* $Id: language-parser.y,v 2.6 1998/08/21 16:41:05 shane Exp $ */
/*
***************
*** 269,283 ****
script:
{
! stack_push(&GLOBAL(phpchar_stack), (void *) &active_phpchar, sizeof(int *));
! active_phpchar = &yychar;
}
statement_list
{
int **tmp;
stack_top(&GLOBAL(phpchar_stack), (void **) &tmp);
! active_phpchar = *tmp;
stack_del_top(&GLOBAL(phpchar_stack));
}
--- 269,283 ----
script:
{
! stack_push(&GLOBAL(phpchar_stack), (void *) &GLOBAL(active_phpchar), sizeof(int *));
! GLOBAL(active_phpchar) = &yychar;
}
statement_list
{
int **tmp;
stack_top(&GLOBAL(phpchar_stack), (void **) &tmp);
! GLOBAL(active_phpchar) = *tmp;
stack_del_top(&GLOBAL(phpchar_stack));
}
Index: php31/main/main.c
diff -c php31/main/main.c:2.13 php31/main/main.c:2.14
*** php31/main/main.c:2.13 Fri Aug 21 09:48:42 1998
--- php31/main/main.c Fri Aug 21 12:41:05 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.13 1998/08/21 13:48:42 zeev Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.14 1998/08/21 16:41:05 shane Exp $ */
/* #define CRASH_DETECTION */
***************
*** 252,265 ****
}
! int php3_sapi_writeclient(SAPI_GLOBAL_INCLUDE void *buf, int size)
{
if (GLOBAL(sapi_rqst)->buffered_output) {
string_buffer_concat(&GLOBAL(sapi_rqst)->output_buffer, buf, size);
return size;
} else {
return GLOBAL(sapi_rqst)->writeclient(SAPI_GLOBAL_PASS buf,size);
! }
}
PHPAPI int php3_printf(const char *format,...)
--- 252,269 ----
}
! PHPAPI int php3_sapi_writeclient(void *buf, int size)
{
+ /*FIXME we should optimize this to not call tls vars here, we cannot
+ use the SAPI_GLOBAL_INCLUDE inside php core! */
+ TLS_VARS;
if (GLOBAL(sapi_rqst)->buffered_output) {
string_buffer_concat(&GLOBAL(sapi_rqst)->output_buffer, buf, size);
return size;
} else {
return GLOBAL(sapi_rqst)->writeclient(SAPI_GLOBAL_PASS buf,size);
! }
! return FAILURE; /* avoid a compile warning */
}
PHPAPI int php3_printf(const char *format,...)
***************
*** 628,634 ****
php3_printf("Unable to initialize phpchar stack.\n");
return FAILURE;
}
! active_phpchar = NULL;
GLOBAL(initialized) |= INIT_PHPCHAR_STACK;
if (stack_init(&GLOBAL(input_source_stack)) == FAILURE) {
--- 632,638 ----
php3_printf("Unable to initialize phpchar stack.\n");
return FAILURE;
}
! GLOBAL(active_phpchar) = NULL;
GLOBAL(initialized) |= INIT_PHPCHAR_STACK;
if (stack_init(&GLOBAL(input_source_stack)) == FAILURE) {
***************
*** 740,746 ****
if (GLOBAL(initialized) & INIT_PHPCHAR_STACK) {
! stack_destroy(GLOBAL(&phpchar_stack));
GLOBAL(initialized) &= ~INIT_PHPCHAR_STACK;
}
#if 0
--- 744,750 ----
if (GLOBAL(initialized) & INIT_PHPCHAR_STACK) {
! stack_destroy(&GLOBAL(phpchar_stack));
GLOBAL(initialized) &= ~INIT_PHPCHAR_STACK;
}
#if 0
Index: php31/main/main.h
diff -c php31/main/main.h:2.4 php31/main/main.h:2.5
*** php31/main/main.h:2.4 Fri Aug 21 09:48:42 1998
--- php31/main/main.h Fri Aug 21 12:41:05 1998
***************
*** 29,35 ****
*/
! /* $Id: main.h,v 2.4 1998/08/21 13:48:42 zeev Exp $ */
#ifndef _MAIN_H
--- 29,35 ----
*/
! /* $Id: main.h,v 2.5 1998/08/21 16:41:05 shane Exp $ */
#ifndef _MAIN_H
***************
*** 86,94 ****
extern unsigned char header_is_being_sent;
#endif
- extern int php3_putc(char c);
- extern int php3_puts(char *buf);
- extern int php3_write(void *buf, int size);
- extern int php3_sapi_writeclient(SAPI_GLOBAL_INCLUDE void *buf, int size);
#endif
--- 86,90 ----
Index: php31/main/php.h
diff -c php31/main/php.h:2.6 php31/main/php.h:2.7
*** php31/main/php.h:2.6 Thu Aug 20 23:48:56 1998
--- php31/main/php.h Fri Aug 21 12:41:06 1998
***************
*** 28,34 ****
+----------------------------------------------------------------------+
*/
! /* $Id: php.h,v 2.6 1998/08/21 03:48:56 zeev Exp $ */
#ifndef _PHP_H
#define _PHP_H
--- 28,34 ----
+----------------------------------------------------------------------+
*/
! /* $Id: php.h,v 2.7 1998/08/21 16:41:06 shane Exp $ */
#ifndef _PHP_H
#define _PHP_H
***************
*** 381,386 ****
--- 381,391 ----
extern void reset_scanner(void);
extern void html_putc(char c);
extern int end_current_file_execution(INLINE_TLS_VOID);
+
+ extern PHPAPI int php3_sapi_writeclient(void *buf, int size);
+ extern PHPAPI int php3_putc(char c);
+ extern PHPAPI int php3_puts(char *buf);
+ extern PHPAPI int php3_write(void *buf, int size);
/* functions */
#ifndef THREAD_SAFE
--
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