Mailing List Archive

akosut 96/12/30 21:38:51

Modified: src CHANGES http_core.c http_protocol.c
Log:
Make ServerPath properly recognize path segments.

Reviewed by: Randy Terbush, Chuck Murcko

Revision Changes Path
1.109 +5 -0 apache/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.108
retrieving revision 1.109
diff -C3 -r1.108 -r1.109
*** CHANGES 1996/12/31 02:28:59 1.108
--- CHANGES 1996/12/31 05:38:47 1.109
***************
*** 1,3 ****
--- 1,8 ----
+ Changes with Apache 1.2b5
+
+ *) Fix bug with ServerPath that could cause certaub files to be not
+ found by the server. [Alexei Kosut]
+
Changes with Apache 1.2b4:

*) Fix possible race condition in accept_mutex_init() that



1.55 +4 -1 apache/src/http_core.c

Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C3 -r1.54 -r1.55
*** http_core.c 1996/12/28 00:04:49 1.54
--- http_core.c 1996/12/31 05:38:48 1.55
***************
*** 1223,1229 ****
if ((r->uri[0] != '/') && strcmp(r->uri, "*")) return BAD_REQUEST;

if (r->server->path &&
! !strncmp(r->uri, r->server->path, r->server->pathlen))
r->filename = pstrcat (r->pool, conf->document_root,
(r->uri + r->server->pathlen), NULL);
else
--- 1223,1232 ----
if ((r->uri[0] != '/') && strcmp(r->uri, "*")) return BAD_REQUEST;

if (r->server->path &&
! !strncmp(r->uri, r->server->path, r->server->pathlen) &&
! (r->server->path[r->server->pathlen - 1] == '/' ||
! r->uri[r->server->pathlen] == '/' ||
! r->uri[r->server->pathlen] == '\0'))
r->filename = pstrcat (r->pool, conf->document_root,
(r->uri + r->server->pathlen), NULL);
else



1.86 +4 -1 apache/src/http_protocol.c

Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -C3 -r1.85 -r1.86
*** http_protocol.c 1996/12/28 00:04:51 1.85
--- http_protocol.c 1996/12/31 05:38:49 1.86
***************
*** 614,620 ****
*/

for (s = r->server->next; s; s = s->next) {
! if (s->path && !strncmp(r->uri, s->path, s->pathlen))
r->server = r->connection->server = s;
}
}
--- 614,623 ----
*/

for (s = r->server->next; s; s = s->next) {
! if (s->path && !strncmp(r->uri, s->path, s->pathlen) &&
! (s->path[s->pathlen - 1] == '/' ||
! r->uri[s->pathlen] == '/' ||
! r->uri[s->pathlen] == '\0'))
r->server = r->connection->server = s;
}
}