randy 97/01/11 18:05:45
Branch: src RELEASE_1_1_X
Modified: src http_request.c mod_cookies.c
Log:
Make http_request.c changes a bit more portable.
Change Copyright dates for both files.
Revision Changes Path
1.11.2.2 +11 -2 apache/src/http_request.c
Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C3 -r1.11.2.1 -r1.11.2.2
*** http_request.c 1997/01/12 00:40:17 1.11.2.1
--- http_request.c 1997/01/12 02:05:41 1.11.2.2
***************
*** 1,6 ****
/* ====================================================================
! * Copyright (c) 1995 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- 1,6 ----
/* ====================================================================
! * Copyright (c) 1995-1997 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
***************
*** 179,185 ****
--- 179,192 ----
*cp = '\0';
return OK;
}
+ #if defined(ENOENT)
else if (errno == ENOENT) {
+ #else
+ #error Your system apparently does not define ENOENT.
+ #error Removal of these lines opens a security hole if protecting
+ #error from directory indexes with DirectoryIndex.
+ else {
+ #endif
last_cp = cp;
while (--cp > path && *cp != '/')
***************
*** 188,197 ****
while (cp > path && cp[-1] == '/')
--cp;
}
else {
log_reason("unable to determine if index file exists (stat()
returned unexpected error)", r->filename, r);
! return HTTP_FORBIDDEN;
}
}
return OK;
--- 195,206 ----
while (cp > path && cp[-1] == '/')
--cp;
}
+ #if defined(ENOENT)
else {
log_reason("unable to determine if index file exists (stat()
returned unexpected error)", r->filename, r);
! return FORBIDDEN;
}
+ #endif
}
return OK;
1.9.2.3 +1 -1 apache/src/Attic/mod_cookies.c
Index: mod_cookies.c
===================================================================
RCS file: /export/home/cvs/apache/src/Attic/mod_cookies.c,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C3 -r1.9.2.2 -r1.9.2.3
*** mod_cookies.c 1997/01/12 00:45:54 1.9.2.2
--- mod_cookies.c 1997/01/12 02:05:42 1.9.2.3
***************
*** 1,6 ****
/* ====================================================================
! * Copyright (c) 1995, 1996 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- 1,6 ----
/* ====================================================================
! * Copyright (c) 1995-1997 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
