Skip to content

[pull] master from tinyproxy:master #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pull wants to merge 58 commits into
base: master
Choose a base branch
from
Open

[pull] master from tinyproxy:master #18

Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
14d31ed
Prettify stats.html
vituperative Apr 22, 2022
26db3f6
Allow "XTinyProxy No" with xtinyproxy disabled
tstenner Apr 29, 2022
235b1c1
implement filtertype keyword and fnmatch-based filtering
rofl0r May 9, 2021
7d1e86c
don't try to send 408 error to closed client socket
rofl0r May 2, 2022
77cd87e
print error message if errorfile is configured but can't be opened
rofl0r May 27, 2022
d9e38ba
add gperf generated files to make dist
rofl0r May 27, 2022
d6ee383
configure: use release tarball provided gperf file
rofl0r May 27, 2022
ea75e79
CI: add github workflow to build release tarball
rofl0r May 27, 2022
90adf28
release 1.11.1
rofl0r May 27, 2022
8b373f8
update html documentation, add quickstart section
rofl0r May 30, 2022
121be4a
echo http protocol version on CONNECT request response
rofl0r Jul 15, 2022
84f203f
fix reversepath directive using https url giving misleading error
rofl0r Aug 20, 2022
3764b85
prevent junk from showing up in error page in invalid requests
rofl0r Sep 8, 2022
6ffd9af
hsearch: fix potential UB (pointer arithmetics on nullptr)
rofl0r Feb 1, 2023
470cc08
conf: fix potential crash with invalid input data
rofl0r Feb 1, 2023
31339cb
tinyproxy.conf.5: update text for bind directive
rofl0r Feb 1, 2023
ef60434
docs: typo fix
rofl0r Mar 20, 2023
2bec15e
Allow configuring IPv6 address for upstream proxy (#492)
Mario-Klebsch May 23, 2023
1e615e6
tinyproxy.conf.5: document config strings that require double quotes …
ivanwick May 24, 2023
d7c20e6
tinyproxy.conf.5: document syntax for upstream IPv6 addresses
rofl0r May 25, 2023
2935519
fix omission to reset socklen parameter for accept()
rofl0r Jun 7, 2023
1289d8a
conf: use case-independent match for Filtertype parameter
rofl0r Oct 13, 2023
c834073
fix CI by running apt update
rofl0r Oct 15, 2023
84285b6
BasicAuth: Accept special chars in username and password (#516)
vityank Nov 2, 2023
c4df45b
BasicAuth: Added logging for failed login attemps
Strongleong Nov 7, 2023
92289d5
main: print filename of config file used on (re)load
rofl0r May 1, 2024
12a8484
fix potential UAF in header handling (CVE-2023-49606)
rofl0r May 5, 2024
e69788b
Add SECURITY.md
rofl0r May 5, 2024
dd49e97
release 1.11.2
rofl0r May 8, 2024
942d0c6
Use appropriate installation path variables
mohd-akram Jun 2, 2024
72b93f6
CI: update release workflow to non-deprecated actions
rofl0r Jun 16, 2024
d652ed8
Omit the version number from headers and HTML responses (#543)
jpmckinney Jun 20, 2024
73da8a3
conf: add BasicAuthRealm feature (#547)
gruummy Jul 14, 2024
c04ba47
reqs: don't compile upstream code if feature disabled
rofl0r Oct 19, 2024
05f6e4e
basic auth: fix error status 401 vs 407
rofl0r Jul 15, 2024
cea0ebe
tinyproxy.conf.5: explain what a site_spec looks like
rofl0r Jan 6, 2025
56404a3
replace orderedmap for connection headers with linear list
rofl0r May 2, 2022
74f5f59
build: fix shellcheck errors in autogen.sh
obnoxxx Feb 13, 2025
0712ec3
tests: fix shellcheck issues and syntax errors in run_tests.sh
obnoxxx Feb 13, 2025
f134786
tests: fix shellcheck issues in run_tests_valgrind.sh
obnoxxx Feb 13, 2025
acd99f1
build: add `make shellcheck`
obnoxxx Feb 12, 2025
1a02315
CI: add a shellcheck ci workflow
obnoxxx Feb 10, 2025
0a2da97
tests: remove duplicate code from run_tests.sh
obnoxxx Feb 14, 2025
d62b7d2
remove unused vsyslog code
rofl0r May 1, 2025
d54e9a7
remove unused strlcat checks and fallback code
rofl0r May 1, 2025
8b02f86
remove redundant config_directive_entry CD_NIL
tangaac May 7, 2025
f0033b7
tinyproxy.conf.5: add an IPv6 example to allow/deny section
rofl0r Jun 21, 2025
3c0fde9
reqs: fix integer overflow in port number processing
rofl0r Oct 17, 2025
b383efe
fix making of man8
rofl0r Mar 7, 2026
baecbf4
release 1.11.3
rofl0r Mar 7, 2026
86a8f27
version.sh: fix use of non-annotated tags
rofl0r Mar 8, 2026
9240e60
CI: also check that website generation works
rofl0r Mar 8, 2026
1c4af67
Fix paths in man page
mohd-akram Mar 8, 2026
969852c
reqs: check negative length values when reading chunked data
rofl0r Mar 12, 2026
e77570a
fix catching timed-out socket (#599)
rofl0r Mar 28, 2026
bb7edc4
reqs: prevent potential int overflow when parsing chunked data (#603)
rofl0r Mar 29, 2026
879bf84
reqs: fix case-sensitive matching of "chunked" (#605)
rofl0r Apr 3, 2026
09312a1
reqs: improve stathost detection (#606)
rofl0r Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
version.sh: fix use of non-annotated tags 
the script always returned 1.11.0-rc1, because apparently that tag
was annotated, unlike the newer ones.
  • Loading branch information
@rofl0r
rofl0r committed Mar 8, 2026
commit 86a8f272f6af3975b37f34ce38d4b5e152ff9864
2 changes: 1 addition & 1 deletion scripts/version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GIT_DIR="${SCRIPT_DIR}/../.git"

if test -d "${GIT_DIR}" ; then
if type git >/dev/null 2>&1 ; then
gitstr=$(git describe --match '[0-9]*.[0-9]*.*' 2>/dev/null)
gitstr=$(git describe --tags --match '[0-9]*.[0-9]*.*' 2>/dev/null)
if test "x$?" != x0 ; then
sed 's/$/-git/' < VERSION
else
Expand Down