diff -urN ../apache_1.3.28/conf/httpd.conf-dist apache/conf/httpd.conf-dist --- ../apache_1.3.28/conf/httpd.conf-dist Wed Jul 16 12:36:41 2003 +++ apache/conf/httpd.conf-dist Tue Jul 22 09:46:06 2003 @@ -67,13 +67,13 @@ # DISK. The PID of the main server process is automatically appended to # the filename. # -#LockFile logs/accept.lock +#LockFile "logs/accept.lock" # # PidFile: The file in which the server should record its process # identification number when it starts. # -PidFile logs/httpd.pid +PidFile "logs/httpd.pid" # # ScoreBoardFile: File used to store internal server process information. @@ -81,7 +81,7 @@ # this file will be created when you run Apache) then you *must* ensure that # no two invocations of Apache share the same scoreboard file. # -ScoreBoardFile logs/apache_runtime_status +ScoreBoardFile "logs/apache_runtime_status" # # In the standard configuration, the server will process httpd.conf (this @@ -451,7 +451,7 @@ # logged here. If you *do* define an error logfile for a # container, that host's errors will be logged there and not here. # -ErrorLog logs/error_log +ErrorLog "logs/error_log" # # LogLevel: Control the number of messages logged to the error_log. @@ -476,20 +476,20 @@ # define per- access logfiles, transactions will be # logged therein and *not* in this file. # -CustomLog logs/access_log common +CustomLog "logs/access_log" common # # If you would like to have agent and referer logfiles, uncomment the # following directives. # -#CustomLog logs/referer_log referer -#CustomLog logs/agent_log agent +#CustomLog "logs/referer_log" referer +#CustomLog "logs/agent_log" agent # # If you prefer a single logfile with access, agent, and referer information # (Combined Logfile Format) you can use the following directive. # -#CustomLog logs/access_log combined +#CustomLog "logs/access_log" combined # # Optionally add a line containing the server version and virtual host diff -urN ../apache_1.3.28/conf/mime.types apache/conf/mime.types --- ../apache_1.3.28/conf/mime.types Mon Jul 14 11:09:10 2003 +++ apache/conf/mime.types Tue Jul 22 09:46:06 2003 @@ -50,7 +50,7 @@ application/news-transmission application/ocsp-request application/ocsp-response -application/octet-stream bin dms lha lzh exe class so dll +application/octet-stream bin dms lha lzh exe class so dll dmg application/oda oda application/ogg ogg application/parityfec @@ -354,6 +354,7 @@ application/x-gzip application/x-hdf hdf application/x-javascript js +application/x-java-jnlp-file jnlp application/x-koan skp skd skt skm application/x-latex latex application/x-netcdf nc cdf @@ -454,7 +455,9 @@ image/gif gif image/ief ief image/jpeg jpeg jpg jpe +image/jp2 jp2 image/naplps +image/pict pict pic pct image/png png image/prs.btif image/prs.pti @@ -479,11 +482,13 @@ image/vnd.wap.wbmp wbmp image/vnd.xiff image/x-cmu-raster ras +image/x-macpaint pntg pnt mac image/x-icon ico image/x-portable-anymap pnm image/x-portable-bitmap pbm image/x-portable-graymap pgm image/x-portable-pixmap ppm +image/x-quicktime qtif qti image/x-rgb rgb image/x-xbitmap xbm image/x-xpixmap xpm @@ -571,6 +576,7 @@ video/mp1s video/mp2p video/mp2t +video/mp4 mp4 video/mp4v-es video/mpv video/mpeg mpeg mpg mpe @@ -586,6 +592,7 @@ video/vnd.nokia.interleaved-multimedia video/vnd.objectvideo video/vnd.vivo +video/x-dv dv dif video/x-msvideo avi video/x-sgi-movie movie x-conference/x-cooltalk ice diff -urN ../apache_1.3.28/htdocs/index.html.cn apache/htdocs/index.html.cn --- ../apache_1.3.28/htdocs/index.html.cn Wed Dec 31 16:00:00 1969 +++ apache/htdocs/index.html.cn Tue Aug 21 17:10:57 2001 @@ -0,0 +1,35 @@ + + + + Apache 安装测试页面 + + + + + + +

