projects
/
henge
/
kiak.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a8bdc6c
)
fixed merge conflicts
author
ken
<ken@kengrimes.com>
Wed, 12 Jul 2017 20:38:54 +0000
(20:38 +0000)
committer
ken
<ken@kengrimes.com>
Wed, 12 Jul 2017 20:38:54 +0000
(20:38 +0000)
router.js
patch
|
blob
|
history
diff --git
a/router.js
b/router.js
index
da32c95
..
0e8edf8
100644
(file)
--- a/
router.js
+++ b/
router.js
@@
-83,11
+83,7
@@
exports = {
console.log(err)
})
console.log(`HTTP${(conf.tls == undefined) ? '' : 'S'} ` +
console.log(err)
})
console.log(`HTTP${(conf.tls == undefined) ? '' : 'S'} ` +
-<<<<<<< HEAD
- `Server Started on port ${conf.port}${this.httpdRoot ?
-=======
`Server Started on port ${conf.port}${this.httpdRoot ?
`Server Started on port ${conf.port}${this.httpdRoot ?
->>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
`, serving files from ${this.httpdRoot}`:''}`)
},
`, serving files from ${this.httpdRoot}`:''}`)
},
@@
-131,10
+127,6
@@
exports = {
let htArgv = request.url.slice(1).split('?')
const routeName = htArgv[0].split('/')[0]
let route = this.routes[routeName]
let htArgv = request.url.slice(1).split('?')
const routeName = htArgv[0].split('/')[0]
let route = this.routes[routeName]
-<<<<<<< HEAD
- console.log(`route is ${route}`)
-=======
->>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
/* If the route exists, check if we are a returning host or a new client */
if (route) {
if (route.bind) {
/* If the route exists, check if we are a returning host or a new client */
if (route) {
if (route.bind) {
@@
-148,14
+140,9
@@
exports = {
// that isn't just "give you a route if it's available" on visit
/* else if (route.origin == (request.headers['x-forwarded-for'] ||
request.connection.remoteAddress))
// that isn't just "give you a route if it's available" on visit
/* else if (route.origin == (request.headers['x-forwarded-for'] ||
request.connection.remoteAddress))
- this.serveHost(response, route, htArgv)
- else */
-<<<<<<< HEAD
- else {
-=======
->>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
+ this.serveHost(response, route, htArgv) */
+ else
this.serveClient(request, response, route)
this.serveClient(request, response, route)
- }
}
/* If it's a valid routename that doesn't exist, make this client a host */
else if (this.validRoutes.test(routeName)) {
}
/* If it's a valid routename that doesn't exist, make this client a host */
else if (this.validRoutes.test(routeName)) {
@@
-262,11
+249,7
@@
exports = {
}
},
}
},
-<<<<<<< HEAD
/** @func
/** @func
-=======
- /** @func
->>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
* @summary Create a new route for a host
* @desc makes a new route for the given route name
* @arg {string} routeName - name of the new route
* @summary Create a new route for a host
* @desc makes a new route for the given route name
* @arg {string} routeName - name of the new route
@@
-301,22
+284,14
@@
exports = {
})
route.pendingResponses.addResponse = function (key, response_p) {
let responses = this.get(key) || []
})
route.pendingResponses.addResponse = function (key, response_p) {
let responses = this.get(key) || []
-<<<<<<< HEAD
responses.push(response_p)
this.set(key, responses)
responses.push(response_p)
this.set(key, responses)
-=======
- this.set(key, responses.push(response_p))
->>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
}
this.routes[routeName] = route
this.serveHost(response, route, argv)
},
}
this.routes[routeName] = route
this.serveHost(response, route, argv)
},
-<<<<<<< HEAD
- /** @func
-=======
- /** @func
->>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
+ /** @Func
* @summary Serve a route to an authorized http host
* @desc services host application to the client, establishing a socket
* @arg {http.ServerResponse} response - response object to use
* @summary Serve a route to an authorized http host
* @desc services host application to the client, establishing a socket
* @arg {http.ServerResponse} response - response object to use