Merge changes from CUPS 1.7svn-r10814.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4125 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 0 insertions, 22 deletions

diff --git a/cups/util.c b/cups/util.c
index f0ddc642d..a94c4b02e 100644
--- a/cups/util.c
+++ b/cups/util.c
@@ -117,7 +117,6 @@ cupsCancelJob2(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP_
 {
   char		uri[HTTP_MAX_URI];	/* Job/printer URI */
   ipp_t		*request;		/* IPP request */
-  _cups_globals_t *cg = _cupsGlobals();	/* Thread global data */
 
 
  /*
@@ -151,8 +150,6 @@ cupsCancelJob2(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP_
 
   request = ippNewRequest(job_id < 0 ? IPP_PURGE_JOBS : IPP_CANCEL_JOB);
 
-  ippSetVersion(request, cg->server_version / 10, cg->server_version % 10);
-
   if (name)
   {
     httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
@@ -214,7 +211,6 @@ cupsCreateJob(
 		*response;		/* Create-Job response */
   ipp_attribute_t *attr;		/* job-id attribute */
   int		job_id = 0;		/* job-id value */
-  _cups_globals_t *cg = _cupsGlobals();	/* Thread global data */
 
 
   DEBUG_printf(("cupsCreateJob(http=%p, name=\"%s\", title=\"%s\", "
@@ -241,8 +237,6 @@ cupsCreateJob(
     return (0);
   }
 
-  ippSetVersion(request, cg->server_version / 10, cg->server_version % 10);
-
   httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, sizeof(printer_uri), "ipp",
                    NULL, "localhost", ippPort(), "/printers/%s", name);
   snprintf(resource, sizeof(resource), "/printers/%s", name);
@@ -369,8 +363,6 @@ cupsGetClasses(char ***classes)		/* O - Classes */
 
   request = ippNewRequest(CUPS_GET_CLASSES);
 
-  ippSetVersion(request, 1, 1);
-
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes", NULL, "printer-name");
 
@@ -490,8 +482,6 @@ cupsGetDefault2(http_t *http)		/* I - Connection to server or @code CUPS_HTTP_DE
 
   request = ippNewRequest(CUPS_GET_DEFAULT);
 
-  ippSetVersion(request, 1, 1);
-
  /*
   * Do the request and get back a response...
   */
@@ -637,8 +627,6 @@ cupsGetJobs2(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_D
 
   request = ippNewRequest(IPP_GET_JOBS);
 
-  ippSetVersion(request, cg->server_version / 10, cg->server_version % 10);
-
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
                "printer-uri", NULL, uri);
 
@@ -1227,8 +1215,6 @@ cupsGetPrinters(char ***printers)	/* O - Printers */
 
   request = ippNewRequest(CUPS_GET_PRINTERS);
 
-  ippSetVersion(request, 1, 1);
-
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes", NULL, "printer-name");
 
@@ -1345,8 +1331,6 @@ cupsGetServerPPD(http_t     *http,	/* I - Connection to server or @code CUPS_HTT
   */
 
   request = ippNewRequest(CUPS_GET_PPD);
-  ippSetVersion(request, cg->server_version / 10, cg->server_version % 10);
-
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "ppd-name", NULL,
                name);
 
@@ -1588,7 +1572,6 @@ cupsStartDocument(
 		printer_uri[1024];	/* Printer URI */
   ipp_t		*request;		/* Send-Document request */
   http_status_t	status;			/* HTTP status */
-  _cups_globals_t *cg = _cupsGlobals();	/* Thread global data */
 
 
  /*
@@ -1601,8 +1584,6 @@ cupsStartDocument(
     return (HTTP_ERROR);
   }
 
-  ippSetVersion(request, cg->server_version / 10, cg->server_version % 10);
-
   httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, sizeof(printer_uri), "ipp",
                    NULL, "localhost", ippPort(), "/printers/%s", name);
   snprintf(resource, sizeof(resource), "/printers/%s", name);
@@ -1660,7 +1641,6 @@ cups_get_printer_uri(
 		classname[255],		/* Temporary class name */
 		http_hostname[HTTP_MAX_HOST];
 					/* Hostname associated with connection */
-  _cups_globals_t *cg = _cupsGlobals();	/* Thread global data */
   static const char * const requested_attrs[] =
 		{			/* Requested attributes */
 		  "device-uri",
@@ -1710,8 +1690,6 @@ cups_get_printer_uri(
 
   request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
 
-  ippSetVersion(request, cg->server_version / 10, cg->server_version % 10);
-
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);