[Pkg-javascript-commits] [node-stream-http] 09/10: merge patched into master
Bastien Roucariès
rouca at moszumanska.debian.org
Sun Aug 20 13:54:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
rouca pushed a commit to branch master
in repository node-stream-http.
commit 6902c1d6ba303238f8dc4a299a1791abf57a1595
Merge: bd1c2d8 7f8923a
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date: Sun Aug 13 15:42:59 2017 +0200
merge patched into master
debian/.git-dpm | 6 +++---
debian/patches/0001-Use-extend-instead-of-xtend.patch | 4 ++--
debian/patches/0002-Use-not-well-known-port-for-test.patch | 2 +-
package.json | 4 ++--
test/browser/headers.js | 11 ++++++++---
5 files changed, 16 insertions(+), 11 deletions(-)
diff --cc debian/.git-dpm
index 8e22904,0000000..530cbce
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- fba62678094979bad0a8fe2dfdfb0a0261b98061
- fba62678094979bad0a8fe2dfdfb0a0261b98061
- add99fba705feeea9609ceff5faae6525fd651aa
++7f8923aea62b90f9e19bd7d3ec5ff6c2542209aa
++7f8923aea62b90f9e19bd7d3ec5ff6c2542209aa
++a9a16f095ea3f64392c7581b221c1b1dd9179d60
+a9a16f095ea3f64392c7581b221c1b1dd9179d60
+node-stream-http_2.7.2+dfsg.orig.tar.gz
+d0ee1af58d305038bbaa2b441b4e94347e49738e
+17307
diff --cc debian/patches/0001-Use-extend-instead-of-xtend.patch
index 08db1a6,0000000..0d7aa81
mode 100644,000000..100644
--- a/debian/patches/0001-Use-extend-instead-of-xtend.patch
+++ b/debian/patches/0001-Use-extend-instead-of-xtend.patch
@@@ -1,35 -1,0 +1,35 @@@
- From e8363ed709b60cc55a4637e3ca5f940e243ac982 Mon Sep 17 00:00:00 2001
++From f1fb79cd64cab5284486de1c7eb44a1efa1610fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Mon, 12 Jun 2017 16:17:47 +0200
+Subject: Use extend instead of xtend
+
+Forwarded: no
+---
+ index.js | 2 +-
+ package.json | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/index.js b/index.js
+index 829290c..4443ffa 100644
+--- a/index.js
++++ b/index.js
+@@ -1,5 +1,5 @@
+ var ClientRequest = require('./lib/request')
+-var extend = require('xtend')
++var extend = require('extend')
+ var statusCodes = require('builtin-status-codes')
+ var url = require('url')
+
+diff --git a/package.json b/package.json
- index 06f9fc7..edf0589 100644
++index a664bb4..5fd39e3 100644
+--- a/package.json
++++ b/package.json
+@@ -31,7 +31,7 @@
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.2.6",
+ "to-arraybuffer": "^1.0.0",
+- "xtend": "^4.0.0"
++ "extend": "^2.0.0"
+ },
+ "devDependencies": {
+ "basic-auth": "^1.0.3",
diff --cc debian/patches/0002-Use-not-well-known-port-for-test.patch
index ba38b72,0000000..8d11035
mode 100644,000000..100644
--- a/debian/patches/0002-Use-not-well-known-port-for-test.patch
+++ b/debian/patches/0002-Use-not-well-known-port-for-test.patch
@@@ -1,129 -1,0 +1,129 @@@
- From fba62678094979bad0a8fe2dfdfb0a0261b98061 Mon Sep 17 00:00:00 2001
++From 7f8923aea62b90f9e19bd7d3ec5ff6c2542209aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Mon, 12 Jun 2017 22:46:45 +0200
+Subject: Use not well known port for test
+
+Avoid problem on buildd
+
+Forwarded: no
+---
+ test/node/http-browserify.js | 32 ++++++++++++++++++--------------
+ 1 file changed, 18 insertions(+), 14 deletions(-)
+
+diff --git a/test/node/http-browserify.js b/test/node/http-browserify.js
+index fda8512..dc4244a 100644
+--- a/test/node/http-browserify.js
++++ b/test/node/http-browserify.js
+@@ -3,7 +3,10 @@
+ var test = require('tape')
+ var url = require('url')
+
+-var location = 'http://localhost:8081/foo/123'
++var port1 = 30801;
++var port2 = 30882;
++
++var location = 'http://localhost:'+port1+'/foo/123'
+
+ var noop = function() {}
+ global.location = url.parse(location)
+@@ -22,20 +25,21 @@ test('Test simple url string', function(t) {
+ var request = http.get(testUrl, noop)
+
+ var resolved = url.resolve(location, request._opts.url)
+- t.equal(resolved, 'http://localhost:8081/api/foo', 'Url should be correct')
++ var url1 = 'http://localhost:'+port1.toString()+'/api/foo';
++ t.equal(resolved, url1, 'Url1 should be correct')
+ t.end()
+
+ })
+
+ test('Test full url object', function(t) {
+ var testUrl = {
+- host: "localhost:8081",
++ host: "localhost:"+port1,
+ hostname: "localhost",
+- href: "http://localhost:8081/api/foo?bar=baz",
++ href: "http://localhost:"+port1.toString()+"/api/foo?bar=baz",
+ method: "GET",
+ path: "/api/foo?bar=baz",
+ pathname: "/api/foo",
+- port: "8081",
++ port: port1.toString(),
+ protocol: "http:",
+ query: "bar=baz",
+ search: "?bar=baz",
+@@ -45,7 +49,7 @@ test('Test full url object', function(t) {
+ var request = http.get(testUrl, noop)
+
+ var resolved = url.resolve(location, request._opts.url)
+- t.equal(resolved, 'http://localhost:8081/api/foo?bar=baz', 'Url should be correct')
++ t.equal(resolved, 'http://localhost:'+port1.toString()+'/api/foo?bar=baz', 'Url should be correct')
+ t.end()
+ })
+
+@@ -53,21 +57,21 @@ test('Test alt protocol', function(t) {
+ var params = {
+ protocol: "foo:",
+ hostname: "localhost",
+- port: "3000",
++ port: port2.toString(),
+ path: "/bar"
+ }
+
+ var request = http.get(params, noop)
+
+ var resolved = url.resolve(location, request._opts.url)
+- t.equal(resolved, 'foo://localhost:3000/bar', 'Url should be correct')
++ t.equal(resolved, 'foo://localhost:'+port2.toString()+'/bar', 'Url should be correct')
+ t.end()
+ })
+
+ test('Test page with \'file:\' protocol', function (t) {
+ var params = {
+ hostname: 'localhost',
+- port: 3000,
++ port: port2,
+ path: '/bar'
+ }
+
+@@ -79,7 +83,7 @@ test('Test page with \'file:\' protocol', function (t) {
+ global.location = normalLocation // Reset the location
+
+ var resolved = url.resolve(fileLocation, request._opts.url)
+- t.equal(resolved, 'http://localhost:3000/bar', 'Url should be correct')
++ t.equal(resolved, 'http://localhost:'+port2+'/bar', 'Url should be correct')
+ t.end()
+ })
+
+@@ -88,7 +92,7 @@ test('Test string as parameters', function(t) {
+ var request = http.get(testUrl, noop)
+
+ var resolved = url.resolve(location, request._opts.url)
+- t.equal(resolved, 'http://localhost:8081/api/foo', 'Url should be correct')
++ t.equal(resolved, 'http://localhost:'+port1+'/api/foo', 'Url should be correct')
+ t.end()
+ })
+
+@@ -108,11 +112,11 @@ test('Test withCredentials param', function(t) {
+ })
+
+ test('Test ipv6 address', function(t) {
+- var testUrl = 'http://[::1]:80/foo'
++ var testUrl = 'http://[::1]:'+port1+'/foo'
+ var request = http.get(testUrl, noop)
+
+ var resolved = url.resolve(location, request._opts.url)
+- t.equal(resolved, 'http://[::1]:80/foo', 'Url should be correct')
++ t.equal(resolved, 'http://[::1]:'+port1+'/foo', 'Url should be correct')
+ t.end()
+ })
+
+@@ -121,7 +125,7 @@ test('Test relative path in url', function(t) {
+ var request = http.get(params, noop)
+
+ var resolved = url.resolve(location, request._opts.url)
+- t.equal(resolved, 'http://localhost:8081/foo/bar', 'Url should be correct')
++ t.equal(resolved, 'http://localhost:'+port1+'/foo/bar', 'Url should be correct')
+ t.end()
+ })
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-stream-http.git
More information about the Pkg-javascript-commits
mailing list