cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h
mturk 2005/02/21 00:25:33
Modified:jk/native/common jk_map.c jk_map.h
Log:
Return modification time to the caller. Do not set directly to shmem
because we can open any property file not just workers.properties.
Revision ChangesPath
1.30 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_map.c
Index: jk_map.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_map.c 20 Feb 2005 12:19:17 - 1.29
+++ jk_map.c 21 Feb 2005 08:25:33 - 1.30
@@ -400,7 +400,7 @@
}
-int jk_map_read_properties(jk_map_t *m, const char *f)
+int jk_map_read_properties(jk_map_t *m, const char *f, time_t *modified)
{
int rc = JK_FALSE;
@@ -427,8 +427,8 @@
break;
}
fclose(fp);
-/* Update shared memory */
-jk_shm_set_workers_time(statbuf.st_mtime);
+if (modified)
+*modified = statbuf.st_mtime;
}
}
1.16 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_map.h
Index: jk_map.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_map.h 20 Feb 2005 12:19:17 - 1.15
+++ jk_map.h 21 Feb 2005 08:25:33 - 1.16
@@ -61,7 +61,7 @@
int jk_map_read_property(jk_map_t *m, const char *str);
-int jk_map_read_properties(jk_map_t *m, const char *f);
+int jk_map_read_properties(jk_map_t *m, const char *f, time_t *modified);
int jk_map_size(jk_map_t *m);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h
mturk 2005/02/20 04:19:17
Modified:jk/native/common jk_map.c jk_map.h
Log:
Add map id function. Returns the map slot number.
Revision ChangesPath
1.29 +19 -1 jakarta-tomcat-connectors/jk/native/common/jk_map.c
Index: jk_map.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_map.c 12 Feb 2005 19:24:08 - 1.28
+++ jk_map.c 20 Feb 2005 12:19:17 - 1.29
@@ -156,6 +156,24 @@
return (void *)rc; /* DIRTY */
}
+int jk_map_get_id(jk_map_t *m, const char *name)
+{
+int rc = -1;
+if (m name) {
+unsigned int i;
+unsigned int key;
+COMPUTE_KEY_CHECKSUM(name, key)
+for (i = 0; i m-size; i++) {
+if (m-keys[i] == key strcasecmp(m-names[i], name) == 0) {
+rc = i;
+break;
+}
+}
+}
+
+return rc;
+}
+
const char *jk_map_get_string(jk_map_t *m, const char *name, const char *def)
{
const char *rc = def;
1.15 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_map.h
Index: jk_map.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_map.h 6 Feb 2005 13:30:34 - 1.14
+++ jk_map.h 20 Feb 2005 12:19:17 - 1.15
@@ -43,6 +43,8 @@
void *jk_map_get(jk_map_t *m, const char *name, const void *def);
+int jk_map_get_id(jk_map_t *m, const char *name);
+
int jk_map_get_int(jk_map_t *m, const char *name, int def);
double jk_map_get_double(jk_map_t *m, const char *name, double def);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h
mturk 2004/11/19 06:24:45
Modified:jk/native/common jk_map.c jk_map.h
Log:
Added boolean map option so we can be less restrictive on
bool options. Instead just 1 or 0 we'll allow true/false and
yes/no options.
Revision ChangesPath
1.18 +19 -2 jakarta-tomcat-connectors/jk/native/common/jk_map.c
Index: jk_map.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_map.c 9 Nov 2004 12:17:43 - 1.17
+++ jk_map.c 19 Nov 2004 14:24:44 - 1.18
@@ -153,7 +153,24 @@
sprintf(buf, %f, def);
rc = jk_map_get_string(m, name, buf);
-return atof(rc);
+return atof(rc);
+}
+
+int jk_map_get_bool(jk_map_t *m, const char *name, int def)
+{
+char buf[100];
+int rv = 0;
+
+sprintf(buf, %d, def);
+rc = jk_map_get_string(m, name, buf);
+
+len = strlen(rc);
+if (len) {
+if (strcasecmp(rc, true) == 0 ||
+*rc == 'Y' || *rc == 'y' || *rc == '1') {
+rv = 1;
+}
+}
}
char *jk_map_get_string(jk_map_t *m, const char *name, const char *def)
1.13 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_map.h
Index: jk_map.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_map.h 9 Nov 2004 12:17:43 - 1.12
+++ jk_map.h 19 Nov 2004 14:24:44 - 1.13
@@ -47,6 +47,8 @@
double jk_map_get_double(jk_map_t *m, const char *name, double def);
+int jk_map_get_bool(jk_map_t *m, const char *name, int def);
+
char *jk_map_get_string(jk_map_t *m, const char *name, const char *def);
char **jk_map_get_string_list(jk_map_t *m,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h
jfclere 01/09/05 10:05:24
Modified:jk/native/apache-2.0 mod_jk.c
jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h
Log:
Get ride of some warnings - But there is still a lot to do with const -
I have put /* DIRTY */ where the cast looks weird.
Revision ChangesPath
1.21 +65 -51jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_jk.c 2001/09/05 14:43:48 1.20
+++ mod_jk.c 2001/09/05 17:05:23 1.21
@@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.20 $ *
+ * Version: $Revision: 1.21 $ *
***/
/*
@@ -565,9 +565,9 @@
static const char *jk_mount_context(cmd_parms *cmd,
void *dummy,
-char *context,
-char *worker,
-char *maybe_cookie)
+const char *context,
+const char *worker,
+const char *maybe_cookie)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
@@ -591,8 +591,8 @@
static const char *jk_automount_context(cmd_parms *cmd,
void *dummy,
-char *worker,
-char *virtualhost)
+const char *worker,
+const char *virtualhost)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
@@ -614,7 +614,7 @@
static const char *jk_set_worker_file(cmd_parms *cmd,
void *dummy,
- char *worker_file)
+ const char *worker_file)
{
server_rec *s = cmd-server;
struct stat statbuf;
@@ -642,7 +642,7 @@
static const char *jk_set_log_file(cmd_parms *cmd,
void *dummy,
- char *log_file)
+ const char *log_file)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
@@ -665,7 +665,7 @@
static const char *jk_set_log_level(cmd_parms *cmd,
void *dummy,
-char *log_level)
+const char *log_level)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
@@ -684,7 +684,7 @@
static const char * jk_set_log_fmt(cmd_parms *cmd,
void *dummy,
- char * log_format)
+ const char * log_format)
{
jk_set_log_format(log_format);
return NULL;
@@ -718,13 +718,13 @@
static const char *jk_set_https_indicator(cmd_parms *cmd,
void *dummy,
- char *indicator)
+ const char *indicator)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s-module_config, jk_module);
-conf-https_indicator = indicator;
+conf-https_indicator = ap_pstrdup(cmd-pool,indicator);
return NULL;
}
@@ -737,13 +737,13 @@
static const char *jk_set_certs_indicator(cmd_parms *cmd,
void *dummy,
- char *indicator)
+ const char *indicator)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s-module_config, jk_module);
-conf-certs_indicator = indicator;
+conf-certs_indicator = ap_pstrdup(cmd-pool,indicator);
return NULL;
}
@@ -756,13 +756,13 @@
static const char *jk_set_cipher_indicator(cmd_parms *cmd,
void *dummy,
- char *indicator)
+ const char *indicator)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf
Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h
Hi,
I would like to comment the following:
Some of the const are causing a lot of warnings, I have stopped fixed because
I was afraid to have to change too much things... (I have put /* DIRTY */ where
I have stopped forwarding the const).
Any comment?
Cheers
Jean-frederic
[EMAIL PROTECTED] wrote:
jfclere 01/09/05 10:05:24
Modified:jk/native/apache-2.0 mod_jk.c
jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h
Log:
Get ride of some warnings - But there is still a lot to do with const -
I have put /* DIRTY */ where the cast looks weird.
Revision ChangesPath
1.21 +65 -51jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_jk.c 2001/09/05 14:43:48 1.20
+++ mod_jk.c 2001/09/05 17:05:23 1.21
@@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.20 $ *
+ * Version: $Revision: 1.21 $ *
***/
/*
@@ -565,9 +565,9 @@
static const char *jk_mount_context(cmd_parms *cmd,
void *dummy,
-char *context,
-char *worker,
-char *maybe_cookie)
+const char *context,
+const char *worker,
+const char *maybe_cookie)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
@@ -591,8 +591,8 @@
static const char *jk_automount_context(cmd_parms *cmd,
void *dummy,
-char *worker,
-char *virtualhost)
+const char *worker,
+const char *virtualhost)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
@@ -614,7 +614,7 @@
static const char *jk_set_worker_file(cmd_parms *cmd,
void *dummy,
- char *worker_file)
+ const char *worker_file)
{
server_rec *s = cmd-server;
struct stat statbuf;
@@ -642,7 +642,7 @@
static const char *jk_set_log_file(cmd_parms *cmd,
void *dummy,
- char *log_file)
+ const char *log_file)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
@@ -665,7 +665,7 @@
static const char *jk_set_log_level(cmd_parms *cmd,
void *dummy,
-char *log_level)
+const char *log_level)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
@@ -684,7 +684,7 @@
static const char * jk_set_log_fmt(cmd_parms *cmd,
void *dummy,
- char * log_format)
+ const char * log_format)
{
jk_set_log_format(log_format);
return NULL;
@@ -718,13 +718,13 @@
static const char *jk_set_https_indicator(cmd_parms *cmd,
void *dummy,
- char *indicator)
+ const char *indicator)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s-module_config, jk_module);
-conf-https_indicator = indicator;
+conf-https_indicator = ap_pstrdup(cmd-pool,indicator);
return NULL;
}
@@ -737,13 +737,13 @@
static const char *jk_set_certs_indicator(cmd_parms *cmd,
void *dummy,
- char *indicator)
+ const char *indicator)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s-module_config, jk_module);
-conf-certs_indicator = indicator;
+conf-certs_indicator = ap_pstrdup(cmd-pool,indicator);
Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h
On Wed, 5 Sep 2001, jean-frederic clere wrote: Hi, I would like to comment the following: Some of the const are causing a lot of warnings, I have stopped fixed because I was afraid to have to change too much things... (I have put /* DIRTY */ where I have stopped forwarding the const). Any comment? IMHO you should go ahead and finish it, we all love cleaner code. Costin
