cvs commit: apache-2.0/src/lib/apr/time/unix time.c
rbb 00/01/06 12:20:30
Modified:src/lib/apr/include apr_time.h
src/lib/apr/time/unix time.c
Log:
Add a new time function which creates a new time instance and initializes
the current time. This augments the ap_make_time ap_current_time
combination that we already have because it does the same thing in one
function. Both methods are necessary, because more often than not, we
create a time instance, but don't fill it out with the current time.
Revision ChangesPath
1.10 +1 -0 apache-2.0/src/lib/apr/include/apr_time.h
Index: apr_time.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_time.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apr_time.h2000/01/06 19:19:26 1.9
+++ apr_time.h2000/01/06 20:20:21 1.10
@@ -76,6 +76,7 @@
/* Function Definitions */
ap_status_t ap_make_time(ap_time_t **, ap_context_t *);
+ap_status_t ap_make_init_time(ap_time_t **, ap_context_t *);
ap_status_t ap_current_time(ap_time_t *);
ap_status_t ap_explode_time(ap_time_t *, ap_timetype_e);
ap_status_t ap_implode_time(ap_time_t *);
1.15 +22 -1 apache-2.0/src/lib/apr/time/unix/time.c
Index: time.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- time.c1999/12/21 15:16:36 1.14
+++ time.c2000/01/06 20:20:25 1.15
@@ -58,7 +58,7 @@
/* ***APRDOC
* ap_status_t ap_make_time(ap_context_t *, ap_time_t *)
- *Create a time entity.
+ *Create an empty time entity.
* arg 1) The context to operate on.
* arg 2) The new time entity to create.
*/
@@ -74,6 +74,27 @@
(*new)->explodedtime = ap_palloc(cont, sizeof(struct tm));
(*new)->time_ex = 0;
(*new)->currtime = NULL;
+return APR_SUCCESS;
+}
+
+/* ***APRDOC
+ * ap_status_t ap_make_init_time(ap_context_t *, ap_time_t *)
+ *Create a time entity and fill it out with the current time.
+ * arg 1) The context to operate on.
+ * arg 2) The new time entity to create.
+ */
+ap_status_t ap_make_init_time(struct atime_t **new, ap_context_t *cont)
+{
+(*new) = (struct atime_t *)ap_palloc(cont, sizeof(struct atime_t));
+
+if ((*new) == NULL) {
+return APR_ENOMEM;
+}
+
+(*new)->cntxt = cont;
+(*new)->explodedtime = ap_palloc(cont, sizeof(struct tm));
+(*new)->time_ex = 0;
+gettimeofday((*new)->currtime, NULL);
return APR_SUCCESS;
}
cvs commit: apache-2.0/src/modules/standard mod_autoindex.c mod_expires.c mod_include.c mod_usertrack.c
rbb 00/01/06 11:19:42
Modified:src/lib/apr/file_io/unix filestat.c
src/lib/apr/include apr_time.h
src/lib/apr/test testtime.c
src/lib/apr/time/unix access.c
src/modules/standard mod_autoindex.c mod_expires.c
mod_include.c mod_usertrack.c
Log:
Next pass at the time functions. This defines an ap_ansi_time_t which has
a specific format (seconds since 0:00:00 Jan 1, 1970). I also renamed the
(get|set)_curtime functions to (get|set)ansitime. This should make more
sense, and be a bit more intuitive.
Revision ChangesPath
1.8 +6 -6 apache-2.0/src/lib/apr/file_io/unix/filestat.c
Index: filestat.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filestat.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- filestat.c2000/01/06 14:43:08 1.7
+++ filestat.c2000/01/06 19:19:25 1.8
@@ -75,11 +75,11 @@
finfo->size = info.st_size;
finfo->inode = info.st_ino;
ap_make_time(&finfo->atime, thefile->cntxt);
-ap_set_curtime(finfo->atime, info.st_atime);
+ap_set_ansitime(finfo->atime, info.st_atime);
ap_make_time(&finfo->mtime, thefile->cntxt);
-ap_set_curtime(finfo->mtime, info.st_mtime);
+ap_set_ansitime(finfo->mtime, info.st_mtime);
ap_make_time(&finfo->ctime, thefile->cntxt);
-ap_set_curtime(finfo->ctime, info.st_ctime);
+ap_set_ansitime(finfo->ctime, info.st_ctime);
return APR_SUCCESS;
}
@@ -108,11 +108,11 @@
finfo->size = info.st_size;
finfo->inode = info.st_ino;
ap_make_time(&finfo->atime, cont);
-ap_set_curtime(finfo->atime, info.st_atime);
+ap_set_ansitime(finfo->atime, info.st_atime);
ap_make_time(&finfo->mtime, cont);
-ap_set_curtime(finfo->mtime, info.st_mtime);
+ap_set_ansitime(finfo->mtime, info.st_mtime);
ap_make_time(&finfo->ctime, cont);
-ap_set_curtime(finfo->ctime, info.st_ctime);
+ap_set_ansitime(finfo->ctime, info.st_ctime);
return APR_SUCCESS;
}
else {
1.9 +6 -2 apache-2.0/src/lib/apr/include/apr_time.h
Index: apr_time.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_time.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_time.h1999/12/31 05:09:20 1.8
+++ apr_time.h2000/01/06 19:19:26 1.9
@@ -65,6 +65,10 @@
typedef enum {APR_LOCALTIME, APR_UTCTIME} ap_timetype_e;
+/* ap_ansi_time_t is defined as the number of seconds since
+ * 0:00:00 01/01/70.
+ */
+typedef ap_int64_t ap_ansi_time_t;
typedef struct atime_t ap_time_t;
API_VAR_IMPORT const char ap_month_snames[12][4];
@@ -80,7 +84,7 @@
ap_status_t ap_strftime(char *s, ap_size_t *retsize, ap_size_t max, const
char *format, ap_time_t *tm);
/* accessor functions */
-ap_status_t ap_get_curtime(ap_time_t *, ap_int64_t *);
+ap_status_t ap_get_ansitime(ap_time_t *, ap_ansi_time_t *);
ap_status_t ap_timediff(ap_time_t *, ap_time_t *, ap_int32_t *);
ap_status_t ap_get_sec(ap_time_t *, ap_int32_t *);
@@ -91,7 +95,7 @@
ap_status_t ap_get_year(ap_time_t *, ap_int32_t *);
ap_status_t ap_get_wday(ap_time_t *, ap_int32_t *);
-ap_status_t ap_set_curtime(ap_time_t *, ap_int64_t);
+ap_status_t ap_set_ansitime(ap_time_t *, ap_ansi_time_t);
ap_status_t ap_set_sec(ap_time_t *, ap_int32_t);
ap_status_t ap_set_min(ap_time_t *, ap_int32_t);
ap_status_t ap_set_hour(ap_time_t *, ap_int32_t);
1.4 +2 -2 apache-2.0/src/lib/apr/test/testtime.c
Index: testtime.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testtime.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- testtime.c1999/10/04 16:37:25 1.3
+++ testtime.c2000/01/06 19:19:28 1.4
@@ -165,8 +165,8 @@
fprintf(stdout, "OK\n");
fprintf(stdout, "\tComparing two time values...");
-ap_get_curtime(time, &t1);
-ap_get_curtime(time2, &t2);
+ap_get_ansitime(time, &t1);
+ap_get_ansitime(time2, &t2);
if ((t1 == -1) || (t2 == -1) || (t1 != t2)) {
fprintf(stderr, "Values don't match\n");
exit(-1);
1.10 +4 -4 apache-2.0/src/lib/apr/time/unix/access.c
Index: access.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/access.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
---
cvs commit: apache-2.0/src/main http_request.c
rbb 00/01/06 11:16:08
Modified:src/main http_request.c
Log:
Fix a minor bug that would cause us to return FORBIDDEN for all requests.
Revision ChangesPath
1.13 +1 -1 apache-2.0/src/main/http_request.c
Index: http_request.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- http_request.c2000/01/06 14:43:27 1.12
+++ http_request.c2000/01/06 19:16:07 1.13
@@ -266,7 +266,7 @@
if (cp != end)
*cp = '/';
-if (rv != APR_SUCCESS) {
+if (rv == APR_SUCCESS) {
/*
* Aha! Found something. If it was a directory, we will search
* contents of that directory for a multi_match, so the PATH_INFO
cvs commit: apache-1.3 STATUS
jim 00/01/06 09:03:00 Modified:.STATUS Log: The schedule Revision ChangesPath 1.777 +8 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.776 retrieving revision 1.777 diff -u -r1.776 -r1.777 --- STATUS2000/01/06 13:16:44 1.776 +++ STATUS2000/01/06 17:02:58 1.777 @@ -1,10 +1,15 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/06 13:16:44 $] + Last modified at [$Date: 2000/01/06 17:02:58 $] Release: -1.3.10-dev: Current. Proposal open to try to release on - 1/14/2000. Jim offers to be RM. +1.3.10-dev: Current. We will try to release on 1/14/2000. As such, + only bug-fixes and doc changes will be allowed. + Timeline: +1/11/2000: Code freeze. No changes at all. +1/12/2000: tag and roll tarball +1/14/2000: Release and announce +1/16/2000: Re-open CVS (delay "just in case") 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-2.0/src/modules/standard mod_actions.c mod_asis.c mod_autoindex.c mod_cgi.c mod_dir.c mod_include.c mod_mime.c mod_negotiation.c mod_userdir.c
rbb 00/01/06 06:43:51
Modified:src/include httpd.h
src/lib/apr/file_io/unix fileacc.c filedup.c fileio.h
filestat.c open.c pipe.c readwrite.c
src/lib/apr/include apr_file_io.h
src/lib/apr/test ab_apr.c testmmap.c
src/main http_config.c http_core.c http_log.c
http_protocol.c http_request.c util.c
src/modules/standard mod_actions.c mod_asis.c
mod_autoindex.c mod_cgi.c mod_dir.c mod_include.c
mod_mime.c mod_negotiation.c mod_userdir.c
Log:
Separate the stat structure from the file structure and use ap_stat and
ap_getfileinfo in apache.
Revision ChangesPath
1.17 +1 -1 apache-2.0/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- httpd.h 1999/12/21 21:41:43 1.16
+++ httpd.h 2000/01/06 14:43:00 1.17
@@ -768,7 +768,7 @@
char *filename;
char *path_info;
char *args; /* QUERY_ARGS, if any */
-struct stat finfo; /* ST_MODE set to zero if no such file
*/
+ap_finfo_t finfo;/* ST_MODE set to zero if no such file
*/
uri_components parsed_uri; /* components of uri, dismantled */
/* Various other config info which may change with .htaccess files
1.13 +16 -130 apache-2.0/src/lib/apr/file_io/unix/fileacc.c
Index: fileacc.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fileacc.c 1999/12/03 15:18:22 1.12
+++ fileacc.c 2000/01/06 14:43:05 1.13
@@ -104,144 +104,30 @@
}
/* ***APRDOC
- * ap_status_t ap_get_filesize(ap_ssize_t *, ap_file_t *)
- *Return the size of the current file.
- * arg 1) The currently open file.
- * arg 2) The size of the file.
- */
-ap_status_t ap_get_filesize(ap_ssize_t *size, struct file_t *file)
-{
-if (file != NULL) {
-if (file->stated == 0) {
-ap_getfileinfo(file);
-}
-*size = file->size;
-return APR_SUCCESS;
-}
-else {
-*size = -1;
-return APR_ENOFILE;
-}
-}
-
-/* ***APRDOC
- * ap_status_t ap_get_fileperms(ap_fileperms_t *, ap_file_t *)
- *Return the permissions of the current file.
- * arg 1) The currently open file.
- * arg 2) The permissions of the file.
- */
-ap_status_t ap_get_fileperms(ap_fileperms_t *perm, struct file_t *file)
-{
-if (file != NULL) {
-if (file->stated == 0) {
-ap_getfileinfo(file);
-}
-*perm = file->protection;
-return APR_SUCCESS;
-}
-else {
-*perm = -1;
-return APR_ENOFILE;
-}
-}
-
-/* ***APRDOC
- * ap_status_t ap_get_fileatime(time_t *, ap_file_t *)
- *Return the last access time of the current file.
- * arg 1) The currently open file.
- * arg 2) The last access time of the file.
- */
-ap_status_t ap_get_fileatime(time_t *atime, struct file_t *file)
-{
-if (file != NULL) {
-if (file->stated == 0) {
-ap_getfileinfo(file);
-}
-*atime = file->atime;
-return APR_SUCCESS;
-}
-else {
-*atime = -1;
-return APR_ENOFILE;
-}
-}
-
-/* ***APRDOC
- * ap_status_t ap_get_filectime(time_t *, ap_file_t *)
- *Return the time of the last change to the current file.
- * arg 1) The currently open file.
- * arg 2) The last change time of the file.
- */
-ap_status_t ap_get_filectime(time_t *ptime, struct file_t *file)
-{
-if (file != NULL) {
-if (file->stated == 0) {
-ap_getfileinfo(file);
-}
-*ptime = file->ctime;
-return APR_SUCCESS;
-}
-else {
-*ptime = -1;
-return APR_ENOFILE;
-}
-}
-
-/* ***APRDOC
- * ap_status_t ap_get_filemtime(time_t *, ap_file_t *)
- *Return the last modified time of the current file.
- * arg 1) The currently open file.
- * arg 2) The last modified time of the file.
- */
-ap_status_t ap_get_filemtime(time_t *mtime, struct file_t *file)
cvs commit: apache-1.3 STATUS
jim 00/01/06 05:16:45 Modified:.STATUS Log: Time for release? Revision ChangesPath 1.776 +3 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.775 retrieving revision 1.776 diff -u -r1.775 -r1.776 --- STATUS1999/12/23 21:40:02 1.775 +++ STATUS2000/01/06 13:16:44 1.776 @@ -1,10 +1,10 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/23 21:40:02 $] + Last modified at [$Date: 2000/01/06 13:16:44 $] Release: -1.3.10-dev: Current. Proposal open to try to release after - the start of the new year (2000). Jim offers to be RM. +1.3.10-dev: Current. Proposal open to try to release on + 1/14/2000. Jim offers to be RM. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-site/info apache_books.html
lars00/01/06 04:38:18 Modified:info apache_books.html Log: Typo... Revision ChangesPath 1.20 +1 -1 apache-site/info/apache_books.html Index: apache_books.html === RCS file: /export/home/cvs/apache-site/info/apache_books.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- apache_books.html 2000/01/04 23:09:49 1.19 +++ apache_books.html 2000/01/06 12:38:17 1.20 @@ -46,7 +46,7 @@ http://www.refcards.com/about/apache.html"; - >Apache Quick Reference Card Book + >Apache Quick Reference Card Author: Andrew Ford
