Commit 73f7310d authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Directories no longer return a "304 not modified" when they don't 

have the networkstatus the client asked for. Also fix a memory
leak when returning 304 not modified. [Bugfixes on 0.2.0.2-alpha]


svn:r10607
parent cfc6b4e0

ChangeLog

+3 −0
Changes for ChangeLog: 3 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -21,6 +21,9 @@ Changes in version 0.2.0.3-alpha - 2007-??-?? 
  o Minor bugfixes (directory):

  o Minor bugfixes (directory):

    - Fix another crash bug related to extra-info caching.  (Bug found by

    - Fix another crash bug related to extra-info caching.  (Bug found by

      Peter Palfrader.) [Bugfix on 0.2.0.2-alpha]

      Peter Palfrader.) [Bugfix on 0.2.0.2-alpha]

    - Directories no longer return a "304 not modified" when they don't

      have the networkstatus the client asked for. Also fix a memory

      leak when returning 304 not modified. [Bugfixes on 0.2.0.2-alpha]





  o Minor bugfixes (dns):

  o Minor bugfixes (dns):

    - Fix a crash when DNSPort is set more than once. (Patch from Robert

    - Fix a crash when DNSPort is set more than once. (Patch from Robert

src/or/directory.c

+2 −0
Changes for src/or/directory.c: 2 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -1806,6 +1806,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, 
    }

    }

    if (dirserv_statuses_are_old(dir_fps, if_modified_since)) {

    if (dirserv_statuses_are_old(dir_fps, if_modified_since)) {

      write_http_status_line(conn, 304, "Not modified");

      write_http_status_line(conn, 304, "Not modified");

      /* no need to free dir_fps's elements, since

       * dirserv_statuses_are_old() already did. */

      smartlist_free(dir_fps);

      smartlist_free(dir_fps);

      return 0;

      return 0;

    }

    }

src/or/dirserv.c

+14 −12
Changes for src/or/dirserv.c: 14 added lines, 12 removed lines.
Original line number Original line Diff line number Diff line
@@ -2538,29 +2538,31 @@ dirserv_test_reachability(int try_all) 
    ctr = (ctr + 1) % 128;

    ctr = (ctr + 1) % 128;

}

}





/** Return true iff every networkstatus listed in <b>fps</b> is older

/** Remove from <b>fps</b> every networkstatus key where both

 * than <b>cutoff</b>. */

 * a) we have a networkstatus document and

 * b) it is not newer than <b>cutoff</b>.

 *

 * Return 1 if no keys remain, else return 0.

 */

int

int

dirserv_statuses_are_old(smartlist_t *fps, time_t cutoff)

dirserv_statuses_are_old(smartlist_t *fps, time_t cutoff)

{

{

  SMARTLIST_FOREACH(fps, const char *, digest,

  SMARTLIST_FOREACH(fps, char *, digest,

  {

  {

    cached_dir_t *d;

    cached_dir_t *d;

    if (router_digest_is_me(digest) && the_v2_networkstatus)

    if (router_digest_is_me(digest) && the_v2_networkstatus)

      d = the_v2_networkstatus;

      d = the_v2_networkstatus;

    else

    else

      d = digestmap_get(cached_v2_networkstatus, digest);

      d = digestmap_get(cached_v2_networkstatus, digest);

    if (d && d->published > cutoff)

    if (d && d->published <= cutoff) {

      return 0;

      tor_free(digest);

    /* XXX020 The above is causing my dir cache to send "304 Not modified"

      SMARTLIST_DEL_CURRENT(fps, digest);

     * to clients that never specified an If-Modified-Since header. That's

    }

     * because d isn't defined for the networkstatus the client is asking

     * for, so we end up returning 1. Perhaps the right fix above is

     * "if (!d || d->published >= cutoff)"? -RD

     */

  });

  });





  return 1;

  if (smartlist_len(fps))

    return 0; /* some items were not here or were not old */

  return 1; /* all items were here and old */

}

}





/** Return an approximate estimate of the number of bytes that will

/** Return an approximate estimate of the number of bytes that will