(288c36fb) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,10 @@
		Changes with Apache 2.3.0
		[Remove entries to the current 2.0 and 2.2 section below, when backported]

		*) mod_cache: Enhance CacheEnable/CacheDisable to control caching on a
		per-protocol, per-host and per-path basis. Intended for proxy
		configurations. [Colm MacCarthaigh]

		*) Teach mod_ssl to use arbitraty OIDs in an SSLRequire directive,
		allowing string-valued client certificate attributes to be used for
		access control, as in: SSLRequire "value" in OID("1.3.6.1.4.1.18060.1")

docs/manual/mod/mod_cache.html.en

+19 −2

Original line number	Diff line number	Diff line
		@@ -87,8 +87,8 @@
		<IfModule mod_cache.c><br />
		<span class="indent">
		#LoadModule disk_cache_module modules/mod_disk_cache.so<br />
		# If you want to use mod_disk_cache instead of mod_mem_cache,
		# uncomment the line above and comment out the LoadModule line below.
		# If you want to use mod_disk_cache instead of mod_mem_cache,<br />
		# uncomment the line above and comment out the LoadModule line below.<br />
		<IfModule mod_disk_cache.c><br />
		<span class="indent">
		CacheRoot c:/cacheroot<br />
		@@ -108,6 +108,9 @@
		MCacheMaxObjectSize 2048<br />
		</span>
		</IfModule><br />
		<br />
		# When acting as a proxy, don't cache the list of security updates<br />
		CacheDisable http://security.update.server/update-list/<br />
		</span>
		</IfModule>
		</code></p></div>
		@@ -185,6 +188,20 @@ manager</td></tr>
		CacheEnable disk /<br />
		</code></p></div>

		<p>When acting as a forward proxy server, <var>url-string</var> can
		also be used to specify remote sites and proxy protocols which
		caching should be enabled for.</p>

		<div class="example"><p><code>
		# Cache proxied url's<br />
		CacheEnable disk /<br /><br />
		# Cache FTP-proxied url's<br />
		CacheEnable disk ftp://<br /><br />
		# Cache content from www.apache.org<br />
		CacheEnable disk http://www.apache.org/<br />
		</code></p></div>


		</div>
		<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
		<div class="directive-section"><h2><a name="CacheIgnoreCacheControl" id="CacheIgnoreCacheControl">CacheIgnoreCacheControl</a> <a name="cacheignorecachecontrol" id="cacheignorecachecontrol">Directive</a></h2>

docs/manual/mod/mod_cache.xml

+19 −2

Original line number	Diff line number	Diff line
		@@ -86,8 +86,8 @@
		<IfModule mod_cache.c><br />
		<indent>
		#LoadModule disk_cache_module modules/mod_disk_cache.so<br />
		# If you want to use mod_disk_cache instead of mod_mem_cache,
		# uncomment the line above and comment out the LoadModule line below.
		# If you want to use mod_disk_cache instead of mod_mem_cache,<br />
		# uncomment the line above and comment out the LoadModule line below.<br />
		<IfModule mod_disk_cache.c><br />
		<indent>
		CacheRoot c:/cacheroot<br />
		@@ -107,6 +107,9 @@
		MCacheMaxObjectSize 2048<br />
		</indent>
		</IfModule><br />
		<br />
		# When acting as a proxy, don't cache the list of security updates<br />
		CacheDisable http://security.update.server/update-list/<br />
		</indent>
		</IfModule>
		</example>
		@@ -145,6 +148,20 @@ manager</description>
		CacheEnable fd /images<br />
		CacheEnable disk /<br />
		</example>

		<p>When acting as a forward proxy server, <var>url-string</var> can
		also be used to specify remote sites and proxy protocols which
		caching should be enabled for.</p>

		<example>
		# Cache proxied url's<br />
		CacheEnable disk /<br /><br />
		# Cache FTP-proxied url's<br />
		CacheEnable disk ftp://<br /><br />
		# Cache content from www.apache.org<br />
		CacheEnable disk http://www.apache.org/<br />
		</example>

		</usage>
		</directivesynopsis>

modules/cache/cache_util.c

+49 −7

