cvs commit: apachen/src/modules/standard mod_mime_magic.c
dgaudet 97/08/19 18:24:41 Modified:src/modules/standard mod_mime_magic.c Log: remove unreachable code Revision ChangesPath 1.12 +1 -2 apachen/src/modules/standard/mod_mime_magic.c Index: mod_mime_magic.c === RCS file: /export/home/cvs/apachen/src/modules/standard/mod_mime_magic.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mod_mime_magic.c 1997/08/18 13:12:16 1.11 +++ mod_mime_magic.c 1997/08/20 01:24:40 1.12 @@ -1581,9 +1581,8 @@ /* At MIME-typing time we want to follow symlinks */ /* So just handle it. */ magic_process(r); -return 1; } -return 1; + return 1; #endif #ifdefS_IFSOCK #ifndef __COHERENT__
cvs commit: apachen/src/core alloc.c
dgaudet 97/08/19 18:22:53
Modified:src/core alloc.c
Log:
Remove an unused variable.
Revision ChangesPath
1.47 +1 -3 apachen/src/core/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apachen/src/core/alloc.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- alloc.c 1997/08/02 00:58:25 1.46
+++ alloc.c 1997/08/20 01:22:50 1.47
@@ -971,9 +971,7 @@
static void socket_cleanup (void *fdv)
{
-int rv;
-
-rv = closesocket((int)(long)fdv);
+closesocket((int)(long)fdv);
}
API_EXPORT(void) note_cleanups_for_socket (pool *p, int fd) {
cvs commit: apachen/src/helpers InstallApache MakeLint
sameer 97/08/19 16:00:27 Modified:conf access.conf-dist httpd.conf-dist srm.conf-dist src .cvsignore Added: .Makefile src/helpers InstallApache MakeLint Log: Add a top level makefile to support normal builds, lint builds and an install target. Reviewed by: Jim Jagielski Revision ChangesPath 1.1 apachen/Makefile Index: Makefile === # # Makefile for building the default Apache # # This Makefile builds either a "standard" or a "lint" Apache. If you # want to build a custom Apache, read the instructions in the src/ # directory in the file INSTALL. # PERL=/usr/bin/perl SERVERROOT=/usr/local/apache all: src/httpd src/httpd: (cd src; \ test ! -f Configuration && cp Configuration.tmpl Configuration; \ ./Configure -file Configuration; $(MAKE) all support) lint: (cd src; $(PERL) ./helpers/MakeLint; \ ./Configure -file Configuration.lint; \ $(MAKE) all support) install: src/httpd -src/helpers/InstallApache $(SERVERROOT) clean: (cd src; make clean) 1.12 +3 -3 apachen/conf/access.conf-dist Index: access.conf-dist === RCS file: /export/home/cvs/apachen/conf/access.conf-dist,v retrieving revision 1.11 retrieving revision 1.12 diff -c -u -r1.11 -r1.12 /usr/bin/diff: conflicting specifications of output style --- access.conf-dist 1997/04/01 00:52:33 1.11 +++ access.conf-dist 1997/08/19 23:00:22 1.12 @@ -12,7 +12,7 @@ # This should be changed to whatever you set DocumentRoot to. - + # This may also be "None", "All", or any combination of "Indexes", # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews". @@ -35,10 +35,10 @@ -# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased +# @@ServerRoot@@/cgi-bin should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. - + AllowOverride None Options None 1.16 +2 -2 apachen/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apachen/conf/httpd.conf-dist,v retrieving revision 1.15 retrieving revision 1.16 diff -c -u -r1.15 -r1.16 /usr/bin/diff: conflicting specifications of output style --- httpd.conf-dist 1997/07/16 05:02:44 1.15 +++ httpd.conf-dist 1997/08/19 23:00:22 1.16 @@ -44,7 +44,7 @@ # ServerRoot: The directory the server's config, error, and log files # are kept in -ServerRoot /usr/local/etc/httpd +ServerRoot @@ServerRoot@@ # BindAddress: You can support virtual hosts with this option. This option # is used to tell the server which IP address to listen to. It can either @@ -151,7 +151,7 @@ # To enable the cache as well, edit and uncomment the following lines: -#CacheRoot /usr/local/etc/httpd/proxy +#CacheRoot @@ServerRoot@@/proxy #CacheSize 5 #CacheGcInterval 4 #CacheMaxExpire 24 1.16 +3 -3 apachen/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /export/home/cvs/apachen/conf/srm.conf-dist,v retrieving revision 1.15 retrieving revision 1.16 diff -c -u -r1.15 -r1.16 /usr/bin/diff: conflicting specifications of output style --- srm.conf-dist 1997/07/16 05:02:46 1.15 +++ srm.conf-dist 1997/08/19 23:00:23 1.16 @@ -12,7 +12,7 @@ # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. -DocumentRoot /usr/local/etc/httpd/htdocs +DocumentRoot @@ServerRoot@@/htdocs # UserDir: The name of the directory which is appended onto a user's home # directory if a ~user request is recieved. @@ -135,12 +135,12 @@ # require it to be present in the URL. So "/icons" isn't aliased in this # example. -#Alias /icons/ /usr/local/etc/httpd/icons/ +#Alias /icons/ @@ServerRoot@@/icons/ # ScriptAlias: This controls which directories contain server scripts. # Format: ScriptAlias fakename realname -#ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/ +#ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/ # If you want to use server side includes, or CGI outside # ScriptAliased directories, uncomment the following lines. 1.7 +2 -0 apachen/src/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apachen/src/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -c -u -r1.6 -r1.7 /usr/b
cvs commit: apache-site index.html
rse 97/08/19 11:13:22 Modified:.index.html Log: Update the frontdoor for Apache 1.2.3. Now the run can begin... Revision ChangesPath 1.33 +7 -7 apache-site/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/index.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- index.html1997/08/13 21:51:53 1.32 +++ index.html1997/08/19 18:13:21 1.33 @@ -52,19 +52,19 @@ -Apache 1.2.1 Now Available +Apache 1.2.3 Now Available -Apache 1.2.1 is now available. This is a maintenance release, with -numerous bug fixes from 1.2.0. The 1.2 series has been well tested -and is a stable platform. If you are running any beta of 1.2, or any -older version of the Apache HTTP server, you should upgrade to this -release for both stability and security reasons. +Apache 1.2.3 is now available. This is a maintenance release, with numerous +bug fixes from 1.2.1 (Apache 1.2.2 was never released). The 1.2 series has +been well tested and is a stable platform. If you are running any beta of +1.2, or any older version of the Apache HTTP server, you should upgrade to +this release for both stability and security reasons. -Download Apache 1.2 | +Download Apache 1.2.3 | New Features in Apache 1.2
cvs commit: apachen/src/core http_request.c httpd.h
dgaudet 97/08/19 00:52:44
Modified:src/core http_request.c httpd.h
Log:
Fix a bug introduced by Ben's canonical name patch. And avoid a strdup
that's not necessary.
Revision ChangesPath
1.78 +1 -1 apachen/src/core/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apachen/src/core/http_request.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- http_request.c1997/08/18 10:59:04 1.77
+++ http_request.c1997/08/19 07:52:42 1.78
@@ -261,7 +261,7 @@
* fake one. But don't run through the directory entries.
*/
-if (test_filename == NULL) {
+if (r->filename == NULL) {
r->filename = pstrdup(r->pool, r->uri);
r->finfo.st_mode = 0; /* Not really a file... */
r->per_dir_config = per_dir_defaults;
1.141 +3 -3 apachen/src/core/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apachen/src/core/httpd.h,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- httpd.h 1997/08/18 10:59:04 1.140
+++ httpd.h 1997/08/19 07:52:42 1.141
@@ -832,10 +832,10 @@
API_EXPORT(void) chdir_file(const char *file);
#ifndef HAVE_CANONICAL_FILENAME
-#define os_canonical_filename(p,f) pstrdup(p,f)
-#endif
-
+#define os_canonical_filename(p,f) (f)
+#else
API_EXPORT(char *)os_canonical_filename(pool *p,const char *file);
+#endif
char *get_local_host(pool *);
unsigned long get_virthost_addr (const char *hostname, unsigned short *port);
