coolaj86/walnut.js
1
1
Fork 1
Code Issues Pull Requests Releases Activity

fix wildcard bug

Browse Source
This commit is contained in:
AJ ONeal 2015-11-23 10:22:04 +00:00
parent e7a6b46cc1
commit d3ef9fb032
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/package-server.js
View File

@ -48,8 +48,6 @@ function compileVhosts(vhostsMap) {
return; return;
} }
//console.log('[vhost]');
//console.log(vhost);
bare = vhost.hostname.replace(/^www\./i, ''); bare = vhost.hostname.replace(/^www\./i, '');
www = vhost.hostname.replace(/^(www\.)?/i, 'www.'); www = vhost.hostname.replace(/^(www\.)?/i, 'www.');
@ -327,7 +325,11 @@ function mapToApp(opts, req, res, next) {
if (!vhost) { if (!vhost) {
pkgConf.vhostConf.patterns.some(function (pkg) { pkgConf.vhostConf.patterns.some(function (pkg) {
if ('*' === pkg.id || pkg.id === req.hostname.slice(req.hostname.length - pkg.id.length)) { // TODO this should be done in the compile phase
if ('*' === pkg.id[0] && '.' === pkg.id[1]) {
pkg.id = pkg.id.slice(1);
}
if (pkg.id === req.hostname.slice(req.hostname.length - pkg.id.length)) {
vhost = pkg; vhost = pkg;
return true; return true;
} }
@ -339,9 +341,6 @@ function mapToApp(opts, req, res, next) {
return; return;
} }
//console.log('vhost');
//console.log(vhost);
// TODO don't modify route here (or in subloaders), modify some other variable instead // TODO don't modify route here (or in subloaders), modify some other variable instead
// TODO precompile RegExps and pre-sort app vs api // TODO precompile RegExps and pre-sort app vs api
vhost.pathnames.some(function (routes) { vhost.pathnames.some(function (routes) {