Merge branch 'master' into develop

Author: tusharmath

LICENSE.md

@@ -1,6 +1,6 @@
 ##The MIT License (MIT)
 
-Copyright (c) 2015-2016 Tushar Mathur [tusharm.com](tusharm.com)
+Copyright (c) 2016-2017 Tushar Mathur [tusharm.com](tusharm.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.**
+THE SOFTWARE.**

perf/server.js

@@ -12,6 +12,7 @@ var options = {
 var httpServer = http.createServer(app)
 var httpsServer = https.createServer(options, app)
 app.use('/files', express.static(path.join(__dirname, '/files')))
+app.get('/fixed-size', (req, res) => res.send('a quick brown fox jumps over the lazy dog'))
 
 const startServer = (app, port) => new Promise((i) => { // eslint-disable-line
   const onClose = () => new Promise((i) => server.close(i)) // eslint-disable-line

test/integration/test.observable.js

@@ -32,4 +32,12 @@ test(async function (t) {
     .toPromise()
   t.same(response.headers['content-length'], '317235')
 })
+
+test(async function (t) {
+  const size = await Observables
+    .requestContentLength({url: 'https://localhost:3101/fixed-size', strictSSL: false})
+    .toPromise()
+  t.same(size, 41)
+})
+
 /*eslint-enable */