I forwarded this a week ago - as best I can tell the outstanding bugfixes are:
1) casting memchr in buff.c - seems alright to me
2) adjusting the code in mod_rewrite to be in a different order -
also seems fine to me, avoids a fatal error.
Anyone want to +1 and commit?
Brian
On Sun, 1 Dec 1996, Brian Behlendorf wrote:
> ---------- Forwarded message ----------
> Date: Sun, 01 Dec 1996 10:46:13 -0500
> From: Marc Evans <marc@destek.net>
> To: new-httpd@hyperreal.com
> Subject: version 1.2
>
...
> After I grabbed the sources, I built them on a DEC AXP running OSF/1 v3.0. I
> also plan to do the same on OSF/1 V3.2 and BSDI 2.1. During this build, I
> encoutered problems which I have fixed. The diffs are attached which result
> in a clean build on the OSF/1 v3.0 platform, with one exception. The exception
> is that v3.0 of OSF/1 is missing a function prototype for mktemp() which
> has been fixed in v3.2 and beyond.
...
> The context diffs:
>
> diff -rc ./src/buff.c ../apache/src/buff.c
> *** ./src/buff.c Sun Nov 10 09:00:08 1996
> --- ../apache/src/buff.c Sun Dec 1 09:44:47 1996
> Comment memchr is prototyped to return "char *".
> ***************
> *** 419,425 ****
>
> for (;;)
> {
> ! x = memchr(fb->inptr, '\012', fb->incnt);
> if (x != NULL)
> {
> x++;
> --- 419,425 ----
>
> for (;;)
> {
> ! x = (unsigned char *)memchr(fb->inptr, '\012', fb->incnt);
> if (x != NULL)
> {
> x++;
> Comment Declaring a static array without a size is fatal
> diff -rc ./src/mod_rewrite.c ../apache/src/mod_rewrite.c
> *** ./src/mod_rewrite.c Thu Nov 14 03:00:12 1996
> --- ../apache/src/mod_rewrite.c Sun Dec 1 09:51:29 1996
> ***************
> *** 163,194 ****
> **
> */
>
> - /* the main config structure */
> - module rewrite_module = {
> - STANDARD_MODULE_STUFF,
> -
> - init_module, /* module initializer */
> -
> - config_perdir_create, /* create per-dir config structures */
> - config_perdir_merge, /* merge per-dir config structures */
> - config_server_create, /* create per-server config structures */
> - config_server_merge, /* merge per-server config structures */
> - command_table, /* table of config file commands */
> -
> - handler_table, /* [#7] table of MIME-typed-dispatched request action
handlers */
> -
> - hook_uri2file, /* [#1] URI to filename translation */
> -
> - NULL, /* [#3] check_user_id: get and validate user id from
the HTTP request */
> - NULL, /* [#4] check_auth: check if the user is ok _here_
*/
> - NULL, /* [#2] check_access: check access by host address,
etc. */
> -
> - hook_mimetype, /* [#5] determine MIME type */
> -
> - hook_fixup, /* [#6] pre-run fixups */
> - NULL /* [#8] log a transaction */
> - };
> -
> /* the table of commands we provide */
> static command_rec command_table[] = {
> { "RewriteEngine", cmd_rewriteengine, NULL, OR_FILEINFO, FLAG,
> --- 163,168 ----
> ***************
> *** 214,219 ****
> --- 188,219 ----
> static handler_rec handler_table[] = {
> { "redirect-handler", handler_redirect },
> { NULL }
> + };
> +
> + /* the main config structure */
> + module rewrite_module = {
> + STANDARD_MODULE_STUFF,
> +
> + init_module, /* module initializer */
> +
> + config_perdir_create, /* create per-dir config structures */
> + config_perdir_merge, /* merge per-dir config structures */
> + config_server_create, /* create per-server config structures */
> + config_server_merge, /* merge per-server config structures */
> + command_table, /* table of config file commands */
> +
> + handler_table, /* [#7] table of MIME-typed-dispatched request action
handlers */
> +
> + hook_uri2file, /* [#1] URI to filename translation */
> +
> + NULL, /* [#3] check_user_id: get and validate user id from
the HTTP request */
> + NULL, /* [#4] check_auth: check if the user is ok _here_
*/
> + NULL, /* [#2] check_access: check access by host address,
etc. */
> +
> + hook_mimetype, /* [#5] determine MIME type */
> +
> + hook_fixup, /* [#6] pre-run fixups */
> + NULL /* [#8] log a transaction */
> };
>
> /* the common cache */
> diff -rc ./src/mod_rewrite.h ../apache/src/mod_rewrite.h
> *** ./src/mod_rewrite.h Wed Nov 20 15:00:16 1996
> --- ../apache/src/mod_rewrite.h Sun Dec 1 09:51:48 1996
> ***************
> *** 280,287 ****
>
> /* static config */
> extern module rewrite_module;
> - static command_rec command_table[];
> - static handler_rec handler_table[];
> extern cache *cachep;
>
> /* config structure handling */
> --- 280,285 ----
>
>
>
>
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--
brian@organic.com www.apache.org hyperreal.com http://www.organic.com/JOBS
|