httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Brian Behlendorf <br...@hyperreal.com>
Subject version 1.2 (fwd)
Date Sun, 01 Dec 1996 22:01:02 GMT

Something to deal with after the 1.2b1 release.

	Brian

--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--
brian@hyperreal.com     http://www.apache.org     http://www.organic.com/jobs

---------- 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

Hello -

My name is Marc Evans. Today, I roamed through your ftp archives and grabbed
the 19961201140011 cvs snapshot of the sources. If I have mis-behaved, please
let me know and I will destroy all copies and knowledge of how to grab these.

Hopefully, you will find what I am including here helpful. If you wish to
contact me, please remember that although I am contacting you via your mailing
list, I am NOT a member, so please include my address seperately.

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.

If you would find it beneficial, I would be happy to join the development
efforts. At a minimum, I would like to track the ongoing development.

Thanks - Marc
===============================================================================
Marc Evans                            WB1GRH      The Destek Networking Group
E-Mail: Marc@Destek.NET                           One Indian Head Plaza
URL: http://WWW.Destek.NET/~marc                  Nashua, NH, USA 03060
MIME-1.0 & Enriched-Text mail accepted            603 594 9630 (V) 598 8864 (F)
PGP-2.6 key available upon request                WAN & Internet Services
PGP-2.6 Fingerprint:  20 7C A2 DB 17 B2 21 80  47 AA B9 CD D9 DE 31 CC
       The XFree86[tm] Project, Inc. Industry Liason <Marc@XFree86.Org>
===============================================================================

The meaningful lines of my Configuration file:

_CFLAGS=
EXTRA_LFLAGS=
EXTRA_LIBS=
EXTRA_INCLUDES=
OPTIM=-O2
RANLIB=ranlib
Rule STATUS=yes
Rule SOCKS4=no
Rule IRIXNIS=no
Rule WANTHSREGEX=default
Module mime_module         mod_mime.o
Module access_module       mod_access.o
Module auth_module         mod_auth.o
Module negotiation_module  mod_negotiation.o
Module includes_module     mod_include.o
Module dir_module          mod_dir.o
Module cgi_module          mod_cgi.o
Module userdir_module      mod_userdir.o
Module alias_module        mod_alias.o
Module env_module          mod_env.o
Module config_log_module   mod_log_config.o
Module asis_module         mod_asis.o
Module imap_module         mod_imap.o
Module action_module       mod_actions.o
Module browser_module      mod_browser.o
Module agent_log_module    mod_log_agent.o
Module referer_log_module  mod_log_referer.o
Module rewrite_module      mod_rewrite.o
Module cern_meta_module    mod_cern_meta.o
Module status_module       mod_status.o
Module info_module         mod_info.o
Module anon_auth_module    mod_auth_anon.o
Module dbm_auth_module     mod_auth_dbm.o
Module digest_module       mod_digest.o
Module expires_module      mod_expires.o
Module headers_module      mod_headers.o
Module usertrack_module    mod_usertrack.o
Module fastcgi_module      mod_fastcgi.o
Module proxy_module        modules/proxy/libproxy.a

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++;
diff -rc ./src/helpers/PrintPath ../apache/src/helpers/PrintPath
*** ./src/helpers/PrintPath	Fri Oct 25 09:06:37 1996
Comment For unknown reasons, /bin/sh results in memory errors.
--- ../apache/src/helpers/PrintPath	Sun Dec  1 09:36:00 1996
***************
*** 1,4 ****
! #!/bin/sh
  # Look for $1 somewhere in $PATH
  #  will print out the full pathname unless
  #  called with the '-s' option
--- 1,4 ----
! #!/bin/ksh
  # Look for $1 somewhere in $PATH
  #  will print out the full pathname unless
  #  called with the '-s' option
Comment I don't see how these work on any ANSI cpp
diff -rc ./src/mod_include.c ../apache/src/mod_include.c
*** ./src/mod_include.c	Sun Nov  3 21:00:15 1996
--- ../apache/src/mod_include.c	Sun Dec  1 09:39:50 1996
***************
*** 758,768 ****
                  }
                  else {
                      int l,x;
!     #if defined(BSD) && BSD > 199305
                      sprintf(tag,"%qd",finfo.st_size);
!     #else
                      sprintf(tag,"%ld",finfo.st_size);
!     #endif
                      l = strlen(tag); /* grrr */
                      for(x=0;x<l;x++) {
                          if(x && (!((l-x) % 3))) {
--- 758,768 ----
                  }
                  else {
                      int l,x;
! #if defined(BSD) && BSD > 199305
                      sprintf(tag,"%qd",finfo.st_size);
! #else
                      sprintf(tag,"%ld",finfo.st_size);
! #endif
                      l = strlen(tag); /* grrr */
                      for(x=0;x<l;x++) {
                          if(x && (!((l-x) % 3))) {
***************
*** 806,812 ****
      if (regex_error) {
          regerror(regex_error, &compiled, err_string, (size_t)MAX_STRING_LEN);
          log_printf(r->server,
!             "unable to compile pattern %s [%s]", rexp, &err_string);
          return -1;
      }
      regex_error = regexec(&compiled, string, 0, (regmatch_t *)NULL, 0);
--- 806,812 ----
      if (regex_error) {
          regerror(regex_error, &compiled, err_string, (size_t)MAX_STRING_LEN);
          log_printf(r->server,
!             "unable to compile pattern %s [%s]", rexp, err_string);
          return -1;
      }
      regex_error = regexec(&compiled, string, 0, (regmatch_t *)NULL, 0);
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 ----



Mime
View raw message