Original line number	Diff line number	Diff line
		@@ -24,23 +24,65 @@

		extern module AP_MODULE_DECLARE_DATA cache_module;

		/* Determine if "url" matches the hostname, scheme and port and path
		* in "filter". All but the path comparisons are case-insensitive.
		*/
		static int uri_meets_conditions(apr_uri_t filter, int pathlen, apr_uri_t url)
		{
		/* Compare the hostnames */
		if(filter.hostname) {
		if (!url.hostname) {
		return 0;
		}
		else if (strcasecmp(filter.hostname, url.hostname)) {
		return 0;
		}
		}

		/* Compare the schemes */
		if(filter.scheme) {
		if (!url.scheme) {
		return 0;
		}
		else if (strcasecmp(filter.scheme, url.scheme)) {
		return 0;
		}
		}

		/* Compare the ports */
		if(filter.port_str) {
		if (url.port_str && filter.port != url.port) {
		return 0;
		}
		/* NOTE: ap_port_of_scheme will return 0 if given NULL input */
		else if (filter.port != apr_uri_port_of_scheme(url.scheme)) {
		return 0;
		}
		}
		else if(url.port_str && filter.scheme) {
		if (apr_uri_port_of_scheme(filter.scheme) == url.port) {
		return 0;
		}
		}

		/* Url has met all of the filter conditions so far, determine
		* if the paths match.
		*/
		return !strncmp(filter.path, url.path, pathlen);
		}

		CACHE_DECLARE(cache_provider_list )ap_cache_get_providers(request_rec r,
		cache_server_conf *conf,
		const char *url)
		apr_uri_t uri)
		{
		cache_provider_list *providers = NULL;
		int i;

		/* we can't cache if there's no URL */
		/* Is this case even possible?? */
		if (!url) return NULL;

		/* loop through all the cacheenable entries */
		for (i = 0; i < conf->cacheenable->nelts; i++) {
		struct cache_enable *ent =
		(struct cache_enable *)conf->cacheenable->elts;
		if ((ent[i].url) && !strncasecmp(url, ent[i].url, ent[i].urllen)) {
		if (uri_meets_conditions(ent[i].url, ent[i].pathlen, uri)) {
		/* Fetch from global config and add to the list. */
		cache_provider *provider;
		provider = ap_lookup_provider(CACHE_PROVIDER_GROUP, ent[i].type,
		@@ -77,7 +119,7 @@ CACHE_DECLARE(cache_provider_list )ap_cache_get_providers(request_rec r,
		for (i = 0; i < conf->cachedisable->nelts; i++) {
		struct cache_disable *ent =
		(struct cache_disable *)conf->cachedisable->elts;
		if ((ent[i].url) && !strncasecmp(url, ent[i].url, ent[i].urllen)) {
		if (uri_meets_conditions(ent[i].url, ent[i].pathlen, uri)) {
		/* Stop searching now. */
		return NULL;
		}

modules/cache/mod_cache.c

+19 −10

Original line number	Diff line number	Diff line
		@@ -50,8 +50,6 @@ static int cache_url_handler(request_rec *r, int lookup)
		{
		apr_status_t rv;
		const char *auth;
		apr_uri_t uri;
		char *path;
		cache_provider_list *providers;
		cache_request_rec *cache;
		cache_server_conf *conf;
		@@ -62,16 +60,13 @@ static int cache_url_handler(request_rec *r, int lookup)
		return DECLINED;
		}

		uri = r->parsed_uri;
		path = uri.path;

		conf = (cache_server_conf *) ap_get_module_config(r->server->module_config,
		&cache_module);

		/*
		* Which cache module (if any) should handle this request?
		*/
		if (!(providers = ap_cache_get_providers(r, conf, path))) {
		if (!(providers = ap_cache_get_providers(r, conf, r->parsed_uri))) {
		return DECLINED;
		}

		@@ -984,8 +979,15 @@ static const char add_cache_enable(cmd_parms parms, void *dummy,
		&cache_module);
		new = apr_array_push(conf->cacheenable);
		new->type = type;
		new->url = url;
		new->urllen = strlen(url);
		if (apr_uri_parse(parms->pool, url, &(new->url))) {
		return NULL;
		}
		if (new->url.path) {
		new->pathlen = strlen(new->url.path);
		} else {
		new->pathlen = 1;
		new->url.path = "/";
		}
		return NULL;
		}

		@@ -999,8 +1001,15 @@ static const char add_cache_disable(cmd_parms parms, void *dummy,
		(cache_server_conf *)ap_get_module_config(parms->server->module_config,
		&cache_module);
		new = apr_array_push(conf->cachedisable);
		new->url = url;
		new->urllen = strlen(url);
		if (apr_uri_parse(parms->pool, url, &(new->url))) {
		return NULL;
		}
		if (new->url.path) {
		new->pathlen = strlen(new->url.path);
		} else {
		new->pathlen = 1;
		new->url.path = "/";
		}
		return NULL;
		}

Admin message