httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@imdb.com (Rob Hartill)
Subject mod_include.c patch incompete ?
Date Tue, 24 Dec 1996 23:53:57 GMT

My local code might have drifted out of sync, but I applied
Howard's mod_include.c patch before it was committed and now I
seem to be slightly out of sync.

The current CVS repository code is shown 1st and my local
hand patched code 2nd.



Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.2
diff -c -r1.2 mod_include.c
*** mod_include.c       1996/12/24 20:06:03     1.2
--- mod_include.c       1996/12/24 20:06:37
***************
*** 117,123 ****
   { \
     int i = getc(f); \
     if(feof(f) || ferror(f) || (i == -1)) { \
!         pfclose(p,f); \
          return r; \
     } \
     c = (char)i; \
--- 117,123 ----
   { \
     int i = getc(f); \
     if(feof(f) || ferror(f) || (i == -1)) { \
!       if(p) pfclose(p, f); else fclose(f); \
          return r; \
     } \
     c = (char)i; \
***************
*** 135,141 ****
  
      p=0;
      while(1) {
!         GET_CHAR(in,c,1,r->pool);
          if(c == str[p]) {
              if((++p) == l)
                  return 0;
--- 135,141 ----
  
      p=0;
      while(1) {
!       GET_CHAR(in,c,1,r?r->pool:NULL);
          if(c == str[p]) {
              if((++p) == l)
                  return 0;


Mime
View raw message