如果您看到这个页面，说明 Apache web server 软件已安装成功。您可以添加内容到这个目录并替换该页面。

+ +
+ +

没有看到您想看的网站？

+ +

出现这个页面是因为该网站的管理员已经更改了这个 web 服务器的配置。如有问题，请与维护该服务器的负责人联系。Apache 软件基金会，即开发这套软件的机构，并不参与维护该网站，也无法帮助您解决配置问题。

+ +
+ +

Apache 文稿已经包含在该版本中。

+ +

现在您可以在使用 Apache 的网站服务器上，自由地使用下面的图像了。感谢您使用 Apache！

+ +
+ + + diff -urN ../apache_1.3.28/htdocs/index.html.zh-tw.big5 apache/htdocs/index.html.zh-tw.big5 --- ../apache_1.3.28/htdocs/index.html.zh-tw.big5 Tue May 13 15:27:07 2003 +++ apache/htdocs/index.html.zh-tw.big5 Thu Aug 14 18:35:22 2003 @@ -2,6 +2,7 @@ 杆 Apache 代刚呼 + /dev/null then - echo "Configuration.tmpl is more recent than $file;" + echo "WARNING: Configuration.tmpl is more recent than $file;" echo "Make sure that $file is valid and, if it is, simply" echo "'touch $file' and re-run $0 again." exitcode=1 - exit 1 + #exit 1 fi echo "Using config file: $file" @@ -537,6 +537,7 @@ OS='Darwin' CFLAGS="$CFLAGS -DDARWIN" DEF_WANTHSREGEX=yes + LDFLAGS="$LDFLAGS -Wl,-bind_at_load" ;; *-dec-osf*) OS='DEC OSF/1' @@ -1181,7 +1182,15 @@ LDFLAGS_SHLIB_EXPORT='' SHLIB_SUFFIX_DEPTH=0 ;; - *-apple-rhapsody* | *-apple-darwin* ) + *-apple-rhapsody*) + LD_SHLIB="cc" + CFLAGS_SHLIB="" + LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress' + LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB + LDFLAGS_SHLIB_EXPORT="" + SHLIB_SUFFIX_DEPTH=0 + ;; + *-apple-darwin*) LD_SHLIB="cc" CFLAGS_SHLIB="" case "$PLAT" in @@ -1189,7 +1198,7 @@ LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress' ;; * ) - LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress -flat_namespace' + LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress -flat_namespace -Wl,-bind_at_load' ;; esac LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB diff -urN ../apache_1.3.28/src/include/ap_ebcdic.h apache/src/include/ap_ebcdic.h --- ../apache_1.3.28/src/include/ap_ebcdic.h Mon Feb 3 09:13:18 2003 +++ apache/src/include/ap_ebcdic.h Fri Oct 24 15:41:55 2003 @@ -53,7 +53,7 @@ */ #ifndef AP_EBCDIC_H -#define AP_EBCDIC_H "$Id: apache-670-apache-1-3-28.diff,v 1.3 2004/02/17 02:02:03 fkr Exp $" +#define AP_EBCDIC_H "$Id: apache-670-apache-1-3-28.diff,v 1.3 2004/02/17 02:02:03 fkr Exp $" #include diff -urN ../apache_1.3.28/src/main/alloc.c apache/src/main/alloc.c --- ../apache_1.3.28/src/main/alloc.c Fri Jun 20 08:05:40 2003 +++ apache/src/main/alloc.c Fri Oct 24 15:42:25 2003 @@ -2859,7 +2859,7 @@ if ((p->kill_how == kill_after_timeout) || (p->kill_how == kill_only_once)) { /* Subprocess may be dead already. Only need the timeout if not. */ - if (ap_os_kill(p->pid, SIGTERM) == -1) { + if ((ap_os_kill(p->pid, SIGTERM) == -1) && (errno == ESRCH)) { p->kill_how = kill_never; } else { diff -urN ../apache_1.3.28/src/os/bs2000/ebcdic.h apache/src/os/bs2000/ebcdic.h --- ../apache_1.3.28/src/os/bs2000/ebcdic.h Fri Mar 9 02:10:40 2001 +++ apache/src/os/bs2000/ebcdic.h Fri Oct 24 15:42:25 2003 @@ -1,5 +1,5 @@ #ifndef EBCDIC_H -#define EBCDIC_H "$Id: apache-670-apache-1-3-28.diff,v 1.3 2004/02/17 02:02:03 fkr Exp $" +#define EBCDIC_H "$Id: apache-670-apache-1-3-28.diff,v 1.3 2004/02/17 02:02:03 fkr Exp $" #include diff -urN ../apache_1.3.28/src/os/os390/ebcdic.h apache/src/os/os390/ebcdic.h --- ../apache_1.3.28/src/os/os390/ebcdic.h Fri Mar 9 02:10:45 2001 +++ apache/src/os/os390/ebcdic.h Fri Oct 24 15:42:25 2003 @@ -1,5 +1,5 @@ #ifndef EBCDIC_H -#define EBCDIC_H "$Id: apache-670-apache-1-3-28.diff,v 1.3 2004/02/17 02:02:03 fkr Exp $" +#define EBCDIC_H "$Id: apache-670-apache-1-3-28.diff,v 1.3 2004/02/17 02:02:03 fkr Exp $" #include diff -urN ../apache_1.3.28/src/os/tpf/ebcdic.h apache/src/os/tpf/ebcdic.h --- ../apache_1.3.28/src/os/tpf/ebcdic.h Fri Mar 9 02:10:50 2001 +++ apache/src/os/tpf/ebcdic.h Fri Oct 24 15:42:25 2003 @@ -1,5 +1,5 @@ #ifndef EBCDIC_H -#define EBCDIC_H "$Id: apache-670-apache-1-3-28.diff,v 1.3 2004/02/17 02:02:03 fkr Exp $" +#define EBCDIC_H "$Id: apache-670-apache-1-3-28.diff,v 1.3 2004/02/17 02:02:03 fkr Exp $" #include diff -urN ../apache_1.3.28/src/support/ab.c apache/src/support/ab.c --- ../apache_1.3.28/src/support/ab.c Sun Jul 6 10:52:27 2003 +++ apache/src/support/ab.c Fri Oct 24 15:42:25 2003 @@ -1358,14 +1358,14 @@ static void copyright(void) { if (!use_html) { - printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.3 $> apache-1.3"); + printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.3 $> apache-1.3"); printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n"); printf("Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/\n"); printf("\n"); } else { printf("

\n"); - printf(" This is ApacheBench, Version %s <%s> apache-1.3
\n", VERSION, "$Revision: 1.3 $"); + printf(" This is ApacheBench, Version %s <%s> apache-1.3
\n", VERSION, "$Revision: 1.3 $"); printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
\n"); printf(" Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/
\n"); printf("

\n

\n"); diff -urN ../apache_1.3.28/src/support/dbmmanage.1 apache/src/support/dbmmanage.1 --- ../apache_1.3.28/src/support/dbmmanage.1 Mon Feb 3 09:13:37 2003 +++ apache/src/support/dbmmanage.1 Tue Jul 22 09:46:08 2003 @@ -128,7 +128,7 @@ .SH BUGS .PP One should be aware that there are a number of different DBM file -formats in existance, and with all likelihood, libraries for more than +formats in existence, and with all likelihood, libraries for more than one format may exist on your system. The three primary examples are NDBM, the GNU project's GDBM, and Berkeley DB 2. Unfortunately, all these libraries use different file formats, and you must make sure