CVS update: php31/main

Date: Thursday August 20, 1998 @ 17:50 Author: zeev Update of /repository/php31/main In directory asf:/tmp/cvs-serv16450/main Modified Files: Makefile.am alloc.c configuration-parser.y internal_functions.c main.c php.h php3_ini.h tls.h Log Message: Plenty of fixes, mostly to virtual source dir support (works fine now) Several fixes to modules Index: php31/main/Makefile.am diff -c php31/main/Makefile.am:2.4 php31/main/Makefile.am:2.5 *** php31/main/Makefile.am:2.4 Fri Aug 14 11:11:41 1998 --- php31/main/Makefile.am Thu Aug 20 17:50:30 1998 *************** *** 28,37 **** # Authors: Stig Bakken <ssb@guardian.no> # ! INCLUDES=@INCLUDES@ CLEANFILES=\ ! configuration-scanner.[ch] configuration-parser.[ch] \ ! language-scanner.[ch] language-parser.[ch] \ *-parser.output noinst_LIBRARIES=libphpcore.a libphpcore_a_SOURCES=\ --- 28,37 ---- # Authors: Stig Bakken <ssb@guardian.no> # ! INCLUDES=@INCLUDES@ -I$(top_srcdir) CLEANFILES=\ ! configuration-scanner.c configuration-parser.[ch] \ ! language-scanner.c language-parser.[ch] \ *-parser.output noinst_LIBRARIES=libphpcore.a libphpcore_a_SOURCES=\ *************** *** 55,62 **** language-parser.h: $(srcdir)/language-parser.y bison -p php -v -d $< -o language-parser.c ! configuration-scanner.c: $(srcdir)/configuration-scanner.l $(srcdir)/configuration-parser.h ! flex -Pcfg -o$@ -i configuration-scanner.l ! language-scanner.c: $(srcdir)/language-scanner.l $(srcdir)/language-parser.h ! flex -Pphp -o$@ -i language-scanner.l --- 55,62 ---- language-parser.h: $(srcdir)/language-parser.y bison -p php -v -d $< -o language-parser.c ! configuration-scanner.c: $(srcdir)/configuration-scanner.l configuration-parser.h ! flex -Pcfg -o$@ -i $(srcdir)/configuration-scanner.l ! language-scanner.c: $(srcdir)/language-scanner.l language-parser.h ! flex -Pphp -o$@ -i $(srcdir)/language-scanner.l Index: php31/main/alloc.c diff -c php31/main/alloc.c:2.0 php31/main/alloc.c:2.1 *** php31/main/alloc.c:2.0 Fri Jul 3 09:17:12 1998 --- php31/main/alloc.c Thu Aug 20 17:50:31 1998 *************** *** 57,64 **** # endif #define _CHECK_MEMORY_LIMIT(s,file,lineno) { allocated_memory += (s);\ ! if (php3_ini.memory_limit<allocated_memory) {\ ! if (allocated_memory>php3_ini.memory_limit+1048576) {\ if (file) { \ char buf[64]; \ snprintf(buf,64,"Called exit() on %s:%d (tried to allocate %d bytes)\n",file,lineno,s); \ --- 57,64 ---- # endif #define _CHECK_MEMORY_LIMIT(s,file,lineno) { allocated_memory += (s);\ ! if (php3_ini_master.memory_limit<allocated_memory) {\ ! if (allocated_memory>php3_ini_master.memory_limit+1048576) {\ if (file) { \ char buf[64]; \ snprintf(buf,64,"Called exit() on %s:%d (tried to allocate %d bytes)\n",file,lineno,s); \ *************** *** 68,76 **** } else {\ if (!GLOBAL(shutdown_requested)) { \ if (!file) { \ ! php3_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)",php3_ini.memory_limit,s); \ } else { \ ! php3_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)",php3_ini.memory_limit,file,lineno,s); \ } \ } \ } \ --- 68,76 ---- } else {\ if (!GLOBAL(shutdown_requested)) { \ if (!file) { \ ! php3_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)",php3_ini_master.memory_limit,s); \ } else { \ ! php3_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)",php3_ini_master.memory_limit,file,lineno,s); \ } \ } \ } \ Index: php31/main/configuration-parser.y diff -c php31/main/configuration-parser.y:2.0 php31/main/configuration-parser.y:2.1 *** php31/main/configuration-parser.y:2.0 Fri Jul 3 09:17:12 1998 --- php31/main/configuration-parser.y Thu Aug 20 17:50:31 1998 *************** *** 30,36 **** ! /* $Id: configuration-parser.y,v 2.0 1998/07/03 13:17:12 rasmus Exp $ */ #define DEBUG_CFG_PARSER 1 #ifdef THREAD_SAFE --- 30,36 ---- ! /* $Id: configuration-parser.y,v 2.1 1998/08/20 21:50:31 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #ifdef THREAD_SAFE *************** *** 47,54 **** #include <winbase.h> #include "os/nt/wfile.h" #endif - - extern php3_ini_structure php3_ini_master; #define PARSING_MODE_CFG 0 #define PARSING_MODE_BROWSCAP 1 --- 47,52 ---- Index: php31/main/internal_functions.c diff -c php31/main/internal_functions.c:2.3 php31/main/internal_functions.c:2.4 *** php31/main/internal_functions.c:2.3 Thu Aug 13 19:51:11 1998 --- php31/main/internal_functions.c Thu Aug 20 17:50:31 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 2.3 1998/08/13 23:51:11 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 2.4 1998/08/20 21:50:31 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 90,96 **** int current_module_being_cleaned; extern php3_ini_structure *php3_ini; #endif - extern php3_ini_structure php3_ini_master; /* defines imported from internal_functions_registry.h */ extern int php3_init_mime(INIT_FUNC_ARGS); --- 90,95 ---- Index: php31/main/main.c diff -c php31/main/main.c:2.8 php31/main/main.c:2.9 *** php31/main/main.c:2.8 Fri Aug 14 19:57:41 1998 --- php31/main/main.c Thu Aug 20 17:50:31 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.8 1998/08/14 23:57:41 steffann Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.9 1998/08/20 21:50:31 zeev Exp $ */ /* #define CRASH_DETECTION */ *************** *** 124,131 **** extern FILE *phpin; php3_ini_structure *php3_ini; #endif /* not THREAD_SAFE */ - - extern php3_ini_structure php3_ini_master; void _php3_build_argv(char *); static void php3_timeout(int dummy); --- 124,129 ---- Index: php31/main/php.h diff -c php31/main/php.h:2.4 php31/main/php.h:2.5 *** php31/main/php.h:2.4 Thu Aug 13 18:49:00 1998 --- php31/main/php.h Thu Aug 20 17:50:31 1998 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 2.4 1998/08/13 22:49:00 shane Exp $ */ #ifndef _PHP_H #define _PHP_H --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 2.5 1998/08/20 21:50:31 zeev Exp $ */ #ifndef _PHP_H #define _PHP_H *************** *** 491,497 **** #endif extern void phprestart(FILE *input_file); ! #endif /* * Local variables: --- 491,501 ---- #endif extern void phprestart(FILE *input_file); ! /* strip down THREAD_LS, but keep it there so that we remember what needs to be handled */ ! #define THREAD_LS ! ! #endif /* _PHP_H */ ! /* * Local variables: Index: php31/main/php3_ini.h diff -c php31/main/php3_ini.h:2.3 php31/main/php3_ini.h:2.4 *** php31/main/php3_ini.h:2.3 Fri Aug 14 19:57:42 1998 --- php31/main/php3_ini.h Thu Aug 20 17:50:31 1998 *************** *** 97,102 **** --- 97,105 ---- extern PHPAPI void *_php3_copy_ini_master(void); extern PHPAPI void *_php3_merge_ini(void *addv); extern PHPAPI void _php3_set_ini(php3_ini_structure *conf); + + extern php3_ini_structure php3_ini_master; + #endif /* _PHP3_INI_H_ */ /* Index: php31/main/tls.h diff -c php31/main/tls.h:2.3 php31/main/tls.h:2.4 *** php31/main/tls.h:2.3 Fri Jul 17 13:23:11 1998 --- php31/main/tls.h Thu Aug 20 17:50:32 1998 *************** *** 30,35 **** --- 30,36 ---- #ifndef __PHP3_TLS_H__ #define __PHP3_TLS_H__ + #if WIN32|WINNT #include "os/nt/pwd.h" #include "os/nt/sendmail.h" -- 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