Micooz 9c3cf648e8 Merge branch 'master' into feature-http2-transport ... * master: (39 commits) docs: update package: bump to v3.3.1 bin: should delete more items in simple mode docs: add examples transports: set handshake timeout of ws to 10s lib: regen config: fix new URL() default port issue lint: fix package: upgrade eslint to v5.2.0 docs: add "Test Using curl" docs: update src: add client side https proxy support package: upgrade winston to v3.0.0 build: keep comments in lib/*.js ci: change NEXT_VERSION to 3.3.1 docs: update lib: regen package: bump to v3.3.0 docs: update transports,test: add "wss" transport ... # Conflicts: # src/core/config.js		2018-06-15 23:12:07 +08:00
..
defs.js	transports: refactor	2018-05-04 22:09:30 +08:00
h2.js	WIP: http2 transport	2018-05-06 18:34:41 +08:00
index.js	Merge branch 'master' into feature-http2-transport	2018-06-15 23:12:07 +08:00
mux.js	transports: refactor	2018-05-04 22:09:30 +08:00
tcp.js	src,test: websocket now support pathname	2018-06-10 15:06:23 +08:00
tls.js	bin,src,test: add "tls_cert_self_signed"	2018-06-12 17:47:52 +08:00
udp.js	transports: refactor	2018-05-04 22:09:30 +08:00
ws.js	transports: set handshake timeout of ws to 10s	2018-06-15 10:33:28 +08:00
wss.js	transports,test: add "wss" transport	2018-06-12 18:05:56 +08:00