Commit graph

291 commits

Author SHA1 Message Date
yuri@FreeBSD
97d2f516ff
Add practically important option descriptions to the example in README
1. nginx with the http_proxy module doesn't by default (or ever) accept CONNECT through http, so https should be used. -E is added for this.

2. Many/most users would use self-signed certificates. -z is described for this.

This README change would potentially simplify the setup process for users.
2023-05-05 15:48:07 -07:00
Mark Janssen
09bf837c50
Update README.md
Looking for maintainer
2022-09-21 17:18:08 +02:00
Mark Janssen -- Sig-I/O Automatisering
e7fa825933
Close #58 2022-05-28 21:24:55 +02:00
Mark Janssen -- Sig-I/O Automatisering
4bac945fc7
Apply patch to fix: #57 2022-05-28 15:56:31 +02:00
Mark Janssen
e2a214d942
Merge pull request #54 from deFractal/local-ca-file
Optionally accept alternative default CA file and/or directory path at compile time
2021-08-06 10:29:37 +02:00
David
8cfcd00045 Document CA file & dir compiler options
and fix a trivia typo
2021-08-04 19:03:12 -07:00
David
a269b94ad8 Accept alt ca_file and ca_dir as compiler options 2021-08-04 18:13:37 -07:00
David
e448313d68 Add option for local default OpenSSL 1.1 CA file
Provides non-empty default for Homebrew on macOS
2021-08-04 17:06:14 -07:00
Mark Janssen -- Sig-I/O Automatisering
6014edcc61
Migrated builds to travis-ci.com 2021-06-09 11:56:36 +02:00
Mark Janssen -- Sig-I/O Automatisering
1026053ed2
Update changelog 2021-01-28 23:12:52 +01:00
Mark Janssen -- Sig-I/O Automatisering
c38722e87e
Allow for longer usernames and passwords on proxy-auth 2021-01-28 22:55:39 +01:00
Mark Janssen -- Sig-I/O Automatisering
69c48599e4
Error handling on SSL_new and SSL_connect 2021-01-28 22:55:15 +01:00
Mark Janssen -- Sig-I/O Automatisering
ab33f01fbd
Apply debian patches for Makefile 2021-01-28 22:14:02 +01:00
Mark Janssen -- Sig-I/O Automatisering
2125c79f7d
Bump version 2021-01-28 21:47:47 +01:00
Mark Janssen
301f71e709
Merge pull request #50 from gpchelkin/fixtypo
Fix typo s/certficate/certificate
2021-01-28 21:41:52 +01:00
George Pchelkin
e893be1d45 fix sad typo s/certficate/certificate 2021-01-28 23:08:44 +03:00
Mark Janssen
44afd45b16
Update README.md
typos
2020-09-07 15:03:43 +02:00
Mark Janssen
3d06180ef3
Merge pull request #48 from mcarbonneaux/master
Update README.md to change badge url to use proxytunnel travis-ci not mine.
2020-09-07 15:02:58 +02:00
CARBONNEAUX Mathieu
3dc4ffddb3
Update README.md 2020-09-07 14:54:10 +02:00
Mark Janssen
e43a4d5a6c
Merge pull request #47 from mcarbonneaux/master
This pull request add windows build through Travis-CI, plus upload of the build on Github Release.
2020-08-12 10:03:23 +02:00
Mathieu CARBONNEAUX
e5ffdedc79 Fix object list 2020-07-16 14:53:17 +02:00
Mathieu CARBONNEAUX
f4a2f36292 add windows travis-ci build 2020-07-16 14:52:49 +02:00
Mark Janssen -- Sig-I/O Automatisering
8bbfccb7b5
Update version / copyright dates 2020-05-07 17:17:41 +02:00
Mark Janssen -- Sig-I/O Automatisering
8395e7a258
Apply debian patch: 001_apache_bug_29744_workaround.patch 2020-05-07 17:04:20 +02:00
Mark Janssen -- Sig-I/O Automatisering
cb336cab71
Apply debian patch 003_socket_write_loop.patch 2020-05-07 17:02:39 +02:00
Mark Janssen -- Sig-I/O Automatisering
0c530acaf4
Apply debian documentation 004_fix_spelling_error_in_manpage.patch 2020-05-07 16:59:35 +02:00
Mark Janssen
eff4d414eb
Merge pull request #43 from pghmcfc/gcc10
Fix global variable declarations/definitions for GCC 10 compatibility
2020-01-23 00:30:09 +01:00
Paul Howarth
517650724d Fix global variable declarations/definitions for GCC 10 compatibility
This boils down to declaring global variables as "extern" in header files
and defining them in just one place.

