Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 63246 | Differences between
and this patch

Collapse All | Expand All

(-)resin-3.0.13.original/modules/c/src/common/config.c (-3 / +7 lines)
Lines 82-87 Link Here
82
static time_t g_last_update;
82
static time_t g_last_update;
83
static hash_t g_url_cache[CACHE_SIZE];
83
static hash_t g_url_cache[CACHE_SIZE];
84
84
85
static resin_host_t *
86
cse_match_host_impl(config_t *config, const char *host_name,
87
		    int port, time_t now);
88
85
static location_t *
89
static location_t *
86
cse_add_unique_location(mem_pool_t *pool, web_app_t *app, char *prefix,
90
cse_add_unique_location(mem_pool_t *pool, web_app_t *app, char *prefix,
87
                        char *suffix, int is_exact, int ignore)
91
                        char *suffix, int is_exact, int ignore)
Lines 406-412 Link Here
406
410
407
	if (strcmp(buffer, host->name)) {
411
	if (strcmp(buffer, host->name)) {
408
	  resin_host_t *canonical;
412
	  resin_host_t *canonical;
409
	  canonical = cse_match_host_impl(config, buffer, 0, now);
413
	  canonical = (resin_host_t*)cse_match_host_impl(config, buffer, 0, now);
410
	  host->canonical = canonical;
414
	  host->canonical = canonical;
411
	}
415
	}
412
      }
416
      }
Lines 675-681 Link Here
675
    case HMUX_DISPATCH_HOST:
679
    case HMUX_DISPATCH_HOST:
676
      hmux_read_string(&s, buffer, sizeof(buffer));
680
      hmux_read_string(&s, buffer, sizeof(buffer));
677
      
681
      
678
      host = cse_match_host_impl(config, buffer, 0, now);
682
      host = (resin_host_t*)cse_match_host_impl(config, buffer, 0, now);
679
      read_config(&s, config, host, 0, &is_change);
683
      read_config(&s, config, host, 0, &is_change);
680
      break;
684
      break;
681
685
Lines 850-856 Link Here
850
    return host->canonical;
854
    return host->canonical;
851
855
852
  if (! cse_update_host_from_resin(host, now) && *host_name)
856
  if (! cse_update_host_from_resin(host, now) && *host_name)
853
    host->canonical = cse_match_host_impl(config, "", 0, now);
857
    host->canonical = (resin_host_t*)cse_match_host_impl(config, "", 0, now);
854
858
855
  return host->canonical;
859
  return host->canonical;
856
}
860
}

Return to bug 63246