head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.80
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.78
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.76
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.74
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.72
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.70
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.68
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.66
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.64
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.62
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.60
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.58
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.56
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.54
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.52
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.50
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.48
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.46
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.44
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.42
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.40
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.38
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.36
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.32
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.12
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.34
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.30
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.28
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.26
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.24
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.22
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.20
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.18
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.16
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.14
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.10
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.8
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.6
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.4
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.2
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.1.0.6
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.4
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.2
	pkgsrc-2015Q3-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2016.04.20.13.52.24;	author prlw1;	state Exp;
branches;
next	1.1;
commitid	SSZLXXR1uWlq1n3z;

1.1
date	2015.09.03.11.55.40;	author sborrill;	state Exp;
branches;
next	;
commitid	5CScCic19GwqLNzy;


desc
@@


1.2
log
@Defend against calling select() with nfds >= FD_SETSIZE.
PR pkg/50995
@
text
@$NetBSD$

maxuploadsize is a filtergroup setting
informative error messages

--- src/ConnectionHandler.cpp.orig	2012-09-29 20:06:45.000000000 +0000
+++ src/ConnectionHandler.cpp
@@@@ -555,12 +555,14 @@@@ void ConnectionHandler::handleConnection
 #ifdef DGDEBUG
 						std::cerr << dbgPeerPort << " -Error connecting to proxy" << std::endl;
 #endif
-						syslog(LOG_ERR, "Error connecting to proxy");
+						syslog(LOG_ERR, "Error %d (%m) connecting to proxy %s:%d by client %s", errno, o.proxy_ip.c_str(), o.proxy_port, clientip.c_str());
+
 						return;
 					}
 				}
 				catch(std::exception & e) {
 #ifdef DGDEBUG
+					syslog(LOG_ERR, "Exception while creating proxysock to proxy %s:%d by client %s", o.proxy_ip.c_str(), o.proxy_port, clientip.c_str());
 					std::cerr << dbgPeerPort << " -exception while creating proxysock: " << e.what() << std::endl;
 #endif
 				}
@@@@ -1598,14 +1600,14 @@@@ void ConnectionHandler::handleConnection
 				// Check for POST upload size blocking, unless request is an exception
 				// MIME type test is just an approximation, but probably good enough
 				if (!isbypass && !isexception
-					&& ((o.max_upload_size >= 0) && (cl > o.max_upload_size))
+					&& ((o.fg[filtergroup]->max_upload_size >= 0) && (cl > o.fg[filtergroup]->max_upload_size))
 					&& multipart)
 				{
 #ifdef DGDEBUG
 					std::cout << dbgPeerPort << " -Detected POST upload violation by Content-Length header - discarding rest of POST data..." << std::endl;
 #endif
 					header.discard(&peerconn);
-					checkme.whatIsNaughty = o.max_upload_size == 0 ? o.language_list.getTranslation(700) : o.language_list.getTranslation(701);
+					checkme.whatIsNaughty = o.fg[filtergroup]->max_upload_size == 0 ? o.language_list.getTranslation(700) : o.language_list.getTranslation(701);
 					// Web upload is banned.
 					checkme.whatIsNaughtyLog = checkme.whatIsNaughty;
 					checkme.whatIsNaughtyCategories = "Web upload";
@


1.1
log
@Fix some bugs related to maxuploadsize. Without these patches, all file
uploads are blocked irrespective of what is set in the configuration files.
Remove MESSAGE as licence has changed, it is now entirely GPL.
Bump PKGREVISION.
@
text
@d2 1
d4 1
d6 19
a24 3
--- src/ConnectionHandler.cpp.orig	2015-09-03 12:05:59.000000000 +0100
+++ src/ConnectionHandler.cpp	2015-09-03 12:06:56.000000000 +0100
@@@@ -1598,14 +1598,14 @@@@
@