/*
- * "$Id: getputfile.c 4984 2006-01-25 21:55:36Z mike $"
+ * "$Id$"
*
- * Get/put file functions for the Common UNIX Printing System (CUPS).
+ * Get/put file functions for CUPS.
*
+ * Copyright 2007-2013 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
* Include necessary headers...
*/
-#include "cups.h"
-#include "ipp.h"
-#include "language.h"
-#include "string.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
+#include "cups-private.h"
#include <fcntl.h>
#include <sys/stat.h>
#if defined(WIN32) || defined(__EMX__)
/*
* 'cupsGetFd()' - Get a file from the server.
*
- * This function returns HTTP_OK when the file is successfully retrieved.
+ * This function returns @code HTTP_STATUS_OK@ when the file is successfully retrieved.
*
- * @since CUPS 1.1.20@
+ * @since CUPS 1.1.20/OS X 10.4@
*/
-http_status_t /* O - Status */
-cupsGetFd(http_t *http, /* I - HTTP connection to server */
+http_status_t /* O - HTTP status */
+cupsGetFd(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
const char *resource, /* I - Resource name */
int fd) /* I - File descriptor */
{
int bytes; /* Number of bytes read */
char buffer[8192]; /* Buffer for file */
http_status_t status; /* HTTP status from server */
+ char if_modified_since[HTTP_MAX_VALUE];
+ /* If-Modified-Since header */
/*
* Range check input...
*/
- DEBUG_printf(("cupsGetFd(http=%p, resource=\"%s\", fd=%d)\n", http,
+ DEBUG_printf(("cupsGetFd(http=%p, resource=\"%s\", fd=%d)", http,
resource, fd));
- if (!http || !resource || fd < 0)
+ if (!resource || fd < 0)
{
if (http)
http->error = EINVAL;
- return (HTTP_ERROR);
+ return (HTTP_STATUS_ERROR);
}
+ if (!http)
+ if ((http = _cupsConnect()) == NULL)
+ return (HTTP_STATUS_SERVICE_UNAVAILABLE);
+
/*
* Then send GET requests to the HTTP server...
*/
+ strlcpy(if_modified_since, httpGetField(http, HTTP_FIELD_IF_MODIFIED_SINCE),
+ sizeof(if_modified_since));
+
do
{
httpClearFields(http);
httpSetField(http, HTTP_FIELD_AUTHORIZATION, http->authstring);
+ httpSetField(http, HTTP_FIELD_IF_MODIFIED_SINCE, if_modified_since);
if (httpGet(http, resource))
{
- if (httpReconnect(http))
+ if (httpReconnect2(http, 30000, NULL))
{
- status = HTTP_ERROR;
+ status = HTTP_STATUS_ERROR;
break;
}
else
{
- status = HTTP_UNAUTHORIZED;
+ status = HTTP_STATUS_UNAUTHORIZED;
continue;
}
}
- while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+ while ((status = httpUpdate(http)) == HTTP_STATUS_CONTINUE);
- if (status == HTTP_UNAUTHORIZED)
+ if (status == HTTP_STATUS_UNAUTHORIZED)
{
/*
* Flush any error message...
*/
if (cupsDoAuthentication(http, "GET", resource))
+ {
+ status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
break;
+ }
- if (httpReconnect(http))
+ if (httpReconnect2(http, 30000, NULL))
{
- status = HTTP_ERROR;
+ status = HTTP_STATUS_ERROR;
break;
}
continue;
}
#ifdef HAVE_SSL
- else if (status == HTTP_UPGRADE_REQUIRED)
+ else if (status == HTTP_STATUS_UPGRADE_REQUIRED)
{
/* Flush any error message... */
httpFlush(http);
/* Reconnect... */
- if (httpReconnect(http))
+ if (httpReconnect2(http, 30000, NULL))
{
- status = HTTP_ERROR;
+ status = HTTP_STATUS_ERROR;
break;
}
/* Upgrade with encryption... */
- httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+ httpEncryption(http, HTTP_ENCRYPTION_REQUIRED);
/* Try again, this time with encryption enabled... */
continue;
}
#endif /* HAVE_SSL */
}
- while (status == HTTP_UNAUTHORIZED || status == HTTP_UPGRADE_REQUIRED);
+ while (status == HTTP_STATUS_UNAUTHORIZED || status == HTTP_STATUS_UPGRADE_REQUIRED);
/*
* See if we actually got the file or an error...
*/
- if (status == HTTP_OK)
+ if (status == HTTP_STATUS_OK)
{
/*
* Yes, copy the file...
*/
- while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
+ while ((bytes = httpRead2(http, buffer, sizeof(buffer))) > 0)
write(fd, buffer, bytes);
}
else
+ {
+ _cupsSetHTTPError(status);
httpFlush(http);
+ }
/*
* Return the request status...
*/
+ DEBUG_printf(("1cupsGetFd: Returning %d...", status));
+
return (status);
}
/*
* 'cupsGetFile()' - Get a file from the server.
*
- * This function returns HTTP_OK when the file is successfully retrieved.
+ * This function returns @code HTTP_STATUS_OK@ when the file is successfully retrieved.
*
- * @since CUPS 1.1.20@
+ * @since CUPS 1.1.20/OS X 10.4@
*/
-http_status_t /* O - Status */
-cupsGetFile(http_t *http, /* I - HTTP connection to server */
+http_status_t /* O - HTTP status */
+cupsGetFile(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
const char *resource, /* I - Resource name */
const char *filename) /* I - Filename */
{
if (http)
http->error = EINVAL;
- return (HTTP_ERROR);
+ return (HTTP_STATUS_ERROR);
}
/*
http->error = errno;
- return (HTTP_ERROR);
+ return (HTTP_STATUS_ERROR);
}
/*
close(fd);
- if (status != HTTP_OK)
+ if (status != HTTP_STATUS_OK)
unlink(filename);
/*
/*
* 'cupsPutFd()' - Put a file on the server.
*
- * This function returns HTTP_CREATED when the file is stored successfully.
+ * This function returns @code HTTP_STATUS_CREATED@ when the file is stored
+ * successfully.
*
- * @since CUPS 1.1.20@
+ * @since CUPS 1.1.20/OS X 10.4@
*/
-http_status_t /* O - Status */
-cupsPutFd(http_t *http, /* I - HTTP connection to server */
+http_status_t /* O - HTTP status */
+cupsPutFd(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
const char *resource, /* I - Resource name */
int fd) /* I - File descriptor */
{
- int bytes; /* Number of bytes read */
+ int bytes, /* Number of bytes read */
+ retries; /* Number of retries */
char buffer[8192]; /* Buffer for file */
http_status_t status; /* HTTP status from server */
* Range check input...
*/
- DEBUG_printf(("cupsPutFd(http=%p, resource=\"%s\", fd=%d)\n", http,
+ DEBUG_printf(("cupsPutFd(http=%p, resource=\"%s\", fd=%d)", http,
resource, fd));
- if (!http || !resource || fd < 0)
+ if (!resource || fd < 0)
{
if (http)
http->error = EINVAL;
- return (HTTP_ERROR);
+ return (HTTP_STATUS_ERROR);
}
+ if (!http)
+ if ((http = _cupsConnect()) == NULL)
+ return (HTTP_STATUS_SERVICE_UNAVAILABLE);
+
/*
* Then send PUT requests to the HTTP server...
*/
+ retries = 0;
+
do
{
- DEBUG_printf(("cupsPutFd: starting attempt, authstring=\"%s\"...\n",
+ DEBUG_printf(("2cupsPutFd: starting attempt, authstring=\"%s\"...",
http->authstring));
httpClearFields(http);
httpSetField(http, HTTP_FIELD_AUTHORIZATION, http->authstring);
httpSetField(http, HTTP_FIELD_TRANSFER_ENCODING, "chunked");
+ httpSetExpect(http, HTTP_STATUS_CONTINUE);
if (httpPut(http, resource))
{
- if (httpReconnect(http))
+ if (httpReconnect2(http, 30000, NULL))
{
- status = HTTP_ERROR;
+ status = HTTP_STATUS_ERROR;
break;
}
else
{
- status = HTTP_UNAUTHORIZED;
+ status = HTTP_STATUS_UNAUTHORIZED;
continue;
}
}
/*
- * Copy the file...
+ * Wait up to 1 second for a 100-continue response...
*/
- lseek(fd, 0, SEEK_SET);
+ if (httpWait(http, 1000))
+ status = httpUpdate(http);
+ else
+ status = HTTP_STATUS_CONTINUE;
+
+ if (status == HTTP_STATUS_CONTINUE)
+ {
+ /*
+ * Copy the file...
+ */
- status = HTTP_CONTINUE;
+ lseek(fd, 0, SEEK_SET);
- while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
- if (httpCheck(http))
- {
- if ((status = httpUpdate(http)) != HTTP_CONTINUE)
- break;
- }
- else
- httpWrite(http, buffer, bytes);
+ while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
+ if (httpCheck(http))
+ {
+ if ((status = httpUpdate(http)) != HTTP_STATUS_CONTINUE)
+ break;
+ }
+ else
+ httpWrite2(http, buffer, bytes);
+ }
- if (status == HTTP_CONTINUE)
+ if (status == HTTP_STATUS_CONTINUE)
{
- httpWrite(http, buffer, 0);
+ httpWrite2(http, buffer, 0);
- while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+ while ((status = httpUpdate(http)) == HTTP_STATUS_CONTINUE);
}
- DEBUG_printf(("cupsPutFd: status=%d\n", status));
+ if (status == HTTP_STATUS_ERROR && !retries)
+ {
+ DEBUG_printf(("2cupsPutFd: retry on status %d", status));
+
+ retries ++;
+
+ /* Flush any error message... */
+ httpFlush(http);
+
+ /* Reconnect... */
+ if (httpReconnect2(http, 30000, NULL))
+ {
+ status = HTTP_STATUS_ERROR;
+ break;
+ }
- if (status == HTTP_UNAUTHORIZED)
+ /* Try again... */
+ continue;
+ }
+
+ DEBUG_printf(("2cupsPutFd: status=%d", status));
+
+ if (status == HTTP_STATUS_UNAUTHORIZED)
{
/*
* Flush any error message...
*/
if (cupsDoAuthentication(http, "PUT", resource))
+ {
+ status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
break;
+ }
- if (httpReconnect(http))
+ if (httpReconnect2(http, 30000, NULL))
{
- status = HTTP_ERROR;
+ status = HTTP_STATUS_ERROR;
break;
}
continue;
}
#ifdef HAVE_SSL
- else if (status == HTTP_UPGRADE_REQUIRED)
+ else if (status == HTTP_STATUS_UPGRADE_REQUIRED)
{
/* Flush any error message... */
httpFlush(http);
/* Reconnect... */
- if (httpReconnect(http))
+ if (httpReconnect2(http, 30000, NULL))
{
- status = HTTP_ERROR;
+ status = HTTP_STATUS_ERROR;
break;
}
/* Upgrade with encryption... */
- httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+ httpEncryption(http, HTTP_ENCRYPTION_REQUIRED);
/* Try again, this time with encryption enabled... */
continue;
}
#endif /* HAVE_SSL */
}
- while (status == HTTP_UNAUTHORIZED || status == HTTP_UPGRADE_REQUIRED);
+ while (status == HTTP_STATUS_UNAUTHORIZED || status == HTTP_STATUS_UPGRADE_REQUIRED ||
+ (status == HTTP_STATUS_ERROR && retries < 2));
/*
* See if we actually put the file or an error...
*/
- if (status != HTTP_CREATED)
+ if (status != HTTP_STATUS_CREATED)
+ {
+ _cupsSetHTTPError(status);
httpFlush(http);
+ }
+
+ DEBUG_printf(("1cupsPutFd: Returning %d...", status));
return (status);
}
/*
* 'cupsPutFile()' - Put a file on the server.
*
- * This function returns HTTP_CREATED when the file is stored successfully.
+ * This function returns @code HTTP_CREATED@ when the file is stored
+ * successfully.
*
- * @since CUPS 1.1.20@
+ * @since CUPS 1.1.20/OS X 10.4@
*/
-http_status_t /* O - Status */
-cupsPutFile(http_t *http, /* I - HTTP connection to server */
+http_status_t /* O - HTTP status */
+cupsPutFile(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
const char *resource, /* I - Resource name */
const char *filename) /* I - Filename */
{
if (http)
http->error = EINVAL;
- return (HTTP_ERROR);
+ return (HTTP_STATUS_ERROR);
}
/*
http->error = errno;
- return (HTTP_ERROR);
+ return (HTTP_STATUS_ERROR);
}
/*
/*
- * End of "$Id: getputfile.c 4984 2006-01-25 21:55:36Z mike $".
+ * End of "$Id$".
*/
projects / thirdparty / cups.git / blobdiff