Merge changes from CUPS 1.5svn-r9062.

[thirdparty/cups.git] / cups / http-private.h

diff --git a/cups/http-private.h b/cups/http-private.h
index c933f45cf9ca00450d4c1e73801213568cd68f53..4a08eb9e3b7dcfb251b5ff4c75cc6c046a414205 100644 (file)
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: http-private.h 6933 2007-09-10 16:45:59Z mike $"
+ * "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $"
  *
- *   Private HTTP definitions for the Common UNIX Printing System (CUPS).
+ *   Private HTTP definitions for CUPS.
  *
- *   Copyright 2007 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
@@ -22,8 +22,9 @@
  * Include necessary headers...
  */
 
+#  include "config.h"
+#  include <stddef.h>
 #  include <stdlib.h>
-#  include <config.h>
 
 #  ifdef __sun
 #    include <sys/select.h>
@@ -74,8 +75,8 @@
 typedef int socklen_t;
 #  endif /* __sgi || (__APPLE__ && !_SOCKLEN_T) */
 
-#  include "http.h"
-#  include "md5.h"
+#  include <cups/http.h>
+#  include "md5-private.h"
 #  include "ipp-private.h"
 
 #  if defined HAVE_LIBSSL
@@ -258,15 +259,19 @@ extern void       _cups_freeifaddrs(struct ifaddrs *addrs);
 #  endif /* !WIN32 */
 
 /*
- * Common URI functions...
+ * Prototypes...
  */
 
+extern int             _httpAddrPort(http_addr_t *addr);
+extern http_t          *_httpCreate(const char *host, int port,
+                                    http_encryption_t encryption);
 extern char            *_httpEncodeURI(char *dst, const char *src,
                                        size_t dstsize);
 extern const char      *_httpResolveURI(const char *uri, char *resolved_uri,
-                                        size_t resolved_size);
+                                        size_t resolved_size, int log);
+extern int             _httpWait(http_t *http, int msec, int usessl);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id: http-private.h 6933 2007-09-10 16:45:59Z mike $".
+ * End of "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $".
  */