X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=miscutil.c;h=9604c90ede8165b69b90a72786342ad84e078892;hb=3f442dfbb7e2d279820abb6913adefafb125cc75;hp=1f6f0c4e7b1b0480b8effcd69abd4765173945a8;hpb=04104131e7e779b2373db118a09e9343a906ffab;p=privoxy.git

diff --git a/miscutil.c b/miscutil.c
index 1f6f0c4e..9604c90e 100644
--- a/miscutil.c
+++ b/miscutil.c
@@ -1,4 +1,4 @@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.39 2006/07/18 14:48:46 david__schmidt Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.42 2006/09/09 14:01:45 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@ -36,6 +36,30 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.39 2006/07/18 14:48:46 david__s
  *
  * Revisions   :
  *    $Log: miscutil.c,v $
+ *    Revision 1.42  2006/09/09 14:01:45  fabiankeil
+ *    Integrated Oliver Yeoh's domain pattern fix
+ *    to make sure *x matches xx. Closes Patch 1217393
+ *    and Bug 1170767.
+ *
+ *    Revision 1.41  2006/08/18 16:03:17  david__schmidt
+ *    Tweak for OS/2 build happiness.
+ *
+ *    Revision 1.40  2006/08/17 17:15:10  fabiankeil
+ *    - Back to timegm() using GnuPG's replacement if necessary.
+ *      Using mktime() and localtime() could add a on hour offset if
+ *      the randomize factor was big enough to lead to a summer/wintertime
+ *      switch.
+ *
+ *    - Removed now-useless Privoxy 3.0.3 compatibility glue.
+ *
+ *    - Moved randomization code into pick_from_range().
+ *
+ *    - Changed parse_header_time definition.
+ *      time_t isn't guaranteed to be signed and
+ *      if it isn't, -1 isn't available as error code.
+ *      Changed some variable types in client_if_modified_since()
+ *      because of the same reason.
+ *
  *    Revision 1.39  2006/07/18 14:48:46  david__schmidt
  *    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
  *    with what was really the latest development (the v_3_0_branch branch)
@@ -861,10 +885,21 @@ int simplematch(char *pattern, char *text)
       }
       else if (pat != fallback)
       {
+         /*
+          * Increment text pointer if in char range matching
+          */
+         if (*pat == ']')
+         {
+            txt++;
+         }
          /*
           * Wildcard mode && nonmatch beyond fallback: Rewind pattern
           */
          pat = fallback;
+         /*
+          * Restart matching from current text pointer
+          */
+         continue;
       }
       txt++;
    }
@@ -1046,7 +1081,7 @@ long int pick_from_range(long int range)
 #ifndef HAVE_RANDOM
    unsigned int weak_seed;
 
-   weak_seed = (unsigned int)(time(NULL) | range);
+   weak_seed = (unsigned int)((unsigned int)time(NULL) | (unsigned int)range);
    srand(weak_seed);
    /*
     * Some rand implementations aren't that random and return mostly
@@ -1100,7 +1135,7 @@ time_t timegm(struct tm *tm)
       {
          strcpy(old_zone,"TZ=");
          strcat(old_zone,zone);
-         putenv(old_zone);	
+         putenv(old_zone);
       }
    }
    else