[mirrorbrain-commits] r8371 - /trunk/mod_mirrorbrain/mod_mirrorbrain.c

Author: poeml
Date: Tue Feb  4 22:11:48 2014
New Revision: 8371

URL: http://svn.mirrorbrain.org/viewvc/mirrorbrain?rev=8371&view=rev
Log:
mod_mirrorbrain:
- The directive MirrorBrainMetalinkHashesPathPrefix, obsolete since
  2.13.0, has now been removed.

Modified:
    trunk/mod_mirrorbrain/mod_mirrorbrain.c

Modified: trunk/mod_mirrorbrain/mod_mirrorbrain.c
URL: http://svn.mirrorbrain.org/viewvc/mirrorbrain/trunk/mod_mirrorbrain/mod_mirrorbrain.c?rev=8371&r1=8370&r2=8371&view=diff
==============================================================================
--- trunk/mod_mirrorbrain/mod_mirrorbrain.c	(original)
+++ trunk/mod_mirrorbrain/mod_mirrorbrain.c	Tue Feb  4 22:11:48 2014
_at_@ -260,7 +260,6 @@
     int memcached_on;
     int memcached_lifetime;
 #endif
-    const char *metalink_hashes_prefix;
     const char *metalink_publisher_name;
     const char *metalink_publisher_url;
     apr_array_header_t *tracker_urls;
_at_@ -460,7 +459,6 @@
     new->memcached_on = UNSET;
     new->memcached_lifetime = UNSET;
 #endif
-    new->metalink_hashes_prefix = NULL;
     new->metalink_publisher_name = NULL;
     new->metalink_publisher_url = NULL;
     new->tracker_urls = apr_array_make(p, 5, sizeof (char *));
_at_@ -494,7 +492,6 @@
     cfgMergeBool(memcached_on);
     cfgMergeInt(memcached_lifetime);
 #endif
-    cfgMergeString(metalink_hashes_prefix);
     cfgMergeString(metalink_publisher_name);
     cfgMergeString(metalink_publisher_url);
     mrg->tracker_urls = apr_array_append(p, base->tracker_urls, add->tracker_urls);
_at_@ -686,18 +683,6 @@
                                          const char *arg1)
 {
     return "mod_mirrorbrain: the GeoIPFilename directive is obsolete. Use mod_geoip.";
-}
-
-static const char *mb_cmd_metalink_hashes_prefix(cmd_parms *cmd, 
-                                                 void *config, 
-                                                 const char *arg1)
-{
-    server_rec *s = cmd->server;
-    mb_server_conf *cfg = 
-        ap_get_module_config(s->module_config, &mirrorbrain_module);
-
-    cfg->metalink_hashes_prefix = arg1;
-    return NULL;
 }
 
 static const char *mb_cmd_metalink_publisher(cmd_parms *cmd, void *config, 
_at_@ -2755,44 +2740,6 @@
 
         }
 
-
-        if (!hashbag  && rep == METALINK) {
-            /* if the above failed, and we are creating a v3 metalink, let's try the old on-disk format */
-            apr_finfo_t sb;
-            const char *hashfilename;
-            hashfilename = apr_psprintf(r->pool, "%s%s.size_%s", 
-                                       scfg->metalink_hashes_prefix ? scfg->metalink_hashes_prefix : "", 
-                                       r->filename, 
-                                       apr_off_t_toa(r->pool, r->finfo.size));
-
-            if (apr_stat(&sb, hashfilename, APR_FINFO_MIN, r->pool) == APR_SUCCESS && (sb.filetype == APR_REG)) {
-                debugLog(r, cfg, "hashfile '%s' exists", hashfilename);
-
-                /* the old on-disk format is injected as-is */
-                if (sb.mtime == r->finfo.mtime) {
-                    debugLog(r, cfg, "hashfile '%s' up to date, injecting", hashfilename);
-
-                    apr_file_t *fh;
-                    rv = apr_file_open(&fh, hashfilename, APR_READ, APR_OS_DEFAULT, r->pool);
-                    if (rv == APR_SUCCESS) {
-                        ap_send_fd(fh, r, 0, sb.size, &len);
-                        apr_file_close(fh);
-                    } else {
-                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
-                                      "[mod_mirrorbrain] could not open hashfile '%s'.", hashfilename);
-                    }
-                } else {
-                    debugLog(r, cfg, "hashfile '%s' outdated, ignoring", hashfilename);
-                }
-
-            } else {
-                debugLog(r, cfg, "no hash file found (%s)", hashfilename);
-            } 
-        }
-
-
-
-
         if (rep == METALINK) {
             ap_rputs(     "    <resources>\n\n", r);
         }
_at_@ -3876,11 +3823,6 @@
                   "memcache daemon(s). Default is 600 s."),
 #endif
 
-    AP_INIT_TAKE1("MirrorBrainMetalinkHashesPathPrefix", mb_cmd_metalink_hashes_prefix, NULL, 
-                  RSRC_CONF, 
-                  "Prefix this path when looking for prepared hashes to inject into metalinks. "
-                  "This directive is obsolete (with 2.13.0) and is going to be removed later."),
-
     AP_INIT_FLAG("MirrorBrainHashesSuppressFilenames", mb_cmd_hashes_suppress_filenames, NULL,
                   RSRC_CONF, 
                   "Set to On to suppress the filename included when hashes are sent. "




_______________________________________________
mirrorbrain-commits mailing list
Archive: http://mirrorbrain.org/archive/mirrorbrain-commits/

Note: To remove yourself from this list, send a mail with the content
 	unsubscribe
to the address mirrorbrain-commits-request_at_mirrorbrain.org