cvs commit: apache-site bugdb.cgi
brian 98/02/21 18:18:18 Modified:.bugdb.cgi Log: PR: 1848 change description of gnats Revision ChangesPath 1.26 +1 -1 apache-site/bugdb.cgi Index: bugdb.cgi === RCS file: /export/home/cvs/apache-site/bugdb.cgi,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- bugdb.cgi 1998/02/11 15:18:34 1.25 +++ bugdb.cgi 1998/02/22 02:18:17 1.26 @@ -1620,7 +1620,7 @@ H2 align=center$databasetitle/H2 P ALIGN=CENTER -Built on top of the public domain tool A HREF=$GNUINFOSCRIPT?(gnats)GNATS/A. +Built on top of the GNU tool A HREF=$GNUINFOSCRIPT?(gnats)GNATS/A. PHRP
cvs commit: apache-1.3/src/support Makefile.tmpl
coar98/02/21 20:37:20 Modified:src Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/example Makefile.tmpl src/modules/experimental Makefile.tmpl src/modules/extra Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/modules/test Makefile.tmpl src/os/unix Makefile.tmpl src/support Makefile.tmpl Log: Somewhat reworked make depend rules, which result in dependencies that use $(INCDIR) for the src/include directory. Why? Because it makes it a lot easier to spot exceptions (like the proxy's outbound includes of mod_mime.h, et cetera). Revision ChangesPath 1.78 +11 -9 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- Makefile.tmpl 1998/02/18 08:50:58 1.77 +++ Makefile.tmpl 1998/02/22 04:37:08 1.78 @@ -6,6 +6,7 @@ CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) LIBS=$(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES) +INCDIR=include LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) OBJS= \ @@ -51,12 +52,14 @@ # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. depend: - sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ - $(CC) -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ - mv Makefile.tmpl Makefile.tmpl.bak \ - mv Makefile.new Makefile.tmpl + cp Makefile.tmpl Makefile.tmpl.bak \ + sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ + gcc -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ + sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \ + Makefile.tmpl \ + rm Makefile.new for i in $(SUBDIRS); do \ - ( cd $$i $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' depend) || exit 1; \ + ( cd $$i $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' depend ) || exit 1; \ done #Dependencies @@ -65,7 +68,6 @@ # DO NOT REMOVE buildmark.o: buildmark.c -modules.o: modules.c include/httpd.h include/conf.h os/unix/os.h \ - include/hsregex.h include/alloc.h include/buff.h include/ap.h \ - include/http_config.h -tt.o: tt.c +modules.o: modules.c $(INCDIR)/httpd.h $(INCDIR)/conf.h os/unix/os.h \ + $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/http_config.h 1.13 +23 -21apache-1.3/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.tmpl 1998/02/12 10:15:18 1.12 +++ Makefile.tmpl 1998/02/22 04:37:09 1.13 @@ -28,26 +28,28 @@ # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. depend: - sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ - $(CC) -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ - mv Makefile.tmpl Makefile.tmpl.bak \ - mv Makefile.new Makefile.tmpl + cp Makefile.tmpl Makefile.tmpl.bak \ + sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ + gcc -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ + sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \ + Makefile.tmpl \ + rm Makefile.new # DO NOT REMOVE -ap_cpystrn.o: ap_cpystrn.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h -ap_execve.o: ap_execve.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h ../include/http_log.h -ap_signal.o: ap_signal.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h -ap_slack.o: ap_slack.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h ../include/http_log.h -ap_snprintf.o: ap_snprintf.c ../include/conf.h ../os/unix/os.h \ - ../include/hsregex.h -ap_strings.o: ap_strings.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h +ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ + ../os/unix/os.h
cvs commit: apache-1.3/src/os/emx Makefile.tmpl
coar98/02/21 20:45:48 Modified:src/os/bs2000 Makefile.tmpl src/os/emx Makefile.tmpl Log: Whoops, forgot the emx and bs2000 Makefile.tmpls. Revision ChangesPath 1.3 +11 -0 apache-1.3/src/os/bs2000/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.tmpl 1998/02/01 15:56:16 1.2 +++ Makefile.tmpl 1998/02/22 04:45:47 1.3 @@ -21,6 +21,17 @@ clean: rm -f $(OBJS) $(LIB) +# We really don't expect end users to use this rule. It works only with +# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after +# using it. +depend: + cp Makefile.tmpl Makefile.tmpl.bak \ + sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ + gcc -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ + sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \ + Makefile.tmpl \ + rm Makefile.new + $(OBJS): Makefile os.o:os.c os-inline.c ebcdic.o: ebcdic.c 1.3 +11 -0 apache-1.3/src/os/emx/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/os/emx/Makefile.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.tmpl 1998/02/01 15:56:17 1.2 +++ Makefile.tmpl 1998/02/22 04:45:48 1.3 @@ -31,5 +31,16 @@ $(OBJS): Makefile +# We really don't expect end users to use this rule. It works only with +# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after +# using it. +depend: + cp Makefile.tmpl Makefile.tmpl.bak \ + sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ + gcc -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ + sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \ + Makefile.tmpl \ + rm Makefile.new + # DO NOT REMOVE os.o:os.c os-inline.c
cvs commit: apache-1.3/src CHANGES
coar98/02/21 20:53:58 Modified:src CHANGES Log: Not that it necessarily changed anything, but Dean's fix of the dependencies *may* have corrected some subtle compilation problems and the change merits notice. Revision ChangesPath 1.653 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.652 retrieving revision 1.653 diff -u -r1.652 -r1.653 --- CHANGES 1998/02/21 17:19:45 1.652 +++ CHANGES 1998/02/22 04:53:57 1.653 @@ -79,6 +79,10 @@ Changes with Apache 1.3b5 + *) Source file dependencies in Makefile.tmpl files throughout the + source tree were updated to accurately reflect reality. + [Dean Gaudet] + *) Preserve the content encoding given by the AddEncoding directive when the client doesn't otherwise specify an encoding. [Ronald Tschalaer [EMAIL PROTECTED]]
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/02/22 05:50:11 Modified:src CHANGES src/modules/standard mod_status.c Log: backout the SERVER_* in mod_status Revision ChangesPath 1.654 +0 -3 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.653 retrieving revision 1.654 diff -u -r1.653 -r1.654 --- CHANGES 1998/02/22 04:53:57 1.653 +++ CHANGES 1998/02/22 13:50:08 1.654 @@ -1,8 +1,5 @@ Changes with Apache 1.3b6 - *) Have the mod_status Status page report server version and - built data [M.D. Parker [EMAIL PROTECTED]] PR#1448 - *) [PORT] Recognize FreeBSD versions so we can use the OS regex as well as handling unsigned-chars for FreeBSD v3 and v2 [Andrey Chernov [EMAIL PROTECTED] and Jim] PR#1450 1.74 +3 -0 apache-1.3/src/modules/standard/mod_status.c Index: mod_status.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- mod_status.c 1998/02/21 15:32:58 1.73 +++ mod_status.c 1998/02/22 13:50:10 1.74 @@ -315,8 +315,11 @@ rputs(HTMLHEAD\nTITLEApache Status/TITLE\n/HEADBODY\n, r); rputs(H1Apache Server Status for , r); rvputs(r, server-server_hostname, /H1\n\n, NULL); +#if 0 + /* We don't do this until we resolve shared lib concerns */ rvputs(r, Server Version:, SERVER_VERSION, br\n, NULL); rvputs(r, Server Built:, SERVER_BUILT, br\nhr\n, NULL); +#endif rvputs(r, Current Time: , asctime(localtime(nowtime)), br\n, NULL); rvputs(r, Restart Time: , asctime(localtime(restart_time)), br\n, NULL);
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/02/22 07:00:53 Modified:src CHANGES src/modules/standard mod_status.c Log: Obtained from: Scott Anguish and Timothy Luoma Reviewed by: Jim NeXT porting changes for mod_status Revision ChangesPath 1.655 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.654 retrieving revision 1.655 diff -u -r1.654 -r1.655 --- CHANGES 1998/02/22 13:50:08 1.654 +++ CHANGES 1998/02/22 15:00:50 1.655 @@ -1,5 +1,9 @@ Changes with Apache 1.3b6 + *) [PORT] Work around the fact that NeXT runs on more than the + m68k chips in mod_status [Scott Anguish and Timothy Luoma + [EMAIL PROTECTED]] + *) [PORT] Recognize FreeBSD versions so we can use the OS regex as well as handling unsigned-chars for FreeBSD v3 and v2 [Andrey Chernov [EMAIL PROTECTED] and Jim] PR#1450 1.75 +8 -0 apache-1.3/src/modules/standard/mod_status.c Index: mod_status.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- mod_status.c 1998/02/22 13:50:10 1.74 +++ mod_status.c 1998/02/22 15:00:52 1.75 @@ -117,7 +117,15 @@ #include http_log.h #ifdef NEXT +#if NX_CURRENT_COMPILER_RELEASE == 410 +#if __ARCHITECTURE__ == m68k +#define HZ 64 +#else +#define HZ 100 +#endif +#else #include machine/param.h +#ndif #endif #define STATUS_MAXLINE 64
cvs commit: apache-1.3 STATUS
jim 98/02/22 07:04:09 Modified:.STATUS Log: 1.3b5 update Revision ChangesPath 1.160 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- STATUS1998/02/20 10:51:29 1.159 +++ STATUS1998/02/22 15:04:08 1.160 @@ -5,7 +5,7 @@ 2.0 : In pre-alpha development see: http://www.arctic.org/~dgaudet/apache/2.0/process-model 1.3b6: in development -1.3b5: Tagged APACHE_1_3b5. Randy will do announcement +1.3b5: Tagged APACHE_1_3b5 and released 1.3b4: Internal version... not tagged or released. 1.3b3: Released and announced 1.3b1: There is no 1.3b1
cvs commit: apache-1.3/src/modules/standard mod_status.c
ben 98/02/22 07:31:36 Modified:src/modules/standard mod_status.c Log: Fix typo. Revision ChangesPath 1.76 +1 -1 apache-1.3/src/modules/standard/mod_status.c Index: mod_status.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- mod_status.c 1998/02/22 15:00:52 1.75 +++ mod_status.c 1998/02/22 15:31:35 1.76 @@ -125,7 +125,7 @@ #endif #else #include machine/param.h -#ndif +#endif #endif #define STATUS_MAXLINE 64
cvs commit: apache-devsite apache.iwz how-to-release-win32.html how-to-release.html
pcs 98/02/22 10:30:16 Modified:.how-to-release.html Added: .apache.iwz how-to-release-win32.html Log: Add instructions for how to use IS2 to build a release. Store the IS2 configuration file (apache.iwz) here as well, for now. Revision ChangesPath 1.26 +2 -1 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- how-to-release.html 1998/02/12 14:39:21 1.25 +++ how-to-release.html 1998/02/22 18:30:15 1.26 @@ -268,7 +268,8 @@ FONT COLOR=redNote:/FONT These instructions are temporary, until we have a working installation of InstallShield, which will eventually be used to distribute Apache for Windows. At that time, these instructions will be -replaced. +replaced. For building an installation with InstallShield 2, see +A HREF=how-to-release-win32How to Release Apache for Windows/A. OL 1.1 apache-devsite/apache.iwz Index: apache.iwz === [InstallShield Wizard] iDate=1 iTime=1 Flag=fe00 ISX.EXE Size=686080 ISX.EXE Date=15:54:10 28/4/1997 ISX.EXE Ver=2.0.0.129 SETUP.EXE Size=45312 SETUP.EXE Date=10:53:32 18/1/1997 SETUP.EXE Ver=3.0.111.0 SETUP.INS Size=68971 SETUP.INS Date=20:43:00 28/4/1997 SETUP.INS Ver=Not available _INST16.EX_ Size=282766 _INST16.EX_ Date=10:56:04 18/1/1997 _INST16.EX_ Ver=Not available _INST32I.EX_ Size=320411 _INST32I.EX_ Date=11:04:08 18/1/1997 _INST32I.EX_ Ver=Not available ISDEPEND.INI Size=320411 ISDEPEND.INI Date=11:04:08 18/1/1997 ISDEPEND.INI Ver=Not available SWDEPEND.INI Size=320411 SWDEPEND.INI Date=11:04:08 18/1/1997 SWDEPEND.INI Ver=Not available ICOMP.EXE Size=119808 ICOMP.EXE Date=15:05:10 15/1/1996 ICOMP.EXE Ver=3.00.062 SPLIT.EXE Size=90624 SPLIT.EXE Date=15:09:36 15/1/1996 SPLIT.EXE Ver=3.00.060 PACKLIST.EXE Size=87552 PACKLIST.EXE Date=15:10:30 15/1/1996 PACKLIST.EXE Ver=3.00.060 Version=2.0 DevTool=Generic Windows Platform=Win32 DisksBuilt=1 DisksDir=apache\650MB\ TabsVisit=0011100011 LangNum=451 LangDir=LANG\ENG\ [VisualDesign] AppName=Apache AppExe= AppExeFile= Version=1.3b5 Company=Apache Group Title=Apache Web Server 1.3b5 TitleType=1 BackgrndBmp= BackgrndAlign=4 Backgrnd=1 BackgrndColor=10 Uninstall=1 Silent=1 SmsMode=0 [Types] Types=3 Type1Components=5 Type1Name=Custom Type1ComponentList=1 2 3 4 5 Type2Components=4 Type2Name=Typical Type2ComponentList=1 3 4 5 Type3Components=1 Type3Name=Compact Type3ComponentList=1 [Components] Components=5 Component1Groups=5 Component1Name=Application Files Component1Description=Application files needed to run the application Component1GroupList=1 3 25 26 27 Component2Groups=15 Component2Name=Source Code Component2Description=Source code for Apache and support tools Component2GroupList=10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 Component3Groups=6 Component3Name=Documentation Component3Description=Apache documentation Component3GroupList=4 5 6 7 8 9 Component4Groups=1 Component4Name=Additional Modules Component4Description=Apache modules to extend the server Component4GroupList=2 Component5Groups=1 Component5Name=Icons Component5Description=Icons for directory indexes Component5GroupList=28 [Groups] Groups=28 Group1Size=285475 Group1Files=10 Group1Name=Program Executables Group1Dir=INSTALLDIR Group1Update=0 Group1File1=C:\Apache\Apache.exe Group1File2=C:\Apache\ApacheCore.dll Group1File3=C:\Apache\Announcement Group1File4=C:\Apache\ABOUT_APACHE Group1File5=C:\Apache\CHANGES Group1File6=C:\Apache\KEYS Group1File7=C:\Apache\LICENSE Group1File8=C:\Apache\Makefile Group1File9=C:\Apache\README Group1File10=C:\Apache\README.NT Group2Size=95744 Group2Files=9 Group2Name=Additional Modules Group2Dir=INSTALLDIR\modules Group2Update=0 Group2File1=C:\Apache\modules\ApacheModuleDigest.dll Group2File2=C:\Apache\modules\ApacheModuleCERNMeta.dll Group2File3=C:\Apache\modules\ApacheModuleAuthAnon.dll Group2File4=C:\Apache\modules\ApacheModuleExpires.dll Group2File5=C:\Apache\modules\ApacheModuleHeaders.dll Group2File6=C:\Apache\modules\ApacheModuleProxy.dll Group2File7=C:\Apache\modules\ApacheModuleSpeling.dll Group2File8=C:\Apache\modules\ApacheModuleStatus.dll Group2File9=C:\Apache\modules\ApacheModuleUserTrack.dll Group3Size=32408 Group3Files=5 Group3Name=Configuration Files Group3Dir=INSTALLDIR\conf Group3Update=0 Group3File1=C:\Apache\conf\httpd.conf-dist-win
cvs commit: apache-1.3/src/main http_main.c
martin 98/02/22 12:52:35
Modified:src CHANGES
src/main http_main.c
Log:
Apache will, when started with the -X (single process) debugging flag,
honor the SIGINT or SIGQUIT signals again now. This capability got lost
a while ago during OS/2 signal handling changes.
Reviewed by: Dean Gaudet
Revision ChangesPath
1.656 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -u -r1.655 -r1.656
--- CHANGES 1998/02/22 15:00:50 1.655
+++ CHANGES 1998/02/22 20:52:22 1.656
@@ -1,5 +1,9 @@
Changes with Apache 1.3b6
+ *) Apache will, when started with the -X (single process) debugging flag,
+ honor the SIGINT or SIGQUIT signals again now. This capability got lost
+ a while ago during OS/2 signal handling changes.
+
*) [PORT] Work around the fact that NeXT runs on more than the
m68k chips in mod_status [Scott Anguish and Timothy Luoma
[EMAIL PROTECTED]]
1.294 +2 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -u -r1.293 -r1.294
--- http_main.c 1998/02/21 01:38:32 1.293
+++ http_main.c 1998/02/22 20:52:33 1.294
@@ -3291,6 +3291,8 @@
if (one_process) {
signal(SIGHUP, just_die);
+ signal(SIGINT, just_die);
+ signal(SIGQUIT, SIG_DFL);
signal(SIGTERM, just_die);
child_main(slot);
}
cvs commit: apache-1.3/htdocs/manual new_features_1_3.html
martin 98/02/22 13:10:06 Modified:src README.EBCDIC .Announcement htdocs/manual new_features_1_3.html Log: Add blurb about the BS2000 EBCDIC Port Revision ChangesPath 1.3 +65 -43apache-1.3/src/README.EBCDIC Index: README.EBCDIC === RCS file: /home/cvs/apache-1.3/src/README.EBCDIC,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- README.EBCDIC 1998/01/26 16:46:06 1.2 +++ README.EBCDIC 1998/02/22 21:10:04 1.3 @@ -47,6 +47,19 @@ code are an exception: they are not converted to ASCII a second time. +* By examining the call hierarchy for the BUFF management routines, + I added an ebcdic/ascii conversion layer which would be crossed + on every puts/write/get/gets, and a conversion flag which allowed + switching of the conversions on-the-fly. So it is now possible to + read the header lines of a CGI-script output in EBCDIC format, and + then find out that the remainder of the script's output is in + ASCII (like in the output of a WWW Counter program). Likewise, the + server always generates its header lines in EBCDIC (and with ASCII + conversion enabled) and determines, based on the type of document + being served, whether the document body (except for the chunking + information, of course) is in ASCII already or is converted from + EBCDIC. + * For Text documents (MIME types text/plain, text/html etc.), an implicit translation to ASCII can be used, or (if the users prefer to store some documents in raw ASCII form for faster serving) can @@ -81,47 +94,56 @@ - means: doesn't work for some reason ? means: compiled-in, but untested - http_core.c + - mod_access.c + - mod_actions.c ? - mod_alias.c + - mod_asis.c? - mod_auth.c+ - mod_auth_anon.c + - mod_auth_db.c - / no libdb - mod_auth_dbm.c- / no libdbm - mod_autoindex.c + - mod_cern_meta.c ? - mod_cgi.c + - mod_digest.c - / MD5 not ported yet - mod_dir.c + - mod_dld.c - / no shared libs - mod_env.c + - mod_example.c - / not tried yet - mod_expires.c + - mod_headers.c + - mod_imap.c+ - mod_include.c + - mod_info.c+ / some flaws - mod_log_agent.c + - mod_log_config.c + - mod_log_referer.c + - mod_mime.c+ - mod_mime_magic.c - / not tried yet - mod_negotiation.c + - mod_proxy.c - / no protocol conversion implemented yet - mod_rewrite.c ? / untested - mod_setenvif.c+ - mod_so.c - no shared libs - mod_speling.c + - mod_status.c + - mod_unique_id.c + - mod_userdir.c + - mod_usertrack.c ? - - -What doesn't work yet: -- no DBM or DB authentication (library missing) -- no MD5 hash or digest (not ported yet) + http_core.c + + mod_access.c + + mod_actions.c ? + mod_alias.c + + mod_asis.c? + mod_auth.c+ + mod_auth_anon.c + + mod_auth_db.c ? with own libdb.a + mod_auth_dbm.c? with own libdb.a + mod_autoindex.c + + mod_cern_meta.c ? + mod_cgi.c + + mod_digest.c - / MD5 not ported yet + mod_dir.c + + mod_dld.c - / no shared libs + mod_env.c + + mod_example.c - / not tried yet + mod_expires.c + + mod_headers.c + + mod_imap.c+ + mod_include.c + + mod_info.c+ + mod_log_agent.c + + mod_log_config.c + + mod_log_referer.c + + mod_mime.c+ + mod_mime_magic.c - / not tried yet + mod_negotiation.c + + mod_proxy.c ? / works, cache still needs some work + mod_rewrite.c ? / untested + mod_setenvif.c+ + mod_speling.c + + mod_status.c + + mod_unique_id.c + + mod_userdir.c + + mod_usertrack.c ? / untested + +Additional (third-party) modules:See: + mod_jserv.c - / JAVA still being ported http://java.apache.org/ + mod_php.c - / not ported yet http://www.php.net/ + mod_put.c ? / untested http://hpwww.ec-lyon.fr/~vincent/apache/mod_put.html + mod_session.c ? / untested ftp://hachiman.vidya.com/pub/apache/mod_session.tar.gz + mod_so.c - / no shared libs + + +Notes: +To use the mod_auth_db functionality, you will need a working libdb.a. +On the system where I did the port none was available, so I ported the +standard db-1.85.14 with little problems. Note however that you will need
cvs commit: apache-1.3/src/include conf.h
martin 98/02/22 13:14:54 Modified:src/include conf.h Log: Update BS2000 configuration defines Revision ChangesPath 1.183 +2 -2 apache-1.3/src/include/conf.h Index: conf.h === RCS file: /home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.182 retrieving revision 1.183 diff -u -u -r1.182 -r1.183 --- conf.h1998/02/21 01:42:36 1.182 +++ conf.h1998/02/22 21:14:54 1.183 @@ -466,12 +466,12 @@ #define NET_SIZE_T size_t #define HAVE_SHMGET #define USE_SHMGET_SCOREBOARD -#ifdef _OSD_POSIX /* BS2000-POSIX mainframe does not have syslog and needs initgroups */ +#ifdef _OSD_POSIX /* BS2000-POSIX mainframe needs initgroups */ #define NEED_INITGROUPS #define NEED_HASHBANG_EMUL /* execve() doesn't start shell scripts by default */ -#undef HAVE_SYSLOG #undef HAVE_SHMGET #undef USE_SHMGET_SCOREBOARD +#undef bzero #endif /*_OSD_POSIX*/ #elif defined(UW)
cvs commit: apache-1.3/src/main explain.c
martin 98/02/22 13:17:05 Modified:src/include explain.h Removed: src/main explain.c Log: Rewrite explain.h to use aplog_error(...APLOG_DEBUG...); remove explain.c Revision ChangesPath 1.6 +23 -12apache-1.3/src/include/explain.h Index: explain.h === RCS file: /home/cvs/apache-1.3/src/include/explain.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -u -r1.5 -r1.6 --- explain.h 1997/10/07 05:38:46 1.5 +++ explain.h 1998/02/22 21:17:04 1.6 @@ -8,17 +8,28 @@ #define Explain5(f,a1,a2,a3,a4,a5) #define Explain6(f,a1,a2,a3,a4,a5,a6) #else -#define DEF_Explain static const char *__ExplainFile=__FILE__; -void _Explain(const char *szFile, int nLine, const char *szFmt,...) - __attribute__((format(printf,3,4))); -#define Explain0(f) _Explain(__ExplainFile,__LINE__,f) -#define Explain1(f,a1) _Explain(__ExplainFile,__LINE__,f,a1) -#define Explain2(f,a1,a2)_Explain(__ExplainFile,__LINE__,f,a1,a2) -#define Explain3(f,a1,a2,a3) _Explain(__ExplainFile,__LINE__,f,a1,a2,a3) -#define Explain4(f,a1,a2,a3,a4) _Explain(__ExplainFile,__LINE__,f,a1,a2,a3,a4) -#define Explain5(f,a1,a2,a3,a4,a5) \ - _Explain(__ExplainFile,__LINE__,f,a1,a2,a3,a4,a5) -#define Explain6(f,a1,a2,a3,a4,a5,a6)\ - _Explain(__ExplainFile,__LINE__,f,a1,a2,a3,a4,a5,a6) +#include http_log.h +#define DEF_Explain +#define Explain0(f) \ +aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \ +f) +#define Explain1(f,a1) \ +aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \ +f,a1) +#define Explain2(f,a1,a2) \ +aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \ +f,a1,a2) +#define Explain3(f,a1,a2,a3) \ +aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \ +f,a1,a2,a3) +#define Explain4(f,a1,a2,a3,a4) \ +aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \ +f,a1,a2,a3,a4) +#define Explain5(f,a1,a2,a3,a4,a5) \ +aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \ +f,a1,a2,a3,a4,a5) +#define Explain6(f,a1,a2,a3,a4,a5,a6) \ +aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \ +f,a1,a2,a3,a4,a5,a6) #endif
cvs commit: apache-1.3/src/modules/proxy mod_proxy.c
martin 98/02/22 13:22:13
Modified:src/modules/proxy mod_proxy.c
Log:
Ignore case on host name comparisons for NoCache and NoProxy directives
Revision ChangesPath
1.37 +2 -2 apache-1.3/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -u -r1.36 -r1.37
--- mod_proxy.c 1998/02/22 21:03:43 1.36
+++ mod_proxy.c 1998/02/22 21:22:12 1.37
@@ -468,7 +468,7 @@
/* Don't duplicate entries */
for (i = 0; i conf-noproxies-nelts; i++) {
- if (strcmp(arg, list[i].name) == 0)
+ if (strcasecmp(arg, list[i].name) == 0) /* ignore case for host names */
found = 1;
}
@@ -683,7 +683,7 @@
/* Don't duplicate entries */
for (i = 0; i conf-nocaches-nelts; i++) {
- if (strcmp(arg, list[i].name) == 0)
+ if (strcasecmp(arg, list[i].name) == 0) /* ignore case for host names */
found = 1;
}
cvs commit: apache-1.3/src/modules/proxy mod_proxy.h proxy_connect.c proxy_ftp.c proxy_http.c
martin 98/02/22 13:35:33
Modified:src/modules/proxy mod_proxy.h proxy_connect.c proxy_ftp.c
proxy_http.c
Log:
[Port]: minor changes to ease EBCDIC port
Revision ChangesPath
1.27 +6 -0 apache-1.3/src/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/mod_proxy.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -u -r1.26 -r1.27
--- mod_proxy.h 1998/01/07 16:46:35 1.26
+++ mod_proxy.h 1998/02/22 21:35:30 1.27
@@ -121,6 +121,12 @@
/* maximum 'CacheDirLevels*CacheDirLength' value */
#define CACHEFILE_LEN 20 /* must be less than HASH_LEN/2 */
+#ifdef CHARSET_EBCDIC
+#define CRLF \r\n
+#else /*CHARSET_EBCDIC*/
+#define CRLF \015\012
+#endif /*CHARSET_EBCDIC*/
+
#define SEC_ONE_DAY 86400 /* one day, in seconds */
#define SEC_ONE_HR 3600/* one hour, in seconds */
1.21 +4 -4 apache-1.3/src/modules/proxy/proxy_connect.c
Index: proxy_connect.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_connect.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -u -r1.20 -r1.21
--- proxy_connect.c 1998/01/07 16:46:36 1.20
+++ proxy_connect.c 1998/02/22 21:35:30 1.21
@@ -184,17 +184,17 @@
* a HTTP/1.0 request to keep things simple.
*/
Explain0(Sending the CONNECT request to the remote proxy);
- ap_snprintf(buffer, sizeof(buffer), CONNECT %s HTTP/1.0\015\012,
+ ap_snprintf(buffer, sizeof(buffer), CONNECT %s HTTP/1.0 CRLF,
r-uri);
write(sock, buffer, strlen(buffer));
ap_snprintf(buffer, sizeof(buffer),
- Proxy-agent: %s\015\012\015\012, SERVER_VERSION);
+ Proxy-agent: %s CRLF CRLF, SERVER_VERSION);
write(sock, buffer, strlen(buffer));
}
else {
Explain0(Returning 200 OK Status);
- rvputs(r, HTTP/1.0 200 Connection established\015\012, NULL);
- rvputs(r, Proxy-agent: , SERVER_VERSION, \015\012\015\012, NULL);
+ rvputs(r, HTTP/1.0 200 Connection established CRLF, NULL);
+ rvputs(r, Proxy-agent: , SERVER_VERSION, CRLF CRLF, NULL);
bflush(r-connection-client);
}
1.49 +26 -18apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -u -r1.48 -r1.49
--- proxy_ftp.c 1998/01/30 09:26:44 1.48
+++ proxy_ftp.c 1998/02/22 21:35:31 1.49
@@ -566,6 +566,10 @@
bpushfd(f, sock, sock);
/* shouldn't we implement telnet control options here? */
+#ifdef CHARSET_EBCDIC
+bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 1);
+#endif /*CHARSET_EBCDIC*/
+
/* possible results: 120, 220, 421 */
hard_timeout(proxy ftp, r);
i = ftp_getrc(f);
@@ -583,7 +587,7 @@
bputs(USER , f);
bwrite(f, user, userlen);
-bputs(\015\012, f);
+bputs(CRLF, f);
bflush(f); /* capture any errors */
Explain1(FTP: USER %s, user);
@@ -609,7 +613,7 @@
return FORBIDDEN;
bputs(PASS , f);
bwrite(f, password, passlen);
- bputs(\015\012, f);
+ bputs(CRLF, f);
bflush(f);
Explain1(FTP: PASS %s, password);
/* possible results 202, 230, 332, 421, 500, 501, 503, 530 */
@@ -646,7 +650,7 @@
len = decodeenc(path);
bputs(CWD , f);
bwrite(f, path, len);
- bputs(\015\012, f);
+ bputs(CRLF, f);
bflush(f);
Explain1(FTP: CWD %s, path);
/* responses: 250, 421, 500, 501, 502, 530, 550 */
@@ -684,7 +688,7 @@
/* set type to image */
/* TM - Added \015\012 to the end of TYPE I, otherwise it hangs the
connection */
- bputs(TYPE I\015\012, f);
+ bputs(TYPE I CRLF, f);
bflush(f);
Explain0(FTP: TYPE I);
/* responses: 200, 421, 500, 501, 504, 530 */
@@ -721,7 +725,7 @@
}
}
-bputs(PASV\015\012, f);
+bputs(PASV CRLF, f);
bflush(f);
Explain0(FTP: PASV command issued);
/* possible results: 227, 421, 500, 501, 502, 530 */
@@ -827,7 +831,7 @@
else {
bputs(SIZE , f);
bwrite(f, path, len);
- bputs(\015\012, f);
+ bputs(CRLF, f);
bflush(f);
Explain1(FTP: SIZE %s, path);
i = ftp_getrc(f);
@@ -838,7 +842,7 @@
parms = d;
bputs(CWD , f);
bwrite(f, path, len);
- bputs(\015\012, f);
+ bputs(CRLF, f);
cvs commit: apache-1.3/src/main http_protocol.c
martin 98/02/22 13:37:48 Modified:src/main http_protocol.c Log: Typo Revision ChangesPath 1.191 +1 -1 apache-1.3/src/main/http_protocol.c Index: http_protocol.c === RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v retrieving revision 1.190 retrieving revision 1.191 diff -u -u -r1.190 -r1.191 --- http_protocol.c 1998/02/21 01:18:28 1.190 +++ http_protocol.c 1998/02/22 21:37:47 1.191 @@ -660,7 +660,7 @@ port = default_port(r); } -/* Make sure ports patch */ +/* Make sure ports match */ if (port != r-server-port) return uri;
cvs commit: apache-1.3/src/support htpasswd.c
martin 98/02/22 13:39:35 Modified:src/support htpasswd.c Log: [Port]: minor changes to ease EBCDIC port Revision ChangesPath 1.11 +5 -0 apache-1.3/src/support/htpasswd.c Index: htpasswd.c === RCS file: /home/cvs/apache-1.3/src/support/htpasswd.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -u -r1.10 -r1.11 --- htpasswd.c1998/01/21 22:05:45 1.10 +++ htpasswd.c1998/02/22 21:39:34 1.11 @@ -22,8 +22,13 @@ #include time.h #include unistd.h +#ifndef CHARSET_EBCDIC #define LF 10 #define CR 13 +#else /*CHARSET_EBCDIC*/ +#define LF '\n' +#define CR '\r' +#endif /*CHARSET_EBCDIC*/ #define MAX_STRING_LEN 256
