File fix_upstream_bug_1421.patch of Package cups-filters

Overview Repositories Revisions Requests Users Attributes Meta

File fix_upstream_bug_1421.patch of Package cups-filters (Revision ae2c7d31ef60cf07f47cf334244d0f8a)

Currently displaying revision ae2c7d31ef60cf07f47cf334244d0f8a , Show latest

From 6db3b08d3b20332b1525b8dd1a47950381b8f637 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 20 Feb 2018 20:24:33 +0100
Subject: [PATCH] libcupsfilters: Eliminated unneeded call of httpAddrPort()
 CUPS library function.

diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c
index 052e3c5e..112723d9 100644
--- a/cupsfilters/ppdgenerator.c
+++ b/cupsfilters/ppdgenerator.c
@@ -360,15 +360,14 @@ pwg_copy_size(cups_size_t *size)	/* I - Media size to copy */
 }
 
 static int				/* O  - 1 on success, 0 on failure */
-cups_get_url(http_t     **http,		/* IO - Current HTTP connection */
-             const char *url,		/* I  - URL to get */
-             char       *name,		/* I  - Temporary filename */
-             size_t     namesize)	/* I  - Size of temporary filename buffer */
+get_url(const char *url,		/* I  - URL to get */
+	char       *name,		/* I  - Temporary filename */
+	size_t     namesize)		/* I  - Size of temporary filename buffer */
 {
+  http_t		*http = NULL;
   char			scheme[32],	/* URL scheme */
 			userpass[256],	/* URL username:password */
 			host[256],	/* URL host */
-			curhost[256],	/* Current host */
 			resource[256];	/* URL resource */
   int			port;		/* URL port */
   http_encryption_t	encryption;	/* Type of encryption to use */
@@ -384,21 +383,18 @@ cups_get_url(http_t     **http,		/* IO - Current HTTP connection */
   else
     encryption = HTTP_ENCRYPTION_IF_REQUESTED;
 
-  if (!*http || strcasecmp(host, httpGetHostname(*http, curhost, sizeof(curhost))) || httpAddrPort(httpGetAddress(*http)) != port)
-  {
-    httpClose(*http);
-    *http = httpConnect2(host, port, NULL, AF_UNSPEC, encryption, 1, 5000, NULL);
-  }
+  http = httpConnect2(host, port, NULL, AF_UNSPEC, encryption, 1, 5000, NULL);
 
-  if (!*http)
+  if (!http)
     return (0);
 
   if ((fd = cupsTempFd(name, (int)namesize)) < 0)
     return (0);
 
-  status = cupsGetFd(*http, resource, fd);
+  status = cupsGetFd(http, resource, fd);
 
   close(fd);
+  httpClose(http);
 
   if (status != HTTP_STATUS_OK)
   {
@@ -736,7 +732,6 @@ lookup_choice(char *name, char *opt_name, cups_array_t *options,
 void
 load_opt_strings_catalog(const char *location, cups_array_t *options)
 {
-  http_t *http = NULL;
   char tmpfile[1024];
   const char *filename = NULL;
   struct stat statbuf;
@@ -761,10 +756,8 @@ load_opt_strings_catalog(const char *location, cups_array_t *options)
     else
       filename = location;
   } else {
-    if (cups_get_url(&http, location, tmpfile, sizeof(tmpfile)))
+    if (get_url(location, tmpfile, sizeof(tmpfile)))
       filename = tmpfile;
-    if (http)
-      httpClose(http);
   }
   if (!filename)
     return;

Places

File fix_upstream_bug_1421.patch of Package cups-filters (Revision ae2c7d31ef60cf07f47cf334244d0f8a)

Places