CVS update: php31/main
| From: | zeev | Date: | Mon, 24 Aug 1998 19:19:44 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-552@lists.php.net to get a copy of this message | ||
Date: Monday August 24, 1998 @ 15:19
Author: zeev
Update of /repository/php31/main
In directory asf:/tmp/cvs-serv26727/main
Modified Files:
language-scanner.l main.c
Log Message:
Another important missing 3.0 patch :(
Index: php31/main/language-scanner.l
diff -c php31/main/language-scanner.l:2.5 php31/main/language-scanner.l:2.6
*** php31/main/language-scanner.l:2.5 Mon Aug 24 15:12:53 1998
--- php31/main/language-scanner.l Mon Aug 24 15:19:43 1998
***************
*** 78,83 ****
--- 78,84 ----
int php3_preprocess; /* whether we're in preprocess mode */
int phplineno;
static int in_eval;
+ Stack php3g_state_stack;
#endif
#ifndef YY_TLS_VARS
Index: php31/main/main.c
diff -c php31/main/main.c:2.22 php31/main/main.c:2.23
*** php31/main/main.c:2.22 Sun Aug 23 02:29:13 1998
--- php31/main/main.c Mon Aug 24 15:19:44 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.22 1998/08/23 06:29:13 shane Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.23 1998/08/24 19:19:44 zeev Exp $ */
/* #define CRASH_DETECTION */
***************
*** 1235,1260 ****
static void php3_parse(FILE * yyin INLINE_TLS)
{
int original_lineno = GLOBAL(phplineno);
! #if 0
! int issock=0, socketd=0;;
! #endif
!
if (GLOBAL(php3_ini)->auto_prepend_file && GLOBAL(php3_ini)->auto_prepend_file[0])
{
- #if 0
- char *prepend = GLOBAL(php3_ini)->auto_prepend_file;
- FILE *fp;
-
- fp = php3_fopen_wrapper(prepend, "r", USE_PATH | IGNORE_URL_WIN, &issock,
&socketd);
- if (fp) {
- initialize_input_file_buffer(fp);
- reset_scanner();
- (void) phpparse();
- fclose(fp);
- } else {
- if (php3_header())
- php3_printf("Unable to open prepend file.\n");
- }
- #else
pval tmp;
tmp.value.str.val = GLOBAL(php3_ini)->auto_prepend_file;
--- 1235,1243 ----
static void php3_parse(FILE * yyin INLINE_TLS)
{
int original_lineno = GLOBAL(phplineno);
!
! initialize_input_file_buffer(yyin);
if (GLOBAL(php3_ini)->auto_prepend_file && GLOBAL(php3_ini)->auto_prepend_file[0])
{
pval tmp;
tmp.value.str.val = GLOBAL(php3_ini)->auto_prepend_file;
***************
*** 1263,1294 ****
include_file(&tmp,0);
(void) phpparse();
- #endif
}
/* Call Parser on the main input file */
- initialize_input_file_buffer(yyin);
reset_scanner();
GLOBAL(phplineno) = original_lineno;
(void) phpparse();
if (GLOBAL(php3_ini)->auto_append_file && GLOBAL(php3_ini)->auto_append_file[0]) {
- #if 0
- char *append = GLOBAL(php3_ini)->auto_append_file;
- FILE *fa;
-
- fa = php3_fopen_wrapper(append, "r", USE_PATH | IGNORE_URL_WIN, &issock,
&socketd);
- if (fa) {
- fclose(phpin); /* the auto-appended file will be phpin */
- initialize_input_file_buffer(fa);
- reset_scanner();
- (void) phpparse();
- /* fa is now phpin, and will be closed by clean_input_source_stack() */
- /*fclose(fa); */
- } else {
- if (php3_header())
- php3_printf("Unable to open append file.\n");
- }
- #else
pval tmp;
tmp.value.str.val = GLOBAL(php3_ini)->auto_append_file;
--- 1246,1258 ----
***************
*** 1297,1303 ****
include_file(&tmp,0);
(void) phpparse();
- #endif
}
}
--- 1261,1266 ----
--
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