[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 13:11 Author: sas Update of /repository/php4 In directory php:/tmp/cvs-serv10645 Modified Files: ChangeLog.TODO Makefile.in fopen-wrappers.c php.h Added Files: php_compat.c php_compat.h Log Message: port some fixes, add compat routines Index: php4/ChangeLog.TODO diff -c php4/ChangeLog.TODO:1.2 php4/ChangeLog.TODO:1.3 *** php4/ChangeLog.TODO:1.2 Wed Apr 21 12:31:27 1999 --- php4/ChangeLog.TODO Wed Apr 21 13:11:00 1999 *************** *** 10,20 **** - added Oracle-OCI8 persistent connections - fixed OCIDefineByName crash. - fixed some NULL-column related problems in OCI8-module. - - avoid stripping double slashes when fopen'ing files (Sascha) - - sql_regcase() change: only apply to alphabetic characters (Sascha) - - add snmprealwalk() (Sascha Schumann) - - fix serious bug in strftime() (Sascha Schumann) - - fix bug in ucwords() (Sascha Schumann) - optimized fgets() and fread() - memory leak in operators.c fixed - socket leak fixed (Sascha Schumann) --- 10,15 ---- Index: php4/Makefile.in diff -c php4/Makefile.in:1.9 php4/Makefile.in:1.10 *** php4/Makefile.in:1.9 Mon Apr 19 21:03:09 1999 --- php4/Makefile.in Wed Apr 21 13:11:00 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.9 1999/04/20 01:03:09 ssb Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.10 1999/04/21 17:11:00 sas Exp $ # prefix = @prefix@ *************** *** 62,72 **** SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.c configuration-scanner.c request_info.c \ safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \ ! php_ini.c OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \ configuration-parser.o configuration-scanner.o request_info.o \ safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ ! php_ini.o FUNCTIONS_SOURCE = functions/apache.c functions/fhttpd.c \ functions/crypt.c functions/db.c functions/dl.c functions/filepro.c \ --- 62,72 ---- SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.c configuration-scanner.c request_info.c \ safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \ ! php_ini.c php_compat.c OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \ configuration-parser.o configuration-scanner.o request_info.o \ safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ ! php_ini.o php_compat.o FUNCTIONS_SOURCE = functions/apache.c functions/fhttpd.c \ functions/crypt.c functions/db.c functions/dl.c functions/filepro.c \ *************** *** 184,189 **** --- 184,190 ---- rm -f *~ functions/*~ .c.o: + @rm -f $@ $(CC) $(CFLAGS) -c $< -o $@ @bn=echo $@ | sed -e 's#functions/##'; test -f $@ || \ (test "$@" != "$$bn" && test -f "$$bn" && mv $$bn $@) Index: php4/fopen-wrappers.c diff -c php4/fopen-wrappers.c:1.6 php4/fopen-wrappers.c:1.7 *** php4/fopen-wrappers.c:1.6 Wed Apr 21 00:02:11 1999 --- php4/fopen-wrappers.c Wed Apr 21 13:11:00 1999 *************** *** 27,33 **** | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ ! /* $Id: fopen-wrappers.c,v 1.6 1999/04/21 04:02:11 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 27,33 ---- | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ ! /* $Id: fopen-wrappers.c,v 1.7 1999/04/21 17:11:00 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 131,136 **** --- 131,137 ---- local_open_basedir[local_open_basedir_pos--] = 0; } + #if 0 /* Strip double (back)slashes */ if (local_open_basedir_pos > 0) { while (( *************** *** 144,150 **** local_open_basedir[local_open_basedir_pos--] = 0; } } ! } else { /* Else use the unmodified path */ strcpy(local_open_basedir, PG(open_basedir)); --- 145,152 ---- local_open_basedir[local_open_basedir_pos--] = 0; } } ! #endif ! } else { /* Else use the unmodified path */ strcpy(local_open_basedir, PG(open_basedir)); Index: php4/php.h diff -c php4/php.h:1.5 php4/php.h:1.6 *** php4/php.h:1.5 Wed Apr 21 00:02:11 1999 --- php4/php.h Wed Apr 21 13:11:00 1999 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.5 1999/04/21 04:02:11 zeev Exp $ */ #ifndef _PHP_H #define _PHP_H --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.6 1999/04/21 17:11:00 sas Exp $ */ #ifndef _PHP_H #define _PHP_H *************** *** 510,515 **** --- 510,516 ---- #define XtOffsetOf(s_type,field) XtOffset(s_type*,field) #endif + #include "php_compat.h" #endif -- PHP 4 Beta