httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@zyzzyva.com>
Subject Re: mod_include.c patch incompete ?
Date Thu, 26 Dec 1996 17:39:23 GMT

I think your attempt to apply this failed because I had already
applied it. No?


> Howard Fear wrote:
> >
> >Neither had it quite right.  Its the following...  This should
> >be consistent with today's email, but I might not have been clear
> >enough.  Sorry for any inconvenience...
> 
> Howard can you please make a diff against 1.2b3
> 
> This patch appears to be in reverse. All three hunks are -R w.r.t
> the 1.2b3 (aka 1.2b4-dev) that I have here.
> 
> cheers,
> rob
> 
> >*** mod_include.c.dist	Wed Dec 11 21:16:45 1996
> >--- mod_include.c	Wed Dec 11 21:24:34 1996
> >***************
> >*** 141,153 ****
> >                  return 0;
> >          }
> >          else {
> >!             if(r) {
> >!                 if(p) {
> >!                     for(x=0;x<p;x++) {
> >!                         if (printing) rputc(str[x],r);
> >!                     }
> >                  }
> >!                 if (printing) rputc(c,r);
> >              }
> >              p=0;
> >          }
> >--- 141,151 ----
> >                  return 0;
> >          }
> >          else {
> >!             if (printing) {
> >!                 for(x=0;x<p;x++) {
> >!                     rputc(str[x],r);
> >                  }
> >!                 rputc(c,r);
> >              }
> >              p=0;
> >          }
> >***************
> >*** 1590,1596 ****
> >                      log_printf(r->server,"httpd: exec used but not allowed in
%s",
> >                              r->filename);
> >                      if (printing) rputs(error, r);
> >!                     ret = find_string(f,ENDING_SEQUENCE,NULL,printing);
> >                  } else 
> >                      ret=handle_exec(f, r, error);
> >              } else if(!strcmp(directive,"config"))
> >--- 1588,1594 ----
> >                      log_printf(r->server,"httpd: exec used but not allowed in
%s",
> >                              r->filename);
> >                      if (printing) rputs(error, r);
> >!                     ret = find_string(f,ENDING_SEQUENCE,r,0);
> >                  } else 
> >                      ret=handle_exec(f, r, error);
> >              } else if(!strcmp(directive,"config"))
> >***************
> >*** 1612,1618 ****
> >                          "httpd: unknown directive %s in parsed doc %s",
> >                          directive,r->filename);
> >                  if (printing) rputs(error, r);
> >!                 ret=find_string(f,ENDING_SEQUENCE,NULL,printing);
> >              }
> >              if(ret) {
> >                  log_printf(r->server,"httpd: premature EOF in parsed file %s",
> >--- 1610,1616 ----
> >                          "httpd: unknown directive %s in parsed doc %s",
> >                          directive,r->filename);
> >                  if (printing) rputs(error, r);
> >!                 ret=find_string(f,ENDING_SEQUENCE,r,0);
> >              }
> >              if(ret) {
> >                  log_printf(r->server,"httpd: premature EOF in parsed file %s",
> >
> >
> 




Mime
View raw message