cvs commit: apache/src CHANGES httpd.h
akosut 97/07/22 17:06:08 Modified:. README src CHANGES httpd.h Log: Prep for 1.3a1 Revision ChangesPath 1.10 +5 -1 apache/README Index: README === RCS file: /export/home/cvs/apache/README,v retrieving revision 1.9 retrieving revision 1.10 diff -c -u -r1.9 -r1.10 /usr/bin/diff: conflicting specifications of output style --- README1997/06/16 06:00:15 1.9 +++ README1997/07/23 00:06:02 1.10 @@ -1,5 +1,5 @@ Apache - Version 1.2 (and up) + Version 1.3 (and up) What is it? --- @@ -19,6 +19,10 @@ Installation + +NOTE: Windows users please see http://www.apache.org/docs/windows.html, + or the htdocs/manual/windows.html file included with Apache. The + following applies only to Unix users. Unless you grabbed a binary distribution of Apache, you must compile it for your specific platform. In order to compile it, you must set 1.360 +1 -1 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.359 retrieving revision 1.360 diff -c -u -r1.359 -r1.360 /usr/bin/diff: conflicting specifications of output style --- CHANGES 1997/07/21 19:40:12 1.359 +++ CHANGES 1997/07/23 00:06:05 1.360 @@ -1,4 +1,4 @@ -Changes with Apache 1.3 +Changes with Apache 1.3a1 *) Added another Configure helper script: TestLib. It determines if a specified library exists. 1.131 +1 -1 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.130 retrieving revision 1.131 diff -c -u -r1.130 -r1.131 /usr/bin/diff: conflicting specifications of output style --- httpd.h 1997/07/21 05:53:46 1.130 +++ httpd.h 1997/07/23 00:06:06 1.131 @@ -288,7 +288,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3-dev /* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.3a1 /* SEE COMMENTS ABOVE */ #ifdef SERVER_SUBVERSION #define SERVER_VERSION SERVER_BASEVERSION SERVER_SUBVERSION #else
cvs commit: apache/src CHANGES httpd.h
fielding97/07/19 12:42:19 Modified:src CHANGES httpd.h Log: Introduced APACHE_RELEASE numeric symbol, since branching a release makes a date meaningless for feature comparisons. The format is jnnffbb(j = major number, nn = minor, ff = bugfix, bb = beta) Note that 1.2b11 would have been 1020011 and 1.2.0 would be 1020012, since the beta sequence numbers are actually X.X.0 releases. Revision ChangesPath 1.351 +8 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.350 retrieving revision 1.351 diff -C3 -r1.350 -r1.351 *** CHANGES 1997/07/19 10:20:50 1.350 --- CHANGES 1997/07/19 19:42:17 1.351 *** *** 175,180 --- 175,188 *) PORT: Added Windows NT support [Ben Laurie and Ambarish Malpani [EMAIL PROTECTED]] + Changes with Apache 1.2.2 + + *) API: Symbol APACHE_RELEASE provides a numeric form of the Apache + release version number, such that it always increases along the + same lines as our source code branching. [Roy Fielding] + + *) Minor oversight on multiple variants fixed. [Paul Sutton] PR#94 + Changes with Apache 1.2.1 *) SECURITY: Don't serve file system objects unless they are plain files, 1.129 +5 -0 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.128 retrieving revision 1.129 diff -C3 -r1.128 -r1.129 *** httpd.h 1997/07/17 19:44:49 1.128 --- httpd.h 1997/07/19 19:42:18 1.129 *** *** 295,300 --- 295,305 #define SERVER_VERSION SERVER_BASEVERSION #endif + /* Numeric release version identifier: major minor bugfix betaseq + * Always increases along the same track as the source branch. + */ + #define APACHE_RELEASE 103 + #define SERVER_PROTOCOL HTTP/1.1 #define SERVER_SUPPORT http://www.apache.org/;
cvs commit: apache/src CHANGES httpd.h http_config.h http_main.c http_protocol.c
fielding97/05/26 21:41:55 Modified:src CHANGES httpd.h http_config.h http_main.c http_protocol.c Log: If multiple requests on a single connection are used to retrieve data from different virtual hosts, the virtual host list would be scanned starting with the most recently used VH instead of the first, causing most virtual hosts to be ignored. Fix required API version bump. Submitted by: Paul Sutton (Martin Mares, PR#610) Reviewed by: Roy Fielding, Randy Terbush, Ed Khortof Revision ChangesPath 1.279 +6 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.278 retrieving revision 1.279 diff -C3 -r1.278 -r1.279 *** CHANGES 1997/05/27 03:57:18 1.278 --- CHANGES 1997/05/27 04:41:48 1.279 *** *** 1,5 --- 1,11 Changes with Apache 1.2 + *) If multiple requests on a single connection are used to retrieve + data from different virtual hosts, the virtual host list would be + scanned starting with the most recently used VH instead of the first, + causing most virtual hosts to be ignored. + [Paul Sutton and Martin Mares] PR#610 + *) The OS/2 handling of process group was broken by a porting patch for MPE, so restored prior code for OS/2. [Roy Fielding and Garey Smiley] 1.105 +1 -0 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.104 retrieving revision 1.105 diff -C3 -r1.104 -r1.105 *** httpd.h 1997/05/14 19:22:51 1.104 --- httpd.h 1997/05/27 04:41:49 1.105 *** *** 533,538 --- 533,539 pool *pool; server_rec *server; + server_rec *base_server; /* Physical vhost this conn come in on */ /* Information about the connection itself */ 1.29 +1 -1 apache/src/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache/src/http_config.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C3 -r1.28 -r1.29 *** http_config.h 1997/04/27 10:13:16 1.28 --- http_config.h 1997/05/27 04:41:49 1.29 *** *** 226,232 * handle it back-compatibly, or at least signal an error). */ ! #define MODULE_MAGIC_NUMBER 19970427 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific --- 226,232 * handle it back-compatibly, or at least signal an error). */ ! #define MODULE_MAGIC_NUMBER 19970526 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific 1.146 +1 -0 apache/src/http_main.c Index: http_main.c === RCS file: /export/home/cvs/apache/src/http_main.c,v retrieving revision 1.145 retrieving revision 1.146 diff -C3 -r1.145 -r1.146 *** http_main.c 1997/05/27 03:57:18 1.145 --- http_main.c 1997/05/27 04:41:50 1.146 *** *** 1613,1618 --- 1613,1619 conn-local_addr = *saddr; conn-server = find_virtual_server(saddr-sin_addr, ntohs(saddr-sin_port), server); + conn-base_server = conn-server; conn-client = inout; conn-remote_addr = *remaddr; 1.123 +1 -0 apache/src/http_protocol.c Index: http_protocol.c === RCS file: /export/home/cvs/apache/src/http_protocol.c,v retrieving revision 1.122 retrieving revision 1.123 diff -C3 -r1.122 -r1.123 *** http_protocol.c 1997/05/27 04:14:20 1.122 --- http_protocol.c 1997/05/27 04:41:51 1.123 *** *** 761,766 --- 761,767 request_rec *r = (request_rec *)pcalloc (conn-pool, sizeof(request_rec)); r-connection = conn; + conn-server = conn-base_server; r-server = conn-server; r-pool = make_sub_pool(conn-pool);
cvs commit: apache/src CHANGES httpd.h alloc.h http_request.c http_protocol.c
fielding97/05/14 12:22:57 Modified:src CHANGES httpd.h alloc.h http_request.c http_protocol.c Log: Restore the semantics of headers_outheaders sent only with 200..299 and 304 responses err_headers_outheaders sent with all responses Moved the prior changes from the die() function to send_error_response() where they belong, and supplemented those with the other values that need to be reset. It also avoids the overhead of copying tables if err_headers_out is empty (the usual case), fixes a bug with assbackwards and 204/304, and removes a bit of code that should not be generating a Cache-Control header field even if r-no_cache is set. Reviewed by: Dean Gaudet Revision ChangesPath 1.275 +6 -1 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.274 retrieving revision 1.275 diff -C3 -r1.274 -r1.275 *** CHANGES 1997/05/13 04:01:49 1.274 --- CHANGES 1997/05/14 19:22:50 1.275 *** *** 2,8 *) If the lookup for a DirectoryIndex name with content negotiation has found matching variants, but none are acceptable, return the ! negotiation result if there are no more DirectoryIndex names lookup. [Petr Lampa and Roy Fielding] *) If a soft_timeout occurs after keepalive is set, then the main child --- 2,8 *) If the lookup for a DirectoryIndex name with content negotiation has found matching variants, but none are acceptable, return the ! negotiation result if there are no more DirectoryIndex names to lookup. [Petr Lampa and Roy Fielding] *) If a soft_timeout occurs after keepalive is set, then the main child *** *** 22,27 --- 22,32 reset the content_language(s) and content_encoding of the response before generating or redirecting to an error message, since the new message will have its own Content-* definitions. [Dean Gaudet] + + *) Restored the semantics of headers_out (headers sent only with 200..299 + and 304 responses) and err_headers_out (headers sent with all responses). + Avoid the overhead of copying tables if err_headers_out is empty + (the usual case). [Roy Fielding] *) Fixed a couple places where a check for the default Content-Type was not properly checking both the value configured by the DefaultType 1.104 +1 -1 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.103 retrieving revision 1.104 diff -C3 -r1.103 -r1.104 *** httpd.h 1997/05/08 11:27:28 1.103 --- httpd.h 1997/05/14 19:22:51 1.104 *** *** 474,480 * write modules to add to that environment. * * The difference between headers_out and err_headers_out is that the !* latter persist across internal redirects * (so the headers printed for ErrorDocument handlers will have them). * * The 'notes' table is for notes from one module to another, with no --- 474,480 * write modules to add to that environment. * * The difference between headers_out and err_headers_out is that the !* latter are printed even on error, and persist across internal redirects * (so the headers printed for ErrorDocument handlers will have them). * * The 'notes' table is for notes from one module to another, with no 1.20 +2 -0 apache/src/alloc.h Index: alloc.h === RCS file: /export/home/cvs/apache/src/alloc.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C3 -r1.19 -r1.20 *** alloc.h 1997/04/24 23:35:19 1.19 --- alloc.h 1997/05/14 19:22:52 1.20 *** *** 156,161 --- 156,163 array_header *table_elts (table *); + #define is_empty_table(t) (((t) == NULL)||((t)-nelts == 0)) + /* routines to remember allocation of other sorts of things... * generic interface first. Note that we want to have two separate * cleanup functions in the general case, one for exec() preparation, 1.50 +0 -10 apache/src/http_request.c Index: http_request.c === RCS file: /export/home/cvs/apache/src/http_request.c,v retrieving revision 1.49 retrieving revision 1.50 diff -C3 -r1.49 -r1.50 *** http_request.c1997/05/11 22:30:37 1.49 --- http_request.c1997/05/14 19:22:52 1.50 *** *** 764,779 r-status = type;
cvs commit: apache/src CHANGES httpd.h
fielding97/03/28 19:40:35
Modified:src CHANGES httpd.h
Log:
Host port changed to unsigned short.
Submitted by: Ken Coar, PR #276
Reviewed by: Roy Fielding, Chuck Murcko
Revision ChangesPath
1.215 +2 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.214
retrieving revision 1.215
diff -C3 -r1.214 -r1.215
*** CHANGES 1997/03/29 01:55:56 1.214
--- CHANGES 1997/03/29 03:40:33 1.215
***
*** 1,5
--- 1,7
Changes with Apache 1.2b8
+ *) Host port changed to unsigned short. [Ken Coar] PR #276
+
*) Fix typo in command definition of AuthAuthoritative. [Ken Coar] PR #246
*) Defined HAVE_SHMGET for shared memory on Linux. [Dean Gaudet]
1.93 +2 -2 apache/src/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache/src/httpd.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -C3 -r1.92 -r1.93
*** httpd.h 1997/03/20 17:10:09 1.92
--- httpd.h 1997/03/29 03:40:34 1.93
***
*** 568,574
struct server_addr_rec {
server_addr_rec *next;
struct in_addr host_addr; /* The bound address, for this server */
! short host_port;/* The bound port, for this server */
char *virthost; /* The name given in VirtualHost */
};
--- 568,574
struct server_addr_rec {
server_addr_rec *next;
struct in_addr host_addr; /* The bound address, for this server */
! unsigned short host_port; /* The bound port, for this server */
char *virthost; /* The name given in VirtualHost */
};
***
*** 586,592
char *server_admin;
char *server_hostname;
! short port;/* for redirects, etc. */
/* Log files --- note that transfer log is now in the modules... */
--- 586,592
char *server_admin;
char *server_hostname;
! unsigned short port; /* for redirects, etc. */
/* Log files --- note that transfer log is now in the modules... */
cvs commit: apache/src CHANGES httpd.h util.c alloc.h alloc.c http_protocol.h http_protocol.c
fielding97/03/20 09:10:16 Modified:src CHANGES httpd.h util.c alloc.h alloc.c http_protocol.h http_protocol.c Log: Fixed the handling of module and script-added header fields. Improved the interface for sending header fields and reduced the duplication of code between sending okay responses and errors. We now always send both headers_out and err_headers_out, and ensure that the server-reserved fields are not being overridden, while not overriding those that are not reserved. Fixed the determination of whether or not we should make the connection persistent for all of the cases where some other part of the server has already indicated that we should not. Also improved the ordering of the test so that chunked encoding will be set whenever it is desired instead of only when KeepAlive is enabled. Added persistent connection capability for most error responses (those that do not indicate a bad input stream) when accessed by an HTTP/1.1 client. Added missing timeouts for sending header fields, error responses, and the last chunk of chunked encoding, each of which could have resulted in a process being stuck in write forever. Reviewed by: Randy Terbush, Dean Gaudet Revision ChangesPath 1.205 +20 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.204 retrieving revision 1.205 diff -C3 -r1.204 -r1.205 *** CHANGES 1997/03/19 03:12:51 1.204 --- CHANGES 1997/03/20 17:10:08 1.205 *** *** 1,5 --- 1,25 Changes with Apache 1.2b8 + *) Fixed the handling of module and script-added header fields. + Improved the interface for sending header fields and reduced + the duplication of code between sending okay responses and errors. + We now always send both headers_out and err_headers_out, and + ensure that the server-reserved fields are not being overridden, + while not overriding those that are not reserved. [Roy Fielding] + + *) Fixed the determination of whether or not we should make the + connection persistent for all of the cases where some other part + of the server has already indicated that we should not. Also + improved the ordering of the test so that chunked encoding will + be set whenever it is desired instead of only when KeepAlive + is enabled. Added persistent connection capability for most error + responses (those that do not indicate a bad input stream) when + accessed by an HTTP/1.1 client. [Roy Fielding] + + *) Added missing timeouts for sending header fields, error responses, + and the last chunk of chunked encoding, each of which could have + resulted in a process being stuck in write forever. [Roy Fielding] + *) mod_auth_anon required an @ or a . in the email address, not both. [Dirk vanGulik] 1.92 +10 -1 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.91 retrieving revision 1.92 diff -C3 -r1.91 -r1.92 *** httpd.h 1997/03/11 06:04:39 1.91 --- httpd.h 1997/03/20 17:10:09 1.92 *** *** 330,335 --- 330,343 #define is_HTTP_CLIENT_ERROR(x) (((x) = 400)((x) 500)) #define is_HTTP_SERVER_ERROR(x) (((x) = 500)((x) 600)) + #define status_drops_connection(x) (((x) == HTTP_BAD_REQUEST) || \ + ((x) == HTTP_REQUEST_TIME_OUT) || \ + ((x) == HTTP_LENGTH_REQUIRED) || \ + ((x) == HTTP_REQUEST_ENTITY_TOO_LARGE) || \ + ((x) == HTTP_REQUEST_URI_TOO_LARGE) || \ + ((x) == HTTP_INTERNAL_SERVER_ERROR) || \ + ((x) == HTTP_SERVICE_UNAVAILABLE)) + #define METHODS 8 #define M_GET 0 *** *** 459,465 * write modules to add to that environment. * * The difference between headers_out and err_headers_out is that the !* latter are printed even on error, and persist across internal redirects * (so the headers printed for ErrorDocument handlers will have them). * * The 'notes' table is for notes from one module to another, with no --- 467,473 * write modules to add to that environment. * * The difference between headers_out and err_headers_out is that the !* latter persist across internal redirects * (so the headers printed for ErrorDocument handlers will have them). * * The 'notes' table is for notes from one
cvs commit: apache/src CHANGES httpd.h http_main.c http_config.c
fielding97/03/10 22:04:42
Modified:src CHANGES httpd.h http_main.c http_config.c
Log:
Improved handling of IP address as a virtualhost address and
introduced _default_ as a synonym for the default vhost config.
Submitted by: Dean Gaudet, PR #212
Reviewed by: Roy Fielding, Chuck Murcko
Revision ChangesPath
1.196 +4 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.195
retrieving revision 1.196
diff -C3 -r1.195 -r1.196
*** CHANGES 1997/03/11 03:41:41 1.195
--- CHANGES 1997/03/11 06:04:38 1.196
***
*** 52,57
--- 52,61
*) Clear memory allocated for listeners. [Randy Terbush]
+ *) Improved handling of IP address as a virtualhost address and
+ introduced _default_ as a synonym for the default vhost config.
+ [Dean Gaudet] PR #212
+
Changes with Apache 1.2b7
*) Port to UXP/DS(V20) [Toshiaki Nomura [EMAIL PROTECTED]]
1.91 +5 -0 apache/src/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache/src/httpd.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -C3 -r1.90 -r1.91
*** httpd.h 1997/02/22 00:47:32 1.90
--- httpd.h 1997/03/11 06:04:39 1.91
***
*** 551,556
--- 551,561
/* Per-vhost config... */
+ /* The address 255.255.255.255, when used as a virtualhost address,
+ * will become the default server when the ip doesn't match other vhosts.
+ */
+ #define DEFAULT_VHOST_ADDR 0xul
+
typedef struct server_addr_rec server_addr_rec;
struct server_addr_rec {
server_addr_rec *next;
1.128 +0 -5 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -C3 -r1.127 -r1.128
*** http_main.c 1997/03/04 21:44:38 1.127
--- http_main.c 1997/03/11 06:04:39 1.128
***
*** 176,186
int one_process = 0;
- /* The address 255.255.255.255, when used as a virtualhost address,
- * will become the default server when the ip doesn't match other vhosts.
- */
- #define DEFAULT_VHOST_ADDR 0xul
-
#if defined(USE_FCNTL_SERIALIZED_ACCEPT)
static struct flock lock_it = { F_WRLCK, 0, 0, 0 };
static struct flock unlock_it = { F_UNLCK, 0, 0, 0 };
--- 176,181
1.44 +15 -14apache/src/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C3 -r1.43 -r1.44
*** http_config.c 1997/03/10 09:19:39 1.43
--- http_config.c 1997/03/11 06:04:40 1.44
***
*** 855,861
unsigned long my_addr;
server_addr_rec *sar;
char *t;
! int i;
if( *w == 0 ) return;
--- 855,861
unsigned long my_addr;
server_addr_rec *sar;
char *t;
! int i, is_an_ip_addr;
if( *w == 0 ) return;
***
*** 871,893
*t = 0;
}
if (strcmp(w, *) == 0) {
! sar = pcalloc( p, sizeof( server_addr_rec ) );
! **paddr = sar;
! *paddr = sar-next;
! sar-host_addr.s_addr = htonl(INADDR_ANY);
! sar-host_port = port;
! sar-virthost = pstrdup(p, w);
! if (t != NULL) *t = ':';
! return;
! }
!
#ifdef DGUX
! my_addr = inet_network(w);
#else
! my_addr = inet_addr(w);
#endif
! if (my_addr != INADDR_NONE) {
sar = pcalloc( p, sizeof( server_addr_rec ) );
**paddr = sar;
*paddr = sar-next;
--- 871,894
*t = 0;
}
+ is_an_ip_addr = 0;
if (strcmp(w, *) == 0) {
! my_addr = htonl(INADDR_ANY);
! is_an_ip_addr = 1;
! } else if( strcmp(w, _default_) == 0
! || strcmp(w, 255.255.255.255) == 0 ) {
! my_addr = DEFAULT_VHOST_ADDR;
! is_an_ip_addr = 1;
! } else if(
#ifdef DGUX
! ( my_addr = inet_network(w) )
#else
! ( my_addr = inet_addr(w) )
#endif
! != INADDR_NONE ) {
! is_an_ip_addr = 1;
! }
! if( is_an_ip_addr ) {
sar = pcalloc( p, sizeof( server_addr_rec ) );
**paddr = sar;
*paddr = sar-next;