See https://www.gnu.org/software/gcc/gcc-10/porting_to.html
2020-01-22 21:44:01 +00:00
Mark Janssen -- Sig-I/O Automatisering
5f2a02b34b
Temporary ugly fix for building with openssl1.0 or 1.1
Use either make -f Makefile.ssl1o or make -f Makefile.ssl11
When using OpenSSL1.0 or 1.1 based systems
2019-06-28 13:39:54 +02:00
Mark Janssen
f7831a292f
Merge pull request #35 from adamgolebiowski/openssl-1.1-fixes
ptstream.c: fix openssl-1.1 warnings
2018-09-26 20:03:15 +02:00
Adam Gołębiowski
b8c1586071 ptstream.c: fix openssl-1.1 warnings 2018-09-23 16:11:21 +02:00
Mark Janssen
1cb544cdd5
Merge pull request #27 from ilovezfs/portable-install
Makefile: don't use non-portable -D option
2018-06-17 17:31:22 +02:00
ilovezfs
474aa902ea Makefile: don't use non-portable -D option 2018-05-14 04:20:18 -07:00
Mark Janssen
5cc9abeba2
Merge pull request #23 from stoecker/master
Fix SNI for -e option and cleanups
2018-03-31 16:15:52 +02:00
Dirk Stoecker
6ae9190486 fix compiler warning 2018-03-12 17:47:13 +01:00
Dirk Stoecker
c6341a86fb add missing prototype 2018-03-06 12:39:31 +01:00
Dirk Stoecker
41fa820f0c increase version number a bit to reflect changes in the last years 2018-03-06 12:06:47 +01:00
Dirk Stoecker
3a91ebec49 drop revision not working in git, update texts 2018-03-06 12:03:52 +01:00
Dirk Stoecker
02896a593a set proper SNI name in all use cases 2018-03-06 11:52:30 +01:00
Dirk Stoecker
11f8b18ead update version according to CHANGEs file 2018-03-06 11:49:49 +01:00
Mark Janssen -- Sig-I/O Automatisering
2bc14c32e7 Fix typo's as suggested by moshekaplan and blinkingtwelve 2017-01-11 09:23:36 +01:00
Mark Janssen
cb8e792052 Merge pull request #17 from ExtraHop/master
New features (Add IPv6 and SSL cert verification support, make SSLv3 optional)
2016-11-08 15:36:32 +01:00
Chris Veenboer
0cfce96280 Make building on OSX work out of the box (#18)
Conditionally declare strlcat() and strlcpy() in proxytunnel.h
Conditionally include strlcat.o and strlcpy.o in Makefile
2016-11-08 14:52:19 +01:00
Dag Wieers
ee962a3e90 Improve Travis CI configuration 2016-08-29 23:04:44 +02:00
Dag Wieers
1d1019ccf0 Update TODO file 2016-08-29 22:48:04 +02:00
Dag Wieers
a8ed2a7ea4 Ignore the proxytunnel binary 2016-08-29 22:43:36 +02:00
Stephen Kent
655845108c Add an option to provide a CA cert for server certificate verification
Enable this option with -C/--cacert
2016-08-18 10:26:41 -07:00
Stephen Kent
5a7692f28f Add SSL certificate verification support and enable it by default
Disable SSL certificate verification with -z/--no-check-certificate
2016-08-18 10:24:11 -07:00
Stephen Kent
4554d4b801 Add an option to disable SSLv3
Disable SSLv3 with the option -T/--no-ssl3
2016-08-18 10:21:48 -07:00
Will Mortensen
dbffa1653e Add IPv6 support 2016-08-18 10:16:44 -07:00