Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
/src/po/*.mo
/src/po/i18n_errs.txt
/src/po/pkg.pot
/src/util/mkcert/mkcert
/src/tests/multiplatform.pyc
/src/zoneproxy/zoneproxy-adm/zoneproxy-adm
/src/zoneproxy/zoneproxy-client/zoneproxy-client
/src/zoneproxy/zoneproxyd/zoneproxyd
/src/tests/.timing_history.txt
/src/tests/timing_info.txt
/src/tests/*.pyc
/src/tests/*/*.pyc
/src/cffi_src/src
Expand Down
6 changes: 3 additions & 3 deletions src/brand/bhyve/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#
# This file was automatically produced by tools/updatereqs
# Generated on Wed Mar 18 12:59:04 UTC 2026
# Generated on Tue May 19 16:00:07 UTC 2026
# Do not edit directly
#
construct==2.10.70
packaging==26.0
packaging==26.2
PyYAML==6.0.3
wheel==0.46.3
wheel==0.47.0
28 changes: 15 additions & 13 deletions src/modules/client/transport/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def __init__(self, transport, max_conn=20):
self.__last_stall_check = 0

# Set options on multi-handle
self.__mhandle.setopt(pycurl.M_PIPELINING, 0)
self.__mhandle.setopt(pycurl.M_PIPELINING, pycurl.PIPE_MULTIPLEX)

# initialize easy handles
for i in range(self.__max_handles):
Expand Down Expand Up @@ -198,8 +198,8 @@ def __check_for_stalls(self):
if time_elapsed < 0:
h.starttime = current_time
time_elapsed = 0
size_xfrd = h.getinfo(pycurl.SIZE_DOWNLOAD) + h.getinfo(
pycurl.SIZE_UPLOAD
size_xfrd = h.getinfo(pycurl.SIZE_DOWNLOAD_T) + h.getinfo(
pycurl.SIZE_UPLOAD_T
)
time_list.append(time_elapsed)
size_list.append(size_xfrd)
Expand Down Expand Up @@ -246,7 +246,7 @@ def __cleanup_requests(self):
repostats = self.__xport.stats[(h.repourl, h.proxy)]
visited_repos.add(repostats)
repostats.record_tx()
nbytes = h.getinfo(pycurl.SIZE_DOWNLOAD)
nbytes = h.getinfo(pycurl.SIZE_DOWNLOAD_T)
seconds = h.getinfo(pycurl.TOTAL_TIME)
conn_count = h.getinfo(pycurl.NUM_CONNECTS)
conn_time = h.getinfo(pycurl.CONNECT_TIME)
Expand Down Expand Up @@ -349,11 +349,11 @@ def __cleanup_requests(self):
repostats = self.__xport.stats[(h.repourl, h.proxy)]
visited_repos.add(repostats)
repostats.record_tx()
nbytes = h.getinfo(pycurl.SIZE_DOWNLOAD)
nbytes = h.getinfo(pycurl.SIZE_DOWNLOAD_T)
seconds = h.getinfo(pycurl.TOTAL_TIME)
conn_count = h.getinfo(pycurl.NUM_CONNECTS)
conn_time = h.getinfo(pycurl.CONNECT_TIME)
h.filetime = h.getinfo(pycurl.INFO_FILETIME)
h.filetime = h.getinfo(pycurl.FILETIME_T)

url = h.url
uuid = h.uuid
Expand Down Expand Up @@ -1000,13 +1000,13 @@ def __setup_handle(self, hdl, treq):
hdl.setopt(pycurl.FAILONERROR, True)

if treq.progtrack and treq.progclass:
hdl.setopt(pycurl.NOPROGRESS, 0)
hdl.setopt(pycurl.NOPROGRESS, False)
hdl.fileprog = treq.progclass(treq.progtrack)
hdl.setopt(pycurl.PROGRESSFUNCTION, hdl.fileprog.progress_callback)
hdl.setopt(pycurl.XFERINFOFUNCTION, hdl.fileprog.progress_callback)
elif treq.progfunc:
# For light-weight progress tracking / cancellation.
hdl.setopt(pycurl.NOPROGRESS, 0)
hdl.setopt(pycurl.PROGRESSFUNCTION, treq.progfunc)
hdl.setopt(pycurl.NOPROGRESS, False)
hdl.setopt(pycurl.XFERINFOFUNCTION, treq.progfunc)

proto = urlsplit(treq.url)[0]
if proto not in ("http", "https"):
Expand All @@ -1025,7 +1025,7 @@ def __setup_handle(self, hdl, treq):
)

if treq.compressible:
hdl.setopt(pycurl.ENCODING, "")
hdl.setopt(pycurl.ACCEPT_ENCODING, "")

if treq.hdrfunc:
hdl.setopt(pycurl.HEADERFUNCTION, treq.hdrfunc)
Expand All @@ -1043,7 +1043,8 @@ def __setup_handle(self, hdl, treq):
hdl.r_fobj = treq.read_fobj
hdl.setopt(pycurl.READDATA, hdl.r_fobj)
hdl.setopt(
pycurl.POSTFIELDSIZE, os.fstat(hdl.r_fobj.fileno()).st_size
pycurl.POSTFIELDSIZE_LARGE,
os.fstat(hdl.r_fobj.fileno()).st_size,
)
else:
raise tx.TransportOperationError(
Expand All @@ -1059,7 +1060,8 @@ def __setup_handle(self, hdl, treq):
hdl.r_fobj = treq.read_fobj
hdl.setopt(pycurl.READDATA, hdl.r_fobj)
hdl.setopt(
pycurl.INFILESIZE, os.fstat(hdl.r_fobj.fileno()).st_size
pycurl.INFILESIZE_LARGE,
os.fstat(hdl.r_fobj.fileno()).st_size,
)
else:
raise tx.TransportOperationError(
Expand Down
28 changes: 14 additions & 14 deletions src/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
#
# This file was automatically produced by tools/updatereqs
# Generated on Wed Mar 18 12:58:50 UTC 2026
# Generated on Tue May 19 16:00:00 UTC 2026
# Do not edit directly
#
annotated-doc==0.0.4
cheroot==11.1.2
CherryPy==18.10.0
click==8.3.1
click==8.4.0
jaraco.collections==5.2.1
jaraco.context==6.1.1
jaraco.functools==4.4.0
jaraco.context==6.1.2
jaraco.functools==4.5.0
jaraco.text==4.2.0
Mako==1.3.10
markdown-it-py==4.0.0
Mako==1.3.12
markdown-it-py==4.2.0
MarkupSafe==3.0.3
mdurl==0.1.2
more-itertools==10.8.0
packaging==26.0
more-itertools==11.0.2
packaging==26.2
ply==3.11
portend==3.2.1
prettytable==3.17.0
pybonjour @ https://mirrors.omnios.org/pymodules/pybonjour/pybonjour-1.1.1-python3.tar.gz#sha256
Pygments==2.19.2
Pygments==2.20.0
python-dateutil==2.9.0.post0
rich==14.3.3
rich==15.0.0
setuptools==82.0.1
shellingham==1.5.4
six==1.17.0
tempora==5.8.1
typer==0.24.1
tempora==5.9.0
typer==0.25.1
typer-slim==0.24.0
wcwidth==0.6.0
wheel==0.46.3
wcwidth==0.7.0
wheel==0.47.0
zc.lockfile==4.0
Loading
Loading