[PHP4BETA] CVS update: php4

Date: Friday April 23, 1999 @ 16:05 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv23554 Modified Files: fhttpd.c fopen-wrappers.c main.c mod_php3.c php3_realpath.c request_info.c safe_mode.c Removed Files: tls.c tls.h Log Message: Remove tls.[ch] Index: php4/fhttpd.c diff -u php4/fhttpd.c:1.1 php4/fhttpd.c:1.2 --- php4/fhttpd.c:1.1 Wed Apr 21 22:48:22 1999 +++ php4/fhttpd.c Fri Apr 23 16:05:52 1999 @@ -27,10 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fhttpd.c,v 1.1 1999/04/22 02:48:22 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: fhttpd.c,v 1.2 1999/04/23 20:05:52 zeev Exp $ */ #include "php.h" #include <stdlib.h> Index: php4/fopen-wrappers.c diff -u php4/fopen-wrappers.c:1.8 php4/fopen-wrappers.c:1.9 --- php4/fopen-wrappers.c:1.8 Wed Apr 21 20:25:51 1999 +++ php4/fopen-wrappers.c Fri Apr 23 16:05:52 1999 @@ -27,11 +27,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.8 1999/04/22 00:25:51 ssb Exp $ */ - -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: fopen-wrappers.c,v 1.9 1999/04/23 20:05:52 zeev Exp $ */ #include "php.h" #include "php_globals.h" Index: php4/main.c diff -u php4/main.c:1.25 php4/main.c:1.26 --- php4/main.c:1.25 Fri Apr 23 06:26:49 1999 +++ php4/main.c Fri Apr 23 16:05:52 1999 @@ -29,16 +29,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.25 1999/04/23 10:26:49 zeev Exp $ */ +/* $Id: main.c,v 1.26 1999/04/23 20:05:52 zeev Exp $ */ #define SHUTDOWN_DEBUG(resource) fprintf(stderr, "*** Shutting down " resource "\n" ) #undef SHUTDOWN_DEBUG #define SHUTDOWN_DEBUG(resource) -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include <stdio.h> #include "php.h" #ifdef MSVC5 Index: php4/mod_php3.c diff -u php4/mod_php3.c:1.8 php4/mod_php3.c:1.9 --- php4/mod_php3.c:1.8 Sat Apr 10 13:39:07 1999 +++ php4/mod_php3.c Fri Apr 23 16:05:52 1999 @@ -28,12 +28,8 @@ | PHP4 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php3.c,v 1.8 1999/04/10 17:39:07 zeev Exp $ */ +/* $Id: mod_php3.c,v 1.9 1999/04/23 20:05:52 zeev Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#include "php.h" -#else #include "httpd.h" #include "http_config.h" #if MODULE_MAGIC_NUMBER > 19980712 @@ -48,7 +44,6 @@ #include "http_protocol.h" #include "http_request.h" #include "http_log.h" -#endif /* These are taken out of php_ini.h Index: php4/php3_realpath.c diff -u php4/php3_realpath.c:1.1.1.1 php4/php3_realpath.c:1.2 --- php4/php3_realpath.c:1.1.1.1 Wed Apr 7 17:02:40 1999 +++ php4/php3_realpath.c Fri Apr 23 16:05:52 1999 @@ -27,10 +27,6 @@ +----------------------------------------------------------------------+ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif - #include "php.h" #if HAVE_UNISTD_H Index: php4/request_info.c diff -u php4/request_info.c:1.2 php4/request_info.c:1.3 --- php4/request_info.c:1.2 Sat Apr 10 12:25:23 1999 +++ php4/request_info.c Fri Apr 23 16:05:52 1999 @@ -27,9 +27,6 @@ +----------------------------------------------------------------------+ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" #ifndef THREAD_SAFE Index: php4/safe_mode.c diff -u php4/safe_mode.c:1.2 php4/safe_mode.c:1.3 --- php4/safe_mode.c:1.2 Fri Apr 16 20:37:05 1999 +++ php4/safe_mode.c Fri Apr 23 16:05:52 1999 @@ -26,10 +26,8 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: safe_mode.c,v 1.2 1999/04/17 00:37:05 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: safe_mode.c,v 1.3 1999/04/23 20:05:52 zeev Exp $ */ + #include "php.h" #include <stdio.h> -- PHP 4 Beta