Skip to content

Commit

Permalink
Update to current libcups.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Jun 18, 2024
1 parent a428754 commit c9347c9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion libcups
Submodule libcups updated 61 files
+33 −25 .github/workflows/build.yml
+1 −1 .github/workflows/codeql-analysis.yml
+5 −4 .github/workflows/coverity.yml
+7 −0 CHANGES.md
+2 −2 configure
+2 −2 configure.ac
+12 −2 cups/Dependencies
+19 −2 cups/Makefile
+1 −0 cups/cups-private.h
+1 −1 cups/cups.h
+2 −2 cups/cupspm.md
+10 −16 cups/debug.c
+14 −3 cups/dest.c
+41 −2 cups/dir.c
+671 −321 cups/dnssd.c
+2 −1 cups/dnssd.h
+19 −2 cups/form.c
+9 −9 cups/getputfile.c
+25 −17 cups/http-addr.c
+106 −111 cups/http.c
+2 −13 cups/http.h
+64 −8 cups/ipp.c
+3 −1 cups/ipp.h
+1 −2 cups/json-private.h
+22 −10 cups/json.c
+3 −1 cups/json.h
+3 −3 cups/jwt.c
+16 −2 cups/libcups3.def
+1,513 −0 cups/oauth.c
+56 −0 cups/oauth.h
+8 −8 cups/request.c
+5 −15 cups/string.c
+1 −1 cups/testclient.c
+2 −2 cups/testcreds.c
+76 −1 cups/testdnssd.c
+21 −16 cups/testhttp.c
+28 −7 cups/testipp.c
+27 −0 cups/testoauth.c
+119 −70 cups/tls-gnutls.c
+222 −74 cups/tls-openssl.c
+298 −19 cups/tls.c
+ doc/cupspm.epub
+939 −494 doc/cupspm.html
+4 −4 tools/ipptool.c
+14 −5 tools/ipptransform.c
+2 −5 tools/run-tests.sh
+10 −21 vcnet/ipptransform.vcxproj
+31 −0 vcnet/libcups.sln
+2 −0 vcnet/packages.config
+283 −218 xcode/libcups.xcodeproj/project.pbxproj
+1 −1 xcode/libcups.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
+1 −1 xcode/libcups.xcodeproj/xcshareddata/xcschemes/fuzzipp.xcscheme
+1 −1 xcode/libcups.xcodeproj/xcshareddata/xcschemes/ippevepcl.xcscheme
+1 −1 xcode/libcups.xcodeproj/xcshareddata/xcschemes/ippeveps.xcscheme
+1 −1 xcode/libcups.xcodeproj/xcshareddata/xcschemes/libcups.xcscheme
+1 −1 xcode/libcups.xcodeproj/xcshareddata/xcschemes/testcreds.xcscheme
+1 −1 xcode/libcups.xcodeproj/xcshareddata/xcschemes/testlang.xcscheme
+1 −1 xcode/libcups.xcodeproj/xcshareddata/xcschemes/testpwg.xcscheme
+1 −1 xcode/libcups.xcodeproj/xcshareddata/xcschemes/testtestpage.xcscheme
+10 −0 xcode/libcups.xcworkspace/contents.xcworkspacedata
+8 −0 xcode/libcups.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
6 changes: 3 additions & 3 deletions tools/ippproxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ run_job(proxy_info_t *info, /* I - Proxy information */
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "output-device-uuid", NULL, info->device_uuid);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsGetUser());

if (httpReconnect(info->http, 30000, NULL))
if (httpConnectAgain(info->http, 30000, NULL))
{
job_attrs = cupsDoRequest(info->http, request, info->resource);
}
Expand Down Expand Up @@ -1452,7 +1452,7 @@ run_printer(
else
sleep(30);

httpReconnect(http, 30000, NULL);
httpConnectAgain(http, 30000, NULL);
}

/*
Expand Down Expand Up @@ -1887,7 +1887,7 @@ update_device_attrs(
}
}

if (httpReconnect(http, 30000, NULL))
if (httpConnectAgain(http, 30000, NULL))
{
ippDelete(cupsDoRequest(http, request, resource));

Expand Down

0 comments on commit c9347c9

Please sign in to comment.