cvs commit: apache-1.3/src/os/tpf TPFExport
manoj 99/12/08 15:03:21
Modified:src CHANGES
src/include ap_config.h
src/main buff.c
src/modules/proxy proxy_cache.c proxy_ftp.c proxy_http.c
proxy_util.c
src/os/tpf TPFExport
Log:
Make mod_proxy work on TPF.
Submitted by: Joe Moenich [EMAIL PROTECTED]
Revision ChangesPath
1.1474+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1473
retrieving revision 1.1474
diff -u -d -u -r1.1473 -r1.1474
--- CHANGES 1999/12/08 19:01:13 1.1473
+++ CHANGES 1999/12/08 23:01:46 1.1474
@@ -1,5 +1,8 @@
Changes with Apache 1.3.10
+ *) mod_proxy now works on TPF.
+ [Joe Moenich [EMAIL PROTECTED]]
+
*) Enhance mod_actions' Script handling to be able to deal with
arbitrary methods and not just the well-known ones. This allows
experimental or organisation-private methods to be used without
1.278 +3 -0 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -u -r1.277 -r1.278
--- ap_config.h 1999/12/07 12:19:50 1.277
+++ ap_config.h 1999/12/08 23:02:23 1.278
@@ -937,6 +937,9 @@
/*#define USE_TPF_DAEMON*/
#define USE_TPF_SCOREBOARD
#define USE_TPF_SELECT
+#define S_IREAD S_IRUSR
+#define S_IWRITE S_IWUSR
+#define S_IEXEC S_IXUSR
#define crypt(buf,salt) ((char *)buf)
#undef offsetof
#define offsetof(s_type,field) ((size_t)(((s_type*)0)-field))
1.92 +1 -2 apache-1.3/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-1.3/src/main/buff.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -u -r1.91 -r1.92
--- buff.c1999/12/01 20:24:56 1.91
+++ buff.c1999/12/08 23:02:34 1.92
@@ -285,10 +285,9 @@
ap_check_signals();
if (fb-flags B_SOCKET) {
-alarm(rv = alarm(0));
FD_ZERO(fds);
FD_SET(fb-fd_in, fds);
-tv.tv_sec = rv+1;
+tv.tv_sec = 1;
tv.tv_usec = 0;
rv = ap_select(fb-fd_in + 1, fds, NULL, NULL, tv);
if (rv 0)
1.65 +29 -6 apache-1.3/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -u -r1.64 -r1.65
--- proxy_cache.c 1999/10/21 20:45:03 1.64
+++ proxy_cache.c 1999/12/08 23:02:43 1.65
@@ -73,6 +73,9 @@
#include sys/types.h
#include sys/stat.h
#endif
+#ifdef TPF
+#include os.h
+#endif
DEF_Explain
@@ -123,7 +126,7 @@
const char *cachedir, const char *cachesubdir);
static void help_proxy_garbage_coll(request_rec *r);
static int should_proxy_garbage_coll(request_rec *r);
-#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
+#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
!defined(TPF)
static void detached_proxy_garbage_coll(request_rec *r);
#endif
@@ -143,7 +146,7 @@
ap_block_alarms(); /* avoid SIGALRM on big cache cleanup */
if (should_proxy_garbage_coll(r))
-#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
+#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
!defined(TPF)
detached_proxy_garbage_coll(r);
#else
help_proxy_garbage_coll(r);
@@ -203,7 +206,7 @@
return 0;
}
-#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
+#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
!defined(TPF)
static void detached_proxy_garbage_coll(request_rec *r)
{
pid_t pid;
@@ -465,9 +468,19 @@
/* if (strlen(ent-d_name) != HASH_LEN) continue; */
/* under OS/2 use dirent's d_attr to identify a diretory */
-#ifdef OS2
+/* under TPF use stat to identify a directory */
+#if defined(OS2) || defined(TPF)
/* is it a directory? */
+#ifdef OS2
if (ent-d_attr A_DIR) {
+#elif defined(TPF)
+if (stat(filename, buf) == -1) {
+if (errno != ENOENT)
+ap_log_error(APLOG_MARK, APLOG_ERR, r-server,
+ proxy gc: stat(%s), filename);
+}
+if (S_ISDIR(buf.st_mode)) {
+#endif
char newcachedir[HUGE_STRING_LEN];
ap_snprintf(newcachedir, sizeof(newcachedir),
%s%s/,
cvs commit: apache-1.3/src/os/tpf TPFExport os.h
manoj 99/01/06 13:57:08 Modified:htdocs/manual install-tpf.html readme-tpf.html src Configure Makefile.tmpl src/os/tpf TPFExport os.h Log: Submitted by: Joe Moenich [EMAIL PROTECTED] Reviewed by: Manoj Kasichainula [EMAIL PROTECTED] Various TPF tweaks, simplifying installation, etc. Revision ChangesPath 1.3 +0 -6 apache-1.3/htdocs/manual/install-tpf.html Index: install-tpf.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/install-tpf.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- install-tpf.html 1998/11/04 19:31:50 1.2 +++ install-tpf.html 1999/01/06 21:56:57 1.3 @@ -101,12 +101,6 @@ document lists the modules that have been tested on TPF. /ol br -liOverlay src/Makefile.tmpl with src/Makefile.tpf: -ttstrongcpnbsp;Makefile.tpfnbsp;Makefile.tmpl/strong/tt -brbr -liOverlay src/main/Makefile.tmpl with src/main/Makefile.tpf: - ttstrongcpnbsp;main/Makefile.tpfnbsp;main/Makefile.tmpl/strong/tt -brbr liSet the TPF environment variables: ttstrong.nbsp;os/tpf/TPFExport/strong/tt br 1.3 +0 -15 apache-1.3/htdocs/manual/readme-tpf.html Index: readme-tpf.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/readme-tpf.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- readme-tpf.html 1998/11/04 19:31:50 1.2 +++ readme-tpf.html 1999/01/06 21:56:57 1.3 @@ -49,21 +49,6 @@ /ul /p -a name=auto_generated_filesnbsp;/a -h2 align=centerAutomatically Generated Files/h2 -p - Some files that are automatically generated by Makefile on other platforms - are included in the src/os/tpf directory... - ul - litest_char.h - liuri_delims.h - /ul - - These files could not be automatically created for TPF because the - Makefile platform is not the same as the run-time platform. - (That is, you don't run Makefile on TPF itself.) -/p - a name=whats_availablenbsp;/a h2 align=centerWhat's Available in this Version/h2 1.320 +1 -0 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.319 retrieving revision 1.320 diff -u -u -r1.319 -r1.320 --- Configure 1999/01/04 04:11:38 1.319 +++ Configure 1999/01/06 21:57:01 1.320 @@ -609,6 +609,7 @@ CFLAGS=$CFLAGS -DTPF -DCHARSET_EBCDIC -D_POSIX_SOURCE DEF_WANTHSREGEX=yes LIBS=$LIBS + SUBTARGET=target_compile_only ;; *-sni-sysv4*) OS='SVR4' 1.108 +3 -0 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.107 retrieving revision 1.108 diff -u -u -r1.107 -r1.108 --- Makefile.tmpl 1998/12/01 23:59:54 1.107 +++ Makefile.tmpl 1999/01/06 21:57:02 1.108 @@ -30,6 +30,9 @@ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \ -o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS) +target_compile_only: subdirs modules.o + $(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c + target_shared: lib$(TARGET).ep $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \ -o $(TARGET) -DSHARED_CORE_BOOTSTRAP main/http_main.c 1.2 +3 -22 apache-1.3/src/os/tpf/TPFExport Index: TPFExport === RCS file: /home/cvs/apache-1.3/src/os/tpf/TPFExport,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- TPFExport 1998/11/03 22:06:30 1.1 +++ TPFExport 1999/01/06 21:57:04 1.2 @@ -1,26 +1,7 @@ #!/bin/sh echo Setting TPF/c89 environment variables -TZ=EST5EDT -PATH=$PATH:/usr/sbin:/usr/share/lib/terminfo/:.:/etc:$HOME -NLSPATH=/usr/lpp/tcpip/usr/lib/nls/msg/%L:/usr/lib/nls/msg/%L/%N -LIBPATH=/usr/lib -LANG=C -export TZ PATH NLSPATH LANG -# Commands Reference -# umask g=rx,o=x -umask 022 -export _C89_CCMODE=1 -export _C89_CVERSION=0x2104 -export _C89_PVERSION=0x1108 -export _C89_CNAME=CBCDRVR -export _C89_PNAME=EDCPRLK -export _C89_PMSGS=EDCPMSGE -export _C89_CLIB_PREFIX=TSCTEST.OSV2R4M0 -export _C89_PLIB_PREFIX=SHARE.CEE180 -export _C89_INCDIRS=/u/tpf41/currentmaint/include /u/tpf41/currentmaint/include/oco //DD:SYSLIB //'SHARE.CEE180.SCEEH.NET.H' //'SHARE.CEE180.SCEEH.H' //'SHARE.CEE180.SCEEH.NETINET.H' -export
