summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Parse the windows bypass listRoss Porter2020-09-031-1/+5
|/ / / | | | | | | | | | | | | Converts the windows registry bypass list from semi-colon delimited to comma delimited Returns the full list of bypass urls
* | | Merge pull request #130 from mcatanzaro/mcatanzaro/_BSD_SOURCEDominique Leuenberger2020-09-031-1/+0
|\ \ \ | |/ / |/| | Stop defining _BSD_SOURCE
| * | Stop defining _BSD_SOURCEMichael Catanzaro2020-08-121-1/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | It's not needed here and has been deprecated for a long time. Fixes: [ 82%] Building CXX object libproxy/CMakeFiles/config_kde.dir/modules/config_kde.cpp.o In file included from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:27, from /home/mcatanzaro/Projects/libproxy/utils/proxy.c:21: /usr/include/features.h:187:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] 187 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" | ^~~~~~~
* | Merge pull request #118 from smcv/mozjs-freed-stringDominique Leuenberger2020-06-021-7/+4
|\ \ | | | | | | mozjs: Avoid use-after-free
| * | mozjs: Avoid use-after-freeSimon McVittie2020-05-011-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't assign the temporary std::string returned by url_.to_string() to a variable, then it immediately goes out of scope and is freed, resulting in the result of c_str() pointing into freed memory. This works about as well as you would expect. Signed-off-by: Simon McVittie <smcv@debian.org>
* | | Merge pull request #117 from smcv/gsettings-wait-for-initialDominique Leuenberger2020-06-022-5/+14
|\ \ \ | | | | | | | | Fix race conditions in GSettings backend
| * | | gsettings: Wait for all configuration updatesSimon McVittie2020-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we haven't polled the pxgsettings helper for a while, there might be more proxy configuration updates in the pipe than will fit in a single read() call. Signed-off-by: Simon McVittie <smcv@debian.org>
| * | | gsettings: Always read at least the initial values of all keysSimon McVittie2020-05-012-4/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the gsettings (gnome3) module would wait until it had read at least one key/value pair for each GSettings schema requested on the command line. However, GSettings schemas often contain more than one key. With a relatively elaborate proxy configuration, we don't necessarily read all of them in one read() from the pipe, resulting in the full configuration not being read until later - but for proxy(1), "later" is too late, because it exits after the first query. To resolve this, add a way for pxgsettings to signal that it has written all the initial values (a blank line), and wait for that. Fixes: #116 Signed-off-by: Simon McVittie <smcv@debian.org>
* | | Merge pull request #121 from rzvncj/masterDominique Leuenberger2020-06-021-0/+3
|\ \ \ | |_|/ |/| | cmake: fix generate-time warning
| * | cmake: fix generate-time warningRazvan Cojocaru2020-05-211-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the following warning: CMake Warning (dev) in CMakeLists.txt: No project() command is present. The top-level CMakeLists.txt file must contain a literal, direct call to the project() command. Add a line of code such as project(ProjectName) near the top of the file, but after cmake_minimum_required(). CMake is pretending there is a "project(Project)" command on the first line. This warning is for project developers. Use -Wno-dev to suppress it.
* | Merge pull request #115 from DimStar77/NEWS0.4.16Dominique Leuenberger2020-04-301-1/+6
|\ \ | | | | | | Update NEWS en route to 0.4.16
| * | Update NEWS en route to 0.4.16Dominique Leuenberger2020-04-291-1/+6
|/ /
* | Merge pull request #105 from mwilck/pacrunnerDominique Leuenberger2020-04-293-0/+177
|\ \ | | | | | | New attempt to merge pacrunner support
| * | config_pacrunner: update response parsingMartin Wilck2020-02-141-3/+7
| | | | | | | | | | | | | | | Use the same algorithm as pacrunner's own "shim" libproxy, and add support for socks4 and socks5.
| * | config_pacrunner: add test for pacrunner availability on D-BusMartin Wilck2020-02-141-1/+47
| | | | | | | | | | | | | | | If the "org.pacrunner" D-Bus name is owned, it's likely that pacrunner is running. Use this as test for the module.
| * | Add config module for querying PacRunnerDavid Woodhouse2020-02-143-0/+127
| | |
* | | Merge pull request #112 from Vogtinator/fixverscriptDominique Leuenberger2020-04-291-2/+0
|\ \ \ | |_|/ |/| | RFC: Keep visibility of non-px_* symbols
| * | Keep visibility of non-px_* symbolsFabian Vogt2020-03-231-2/+0
| |/ | | | | | | | | | | | | | | | | | | | | Symbols other than px_* are still used by modules, so they have to be visible as well. Unfortunately the version script can't deal with C++ classes properly, it's not possible to match the vtable, typeinfo, etc. without resorting to the platform specific mangling. As a workaround, keep the default visibility of symbols which aren't explicitly mentioned, this means that while users of private API wouldn't be caught anymore, everything continues to work as usual, just with px_* being versioned.
* | Merge pull request #113 from tintou/masterDominique Leuenberger2020-04-271-1/+1
|\ \ | | | | | | pxgsettings: use the correct syntax to connect to the changed signal
| * | pxgsettings: use the correct syntax to connect to the changed signalCorentin Noël2020-04-261-1/+1
|/ / | | | | | | | | As it is a detailed signal, it only makes sense to append a :: when there is a specific property to target. It used to be accepted but triggers a runtime warning with latest GLib.
* | Merge pull request #101 from albert-astals-cid-kdab/small_perf_improvDominique Leuenberger2020-04-1612-23/+23
|\ \ | | | | | | Small performance improvements
| * | Small performance improvementsAlbert Astals Cid2019-10-0412-23/+23
| | | | | | | | | | | | | | | * pass strings by const & instead of copy * Search single chars as chars and not as strings
* | | Merge pull request #109 from iainlane/mozjs-68Dominique Leuenberger2020-04-162-21/+41
|\ \ \ | | | | | | | | mozjs: Port to mozjs 68
| * | | mozjs: Port to mozjs 68Iain Lane2020-03-112-21/+41
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a number of API changes that need to be adapted to, notably - JS_EncodeString is gone; need to use JS_EncodeStringToUTF8 now which requires a rooted object to be passed in. - JS_free is gone The pkg-config file ships some flags which need to be supplied to the build.
* | | Merge pull request #102 from illera88/patch-1Dominique Leuenberger2020-03-271-1/+1
|\ \ \ | | | | | | | | unistd.h is not present in Windows and makes build fail
| * | | unistd.h is not present in Windows and makes build failAlberto Garcia Illera2019-11-131-1/+1
| | |/ | |/|
* | | Merge pull request #111 from Vogtinator/kdeinitDominique Leuenberger2020-03-271-2/+4
|\ \ \ | |_|/ |/| | config_kde: Initialize config_loc.mtime explicitly
| * | config_kde: Initialize config_loc.mtime explicitlyFabian Vogt2020-03-231-2/+4
|/ / | | | | | | Fixes #110
* | Merge pull request #106 from amigadave/python39Dominique Leuenberger2020-02-131-1/+1
|\ \ | |/ |/| python: support Python 3.9
| * python: support Python 3.9David King2020-02-131-1/+1
|/ | | | Add 3.9 to the list of accepted Python 3 versions.
* Merge pull request #93 from alanc/masterDominique Leuenberger2019-07-161-0/+1
|\ | | | | include <string.h> in modules/config_gnome3.cpp
| * include <string.h> in modules/config_gnome3.cppAlan Coopersmith2018-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | Needed to fix build on Solaris 11: libproxy/modules/config_gnome3.cpp:190:3: error: ‘memset’ was not declared in this scope FD_ZERO(&rfds); ^ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* | Merge pull request #95 from bigon/mozjs-60Dominique Leuenberger2019-07-161-1/+1
|\ \ | | | | | | Build with mozjs 60 instead
| * | Build with mozjs 60 insteadLaurent Bigonville2018-12-091-1/+1
| | | | | | | | | | | | This seems enough to make it work with mozjs 60
* | | Merge pull request #98 from veddhaval/masterDominique Leuenberger2019-02-141-2/+11
|\ \ \ | | | | | | | | Fix memory leak in functions 'dnsResolve' and 'webkit_pacrunner::run'
| * | | Fixing memory leak in functions 'dnsResolve' and 'webkit_pacrunner::run'. ↵Dhaval Ved2019-02-141-2/+11
|/ / / | | | | | | | | | Delete memory allocated in jstr2str before return statements.
* | | Merge pull request #97 from kraj/clangDominique Leuenberger2019-01-301-1/+1
|\ \ \ | |/ / |/| | get-pac-test: Fix build with clang/libc++
| * | get-pac-test: Fix build with clang/libc++Khem Raj2019-01-301-1/+1
|/ / | | | | | | | | | | | | get-pac-test.cpp:55:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned int>' ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Khem Raj <raj.khem@gmail.com>
* | Merge pull request #92 from DimStar77/57-2Dominique Leuenberger2018-12-031-0/+6
|\ \ | |/ |/| Trivial: Add NEWS entries on the way to 0.4.16
| * Trivial: Add NEWS entries on the way to 0.4.16Dominique Leuenberger2018-10-031-0/+6
| |
* | Merge pull request #91 from DimStar77/57-2Dominique Leuenberger2018-10-031-1/+1
|\ \ | |/ | | Revert "Do not invoke extra shell to run pxgsettings"
| * Revert "Do not invoke extra shell to run pxgsettings"Dominique Leuenberger2018-10-031-1/+1
|/ | | | | | | | | | | | | | """ sigh OK I now see why it was using /bin/sh to start the helper. It's because the code is concatenate the gsettings keys to watch (in all_keys) as parameters So this is not enough to just remove /bin/bash """ This reverts commit 8012bed4405efa31fffb57d6282de3e1513e4bd9.
* Merge pull request #87 from bigon/mozjs52Dominique Leuenberger2018-10-021-0/+2
|\ | | | | Add call to JS::InitSelfHostedCode()
| * Add call to JS::InitSelfHostedCode()Laurent Bigonville2018-10-021-0/+2
|/ | | | This is needed otherwise mozjs crashes
* Merge pull request #86 from SuperHeron/mozjs52Dominique Leuenberger2018-10-022-13/+8
|\ | | | | Build with mozjs-52
| * Build with mozjs-52Pierre Lejeune2018-07-022-13/+8
|/ | | | Fixes #71
* Merge pull request #85 from amigadave/latest-python3Dominique Leuenberger2018-06-271-1/+1
|\ | | | | python: support Python 3.7 and 3.8
| * python: support Python 3.7 and 3.8David King2018-06-271-1/+1
|/ | | | Add 3.7 and 3.8 to the list of accepted Python 3 versions.
* Merge pull request #77 from DimStar77/57Dominique Leuenberger2018-04-271-1/+1
|\ | | | | Do not invoke extra shell to run pxgsettings
| * Do not invoke extra shell to run pxgsettingsDominique Leuenberger2018-01-081-1/+1
| | | | | | | | Fixes issue #57
View Lorry Controller Status