You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@hyperreal.org on 1999/12/31 18:06:16 UTC
cvs commit: apache-2.0/src/modules/standard mod_digest.c mod_vhost_alias.c
rbb 99/12/31 09:06:16
Modified: src/modules/standard mod_digest.c mod_vhost_alias.c
Log:
Update these modules to Apache 2.0. Not tested, but they compile again.
Revision Changes Path
1.6 +2 -2 apache-2.0/src/modules/standard/mod_digest.c
Index: mod_digest.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_digest.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_digest.c 1999/10/22 16:01:25 1.5
+++ mod_digest.c 1999/12/31 17:06:15 1.6
@@ -111,7 +111,7 @@
const char *rpw;
char *w, *x;
- if (!(f = ap_pcfg_openfile(r->pool, auth_pwfile))) {
+ if (ap_pcfg_openfile(&f, r->pool, auth_pwfile) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
"Could not open password file: %s", auth_pwfile);
return NULL;
@@ -161,7 +161,7 @@
if (strcasecmp(scheme = ap_getword_white(r->pool, &auth_line), "Digest")) {
/* Client tried to authenticate using wrong auth scheme */
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, errno, r->server,
"client used wrong authentication scheme: %s for %s",
scheme, r->uri);
ap_note_digest_auth_failure(r);
1.3 +7 -13 apache-2.0/src/modules/standard/mod_vhost_alias.c
Index: mod_vhost_alias.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_vhost_alias.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_vhost_alias.c 1999/08/31 05:34:06 1.2
+++ mod_vhost_alias.c 1999/12/31 17:06:15 1.3
@@ -457,26 +457,20 @@
return OK;
}
+static void register_hooks(void)
+{
+ ap_hook_translate_name(mva_translate, NULL, NULL, HOOK_MIDDLE);
+};
module MODULE_VAR_EXPORT vhost_alias_module =
{
- STANDARD_MODULE_STUFF,
- NULL, /* initializer */
+ STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
mva_create_server_config, /* server config */
mva_merge_server_config, /* merge server configs */
mva_commands, /* command ap_table_t */
NULL, /* handlers */
- mva_translate, /* filename translation */
- NULL, /* check_user_id */
- NULL, /* check auth */
- NULL, /* check access */
- NULL, /* type_checker */
- NULL, /* fixups */
- NULL, /* logger */
- NULL, /* header parser */
- NULL, /* child_init */
- NULL, /* child_exit */
- NULL /* post read-request */
+ register_hooks /* register hooks */
};
+
Re: cvs commit: apache-2.0/src/modules/standard mod_digest.c mod_vhost_alias.c
Posted by Manoj Kasichainula <ma...@io.com>.
On Tue, Jan 04, 2000 at 10:19:03PM +0000, Ben Laurie wrote:
> I'm not sure what's missing - certainly configure said it was adding
> actions. If it is expected to work, I'll look harder. Have you tried it?
All I've tested is that the server doesn't crash and die when those
modules are compiled, in; I haven't tested the actual functionality of
those modules yet. I can't think of a reason it wouldn't work though.
> Well, I still like the Configuration file (only for specifying
> modules'n'stuff) - having a command line a zillion miles long instead
> seems like a poor deal.
I think it would be easy enough to make the configure script load a
list of configuration values. We just make each check for --enable or
--with blah also look at the loaded config value for that
configuration parameter.
Re: cvs commit: apache-2.0/src/modules/standard mod_digest.c
mod_vhost_alias.c
Posted by Ben Laurie <be...@algroup.co.uk>.
Manoj Kasichainula wrote:
>
> On Fri, Dec 31, 1999 at 05:46:08PM +0000, Ben Laurie wrote:
> > On that note ... how do you actually get a module into Apache 2.0? I
> > tried to add mod_actions earlier today (./configure --enable-actions)
> > but it didn't seem to result in a server that understood Action.
>
> Hmm, weird. When you --enable-action, it should result in a new
> modules.c being generated, and mod_action.c being compiled into the
> server. Is there anything else that should be done that I missed? Are
> one of these two steps not happening?
I'm not sure what's missing - certainly configure said it was adding
actions. If it is expected to work, I'll look harder. Have you tried it?
> > Not sure I'm keen on that method of doing it, anyway.
>
> What do you suggest?
Well, I still like the Configuration file (only for specifying
modules'n'stuff) - having a command line a zillion miles long instead
seems like a poor deal.
Cheers,
Ben.
--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm
http://www.apache-ssl.org/ben.html
"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
- Indira Gandhi
Re: cvs commit: apache-2.0/src/modules/standard mod_digest.c mod_vhost_alias.c
Posted by Manoj Kasichainula <ma...@io.com>.
On Fri, Dec 31, 1999 at 05:46:08PM +0000, Ben Laurie wrote:
> On that note ... how do you actually get a module into Apache 2.0? I
> tried to add mod_actions earlier today (./configure --enable-actions)
> but it didn't seem to result in a server that understood Action.
Hmm, weird. When you --enable-action, it should result in a new
modules.c being generated, and mod_action.c being compiled into the
server. Is there anything else that should be done that I missed? Are
one of these two steps not happening?
> Not sure I'm keen on that method of doing it, anyway.
What do you suggest?
Re: cvs commit: apache-2.0/src/modules/standard mod_digest.c
mod_vhost_alias.c
Posted by Ryan Bloom <rb...@raleigh.ibm.com>.
I've been using APACI when dealing with modules, because I don't think
Manoj has finished the module config stuff yet.
Ryan
On Fri, 31 Dec 1999, Ben Laurie wrote:
> rbb@hyperreal.org wrote:
> >
> > rbb 99/12/31 09:06:16
> >
> > Modified: src/modules/standard mod_digest.c mod_vhost_alias.c
> > Log:
> > Update these modules to Apache 2.0. Not tested, but they compile again.
>
> On that note ... how do you actually get a module into Apache 2.0? I
> tried to add mod_actions earlier today (./configure --enable-actions)
> but it didn't seem to result in a server that understood Action. Not
> sure I'm keen on that method of doing it, anyway.
>
> Cheers,
>
> Ben.
>
> --
> SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm
>
> http://www.apache-ssl.org/ben.html
>
> "My grandfather once told me that there are two kinds of people: those
> who work and those who take the credit. He told me to try to be in the
> first group; there was less competition there."
> - Indira Gandhi
>
_______________________________________________________________________
Ryan Bloom rbb@raleigh.ibm.com
4205 S Miami Blvd
RTP, NC 27709
Come to the first official Apache Software Foundation
Conference! <http://ApacheCon.Com/>
Re: cvs commit: apache-2.0/src/modules/standard mod_digest.c
mod_vhost_alias.c
Posted by Ryan Bloom <rb...@raleigh.ibm.com>.
I've been using APACI when dealing with modules, because I don't think
Manoj has finished the module config stuff yet.
Ryan
On Fri, 31 Dec 1999, Ben Laurie wrote:
> rbb@hyperreal.org wrote:
> >
> > rbb 99/12/31 09:06:16
> >
> > Modified: src/modules/standard mod_digest.c mod_vhost_alias.c
> > Log:
> > Update these modules to Apache 2.0. Not tested, but they compile again.
>
> On that note ... how do you actually get a module into Apache 2.0? I
> tried to add mod_actions earlier today (./configure --enable-actions)
> but it didn't seem to result in a server that understood Action. Not
> sure I'm keen on that method of doing it, anyway.
>
> Cheers,
>
> Ben.
>
> --
> SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm
>
> http://www.apache-ssl.org/ben.html
>
> "My grandfather once told me that there are two kinds of people: those
> who work and those who take the credit. He told me to try to be in the
> first group; there was less competition there."
> - Indira Gandhi
>
_______________________________________________________________________
Ryan Bloom rbb@raleigh.ibm.com
4205 S Miami Blvd
RTP, NC 27709
Come to the first official Apache Software Foundation
Conference! <http://ApacheCon.Com/>
Re: cvs commit: apache-2.0/src/modules/standard mod_digest.c
mod_vhost_alias.c
Posted by Ben Laurie <be...@algroup.co.uk>.
rbb@hyperreal.org wrote:
>
> rbb 99/12/31 09:06:16
>
> Modified: src/modules/standard mod_digest.c mod_vhost_alias.c
> Log:
> Update these modules to Apache 2.0. Not tested, but they compile again.
On that note ... how do you actually get a module into Apache 2.0? I
tried to add mod_actions earlier today (./configure --enable-actions)
but it didn't seem to result in a server that understood Action. Not
sure I'm keen on that method of doing it, anyway.
Cheers,
Ben.
--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm
http://www.apache-ssl.org/ben.html
"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
- Indira Gandhi
Re: cvs commit: apache-2.0/src/modules/standard mod_digest.c
mod_vhost_alias.c
Posted by Ben Laurie <be...@algroup.co.uk>.
rbb@hyperreal.org wrote:
>
> rbb 99/12/31 09:06:16
>
> Modified: src/modules/standard mod_digest.c mod_vhost_alias.c
> Log:
> Update these modules to Apache 2.0. Not tested, but they compile again.
On that note ... how do you actually get a module into Apache 2.0? I
tried to add mod_actions earlier today (./configure --enable-actions)
but it didn't seem to result in a server that understood Action. Not
sure I'm keen on that method of doing it, anyway.
Cheers,
Ben.
--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm
http://www.apache-ssl.org/ben.html
"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
- Indira Gandhi