diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-09-22 22:13:21 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-09-22 22:13:21 +0000 |
| commit | 7cf5915ead7c80b3011a37eaade214568d938f5b (patch) | |
| tree | 54222dc1e2b1c447232301c6441769d2364f08b6 /cups/http.h | |
| parent | 030ae6a14e49fda8ca30a2c0e065600c3984081a (diff) | |
| download | cups-7cf5915ead7c80b3011a37eaade214568d938f5b.tar.gz | |
Merge changes from CUPS 1.5svn-r9313.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2683 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http.h')
| -rw-r--r-- | cups/http.h | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/cups/http.h b/cups/http.h index 85a2c8b43..8dc79096c 100644 --- a/cups/http.h +++ b/cups/http.h @@ -1,10 +1,9 @@ /* * "$Id: http.h 7026 2007-10-19 00:57:45Z mike $" * - * Hyper-Text Transport Protocol definitions for the Common UNIX Printing - * System (CUPS). + * Hyper-Text Transport Protocol definitions for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -24,6 +23,7 @@ */ # include "versioning.h" +# include "array.h" # include <string.h> # include <time.h> # include <sys/types.h> @@ -250,11 +250,11 @@ typedef enum http_status_e /**** HTTP status codes ****/ HTTP_GATEWAY_TIMEOUT, /* Gateway connection timed out */ HTTP_NOT_SUPPORTED, /* HTTP version not supported */ - HTTP_AUTHORIZATION_CANCELED = 1000 /* User canceled authorization */ - + HTTP_AUTHORIZATION_CANCELED = 1000, /* User canceled authorization @since CUPS 1.4@ */ + HTTP_PKI_ERROR /* Error negotiating a secure connection @since CUPS 1.5@ */ } http_status_t; -typedef enum http_uri_status_e /**** URI separation status @since CUPS1.2@ ****/ +typedef enum http_uri_status_e /**** URI separation status @since CUPS 1.2@ ****/ { HTTP_URI_OVERFLOW = -8, /* URI buffer for httpAssembleURI is too small */ HTTP_URI_BAD_ARGUMENTS = -7, /* Bad arguments to function (error) */ @@ -317,6 +317,12 @@ typedef struct http_addrlist_s /**** Socket address list, which is typedef struct _http_s http_t; /**** HTTP connection type ****/ +typedef struct http_credential_s /**** Credential data @since CUPS 1.5@ ****/ +{ + void *data; /* Pointer to credential data */ + size_t datalen; /* Credential length */ +} http_credential_t; + /* * Prototypes... @@ -440,6 +446,17 @@ extern char *httpGetAuthString(http_t *http) _CUPS_API_1_3; extern void httpSetAuthString(http_t *http, const char *scheme, const char *data) _CUPS_API_1_3; +/**** New in CUPS 1.5 ****/ +extern int httpAddCredential(cups_array_t *credentials, + const void *data, size_t datalen) + _CUPS_API_1_5; +extern int httpCopyCredentials(http_t *http, + cups_array_t **credentials) + _CUPS_API_1_5; +extern void httpFreeCredentials(cups_array_t *certs) _CUPS_API_1_5; +extern int httpSetCredentials(http_t *http, cups_array_t *certs) + _CUPS_API_1_5; + /* * C++ magic... */ |