PATCHES: apache2 related patches.

Hello !

Here are fresh patches against trunk.

They are related to apache2

1.configure.ac
Separated cases for apache-1 and apache-2 in APACHE
function.
Added  handling  for apache-2 for platforms i am developing
on.
Probably it will need to be unified later.
Touched CHECK_APXS a bit.
Replaced APR_INCLUDES function with APR_HANDLING,  now we
are
requiring full path for apr-1-config and getting cppflags
and includes
from it. APR tool has platform specific set of cppflags,
just includes
is not enough.
Added GET_RIVET_BASE function, which allows us to get rid of
relative
pathes in include flags.
Rearranged functions a bit - mostly to find out version of
apache we
are building for, before doing any substitutions.
2. src/Makefile.am
Propagated variables introduced in configure.ac
3. src/apache-2/Makefile.am
Propagated variables from configure.ac, did some cleanups.
4.src/apache-2/mod_rivet.c
Changed a bit Rivet_ParseFileArgString a bit, it fixed
segfaults, but
still needs some work.
I've added apr_pool_t pointer to parameters we are passing
to function.
I think we should go away from malloc/calloc usage to apr_*
equivalents, (It is a subject to discuss).

Module successfully builds on OpenBSD and Debian for me,  it
is able
to puts "<b>Hello World<b>" , still
there's a lot of work left.

Please review/test/comment.

Regards Valery

------------------------------------------------------------
---------
To unsubscribe, e-mail: rivet-dev-unsubscribetcl.apache.org
For additional commands, e-mail: rivet-dev-helptcl.apache.org

Hello.

One more short patch.
I forgot to propagate new variables to
src/apache-1/Makefile.am
Here is the patch which does that.

Regards Valery

------------------------------------------------------------
---------
To unsubscribe, e-mail: rivet-dev-unsubscribetcl.apache.org
For additional commands, e-mail: rivet-dev-helptcl.apache.org

> One more short patch.
> I forgot to propagate new variables to
src/apache-1/Makefile.am
> Here is the patch which does that.

Does this take the place of the other patches, or come after
them?
I'll see what I can do this weekend, but I'm very busy,
unfortunately.

-- 
David N. Welton
http://www.welton.it/dav
idw/

------------------------------------------------------------
---------
To unsubscribe, e-mail: rivet-dev-unsubscribetcl.apache.org
For additional commands, e-mail: rivet-dev-helptcl.apache.org

Valery Masiutsin wrote:
> Hello.
>
> One more short patch.
> I forgot to propagate new variables to
src/apache-1/Makefile.am
> Here is the patch which does that.
>
> Regards Valery
>   

Thank you Valery,

after applying this patch i was able to build rivet for
apache-1.

I'm going to test it on apache-1.3 and see what happens.

 -- Massimo

------------------------------------------------------------
---------
To unsubscribe, e-mail: rivet-dev-unsubscribetcl.apache.org
For additional commands, e-mail: rivet-dev-helptcl.apache.org

> Here are fresh patches against trunk.

I've gone ahead and committed them.

> 4.src/apache-2/mod_rivet.c
> Changed a bit Rivet_ParseFileArgString a bit, it fixed
segfaults, but
> still needs some work.
> I've added apr_pool_t pointer to parameters we are
passing to function.
> I think we should go away from malloc/calloc usage to
apr_*
> equivalents, (It is a subject to discuss).

Most of the code in the apache 2 mod_rivet.c file is from
Eckhard
Lehmann  <ecky.lgmx.de>, who did the initial work and
then abandoned
it.  You should not consider it as something that must be
there, or
must work the way it does.  You are indeed correct that
where possible
you should use either the apr_* functions, or the Tcl
functions (be
careful of mixing the two).  His code, truth be told, looks
kind of
messy - you should investigate what things apr_* gives you,
as well as
consider using anything from this that helps out:

http://httpd.apache.or
g/apreq/

Things like this:

/*
 * Rivet_IsRivetFile(char*)
 *
 * small helper function to get the file type. Returns 1 if
 * the file ends with .rvt, 0 otherwise.
 */
static int
Rivet_IsRivetFile (char *filepath)
{
    char *fileCopy = (char*) malloc((strlen(filepath)+1) *
sizeof(char));
    char *cPtr;

    strcpy (fileCopy, filepath);
    cPtr = fileCopy + (strlen(fileCopy) - 3);

    if (*(cPtr-1) != '.') {
        char *ePtr = fileCopy + (strlen(fileCopy) - 1);
        while (*ePtr-- != '?')
            ;
        ePtr++;
        *ePtr = '';
        cPtr = ePtr - 3;
    }

    if (strcmp (cPtr, "rvt") == 0) {
        return RIVET_FILE;
    }
    else if (strcmp (cPtr, "tcl") == 0) {
        return TCL_FILE;
    }

    return 0;
}

Just look a bit dodgy to me.  In Rivet for Apache 1.3, these
things
are handled by Apache, as they should be:

AddType application/x-httpd-rivet .rvt
AddType application/x-rivet-tcl .tcl

Of course, maybe I'm missing something, but... I'm just
saying - feel
*very* free to improve things as you see fit!

> Module successfully builds on OpenBSD and Debian for
me,  it is able
> to puts "<b>Hello World<b>" ,
still there's a lot of work left.

Cool!

-- 
David N. Welton
http://www.welton.it/dav
idw/

------------------------------------------------------------
---------
To unsubscribe, e-mail: rivet-dev-unsubscribetcl.apache.org
For additional commands, e-mail: rivet-dev-helptcl.apache.org