Import experimental work-in-progress HTTP/2 branch

HTTP2.txt

@@ -0,0 +1,44 @@
+HTTP/2.0 Implementation Notes - 2013-11-07
+------------------------------------------
+
+OVERVIEW
+
+    HTTP/2.0 allows clients to send multiple, simultaneous requests over a
+    single connection, as well as supporting server-side push delivery of
+    content.  In the context of IPP, this would allow a single connection to
+    support simultaneous job submission and monitoring.
+
+    This will require changes to the HTTP API used in CUPS, and to cupsd and
+    other CUPS-based servers.  This branch tracks that development.
+
+
+DESIGN
+
+    http_t will be updated to be accessible from multiple threads and track the
+    HTTP state in a thread ID to stream ID/state table.  Applications can
+    discover whether a Printer supports HTTP/2.0 with a new httpSupportsVersion
+    API and upgrade to HTTP/2.0 with httpUpgradeToVersion.
+
+    Calling httpPost in HTTP/1.1 mode will serialize requests between threads.
+    Calling httpPost in HTTP/2.0 mode will create a new stream ID and issue
+    requests in parallel.
+
+    Q: How to handle incoming 2.0 requests? New httpServerRunLoop with
+    callback that creates a new thread for all incoming requests and associates
+    the thread with the stream ID.  httpWriteResponse is then tied to the stream
+    ID.  For 1.1 mode the callback gets called on the current thread (no new
+    threads created).
+
+    Q: How to handle PUSH_PROMISE? New httpPushPromise API that creates a new
+    thread and stream ID?
+
+
+REFERENCES
+
+    HTTPbis WG web site: http://tools.ietf.org/wg/httpbis
+
+    Main spec: http://tools.ietf.org/html/draft-ietf-httpbis-http2
+
+    Header compression spec:
+        http://tools.ietf.org/html/draft-ietf-httpbis-header-compression
+

Makedefs.in

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makedefs.in 11984 2014-07-02 13:16:59Z msweet $"
 #
 # Common makefile definitions for CUPS.
 #
@@ -264,5 +264,5 @@ USBQUIRKS	=	@USBQUIRKS@
 
 
 #
-# End of "$Id$"
+# End of "$Id: Makedefs.in 11984 2014-07-02 13:16:59Z msweet $"
 #

Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 # Top-level Makefile for CUPS.
 #
@@ -351,5 +351,5 @@ dist:	all
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #

backend/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $"
 #
 #   Backend makefile for CUPS.
 #
@@ -315,5 +315,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $".
 #

backend/backend-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: backend-private.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Backend support definitions for CUPS.
  *
@@ -334,5 +334,5 @@ extern int		backendWaitLoop(int snmp_fd, http_addr_t *addr,
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: backend-private.h 11984 2014-07-02 13:16:59Z msweet $".
  */

backend/dnssd.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dnssd.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * DNS-SD discovery backend for CUPS.
  *
@@ -1318,5 +1318,5 @@ unquote(char       *dst,		/* I - Destination buffer */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dnssd.c 13138 2016-03-15 14:59:54Z msweet $".
  */

backend/ieee1284.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ieee1284.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * IEEE-1284 support functions for CUPS.
  *
@@ -476,5 +476,5 @@ backendGetMakeModel(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ieee1284.c 13138 2016-03-15 14:59:54Z msweet $".
  */

backend/lpd.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpd.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Line Printer Daemon backend for CUPS.
  *
@@ -1316,5 +1316,5 @@ sigterm_handler(int sig)		/* I - Signal */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpd.c 13138 2016-03-15 14:59:54Z msweet $".
  */

backend/network.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: network.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Common backend network APIs for CUPS.
  *
@@ -304,5 +304,5 @@ backendNetworkSideCB(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: network.c 13138 2016-03-15 14:59:54Z msweet $".
  */

backend/runloop.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: runloop.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Common run loop APIs for CUPS backends.
  *
@@ -528,5 +528,5 @@ backendWaitLoop(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: runloop.c 11984 2014-07-02 13:16:59Z msweet $".
  */

backend/snmp-supplies.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: snmp-supplies.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * SNMP supplies functions for CUPS.
  *
@@ -1099,5 +1099,5 @@ utf16_to_utf8(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: snmp-supplies.c 13138 2016-03-15 14:59:54Z msweet $".
  */

backend/snmp.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: snmp.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * SNMP discovery backend for CUPS.
  *
@@ -1364,5 +1364,5 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: snmp.c 11984 2014-07-02 13:16:59Z msweet $".
  */

backend/socket.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: socket.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * AppSocket backend for CUPS.
  *
@@ -517,5 +517,5 @@ wait_bc(int device_fd,			/* I - Socket */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: socket.c 11984 2014-07-02 13:16:59Z msweet $".
  */

backend/test1284.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: test1284.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   IEEE-1284 support functions test program for CUPS.
  *
@@ -80,5 +80,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: test1284.c 10996 2013-05-29 11:51:34Z msweet $".
  */

backend/testbackend.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testbackend.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Backend test program for CUPS.
  *
@@ -680,5 +680,5 @@ walk_cb(const char *oid,		/* I - OID */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testbackend.c 11984 2014-07-02 13:16:59Z msweet $".
  */

backend/testsupplies.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $"
  *
  *   SNMP supplies test program for CUPS.
  *
@@ -79,5 +79,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $".
  */

backend/usb-darwin.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: usb-darwin.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Copyright 2005-2015 Apple Inc. All rights reserved.
  *
@@ -2538,5 +2538,5 @@ log_usb_class_driver(int is_64bit)	/* I - Is the USB class driver 64-bit? */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb-darwin.c 13138 2016-03-15 14:59:54Z msweet $".
  */

backend/usb-libusb.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: usb-libusb.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * LIBUSB interface code for CUPS.
  *
@@ -2022,6 +2022,6 @@ soft_reset_printer(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb-libusb.c 13138 2016-03-15 14:59:54Z msweet $".
  */
 

backend/usb-unix.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: usb-unix.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * USB port backend for CUPS.
  *
@@ -603,5 +603,5 @@ side_cb(int         print_fd,		/* I - Print file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb-unix.c 13138 2016-03-15 14:59:54Z msweet $".
  */

backend/usb.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: usb.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   USB port backend for CUPS.
  *
@@ -260,5 +260,5 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb.c 10996 2013-05-29 11:51:34Z msweet $".
  */

berkeley/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
 #
 #   Berkeley commands makefile for CUPS.
 #
@@ -164,5 +164,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
 #

berkeley/lpc.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpc.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * "lpc" command for CUPS.
  *
@@ -438,5 +438,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpc.c 11984 2014-07-02 13:16:59Z msweet $".
  */

berkeley/lpq.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpq.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * "lpq" command for CUPS.
  *
@@ -641,5 +641,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpq.c 11984 2014-07-02 13:16:59Z msweet $".
  */

berkeley/lpr.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpr.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * "lpr" command for CUPS.
  *
@@ -432,5 +432,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpr.c 11984 2014-07-02 13:16:59Z msweet $".
  */

berkeley/lprm.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lprm.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   "lprm" command for CUPS.
  *
@@ -213,5 +213,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lprm.c 10996 2013-05-29 11:51:34Z msweet $".
  */

cgi-bin/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $"
 #
 # CGI makefile for CUPS.
 #
@@ -353,5 +353,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $".
 #

cgi-bin/admin.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: admin.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Administration CGI for CUPS.
  *
@@ -4277,5 +4277,5 @@ get_printer_ppd(const char *uri,	/* I - Printer URI */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: admin.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cgi-bin/cgi-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cgi-private.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Private CGI definitions for CUPS.
  *
@@ -32,5 +32,5 @@
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cgi-private.h 10996 2013-05-29 11:51:34Z msweet $".
  */

cgi-bin/cgi.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cgi.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   CGI support library definitions for CUPS.
  *
@@ -115,5 +115,5 @@ extern const char	*cgiText(const char *message);
 #endif /* !_CUPS_CGI_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: cgi.h 10996 2013-05-29 11:51:34Z msweet $".
  */

cgi-bin/classes.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: classes.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Class status CGI for CUPS.
  *
@@ -546,5 +546,5 @@ show_class(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: classes.c 11984 2014-07-02 13:16:59Z msweet $".
  */

cgi-bin/help-index.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: help-index.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Online help index routines for CUPS.
  *
@@ -1306,5 +1306,5 @@ help_sort_words(help_word_t *w1,	/* I - Second word */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: help-index.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cgi-bin/help-index.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: help-index.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Online help index definitions for CUPS.
  *
@@ -83,5 +83,5 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 #endif /* !_CUPS_HELP_INDEX_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: help-index.h 10996 2013-05-29 11:51:34Z msweet $".
  */

cgi-bin/help.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: help.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Online help CGI for CUPS.
  *
@@ -393,5 +393,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: help.c 10996 2013-05-29 11:51:34Z msweet $".
  */

cgi-bin/html.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   HTML support functions for CUPS.
  *
@@ -235,5 +235,5 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $".
  */

cgi-bin/ipp-var.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ipp-var.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * CGI <-> IPP variable routines for CUPS.
  *
@@ -1550,5 +1550,5 @@ cgiText(const char *message)		/* I - Message */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp-var.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cgi-bin/jobs.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: jobs.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Job status CGI for CUPS.
  *
@@ -204,5 +204,5 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: jobs.c 11984 2014-07-02 13:16:59Z msweet $".
  */

cgi-bin/makedocset.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $"
  *
  *   Xcode documentation set generator.
  *
@@ -482,5 +482,5 @@ write_nodes(const char   *path,		/* I - File to write */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $".
  */

cgi-bin/printers.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: printers.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Printer status CGI for CUPS.
  *
@@ -566,5 +566,5 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: printers.c 11984 2014-07-02 13:16:59Z msweet $".
  */

cgi-bin/search.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: search.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Search routines for CUPS.
  *
@@ -371,5 +371,5 @@ cgiFreeSearch(void *search)		/* I - Search context */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: search.c 11984 2014-07-02 13:16:59Z msweet $".
  */

cgi-bin/template.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: template.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * CGI template function.
  *
@@ -686,5 +686,5 @@ cgi_puturi(const char *s,		/* I - String to output */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: template.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cgi-bin/testcgi.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testcgi.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * CGI test program for CUPS.
  *
@@ -65,5 +65,5 @@ main(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testcgi.c 11984 2014-07-02 13:16:59Z msweet $".
  */

cgi-bin/testhi.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testhi.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Help index test program for CUPS.
  *
@@ -109,5 +109,5 @@ list_nodes(const char   *title,		/* I - Title string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testhi.c 10996 2013-05-29 11:51:34Z msweet $".
  */

cgi-bin/testtemplate.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testtemplate.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   CGI template test program for CUPS.
  *
@@ -99,5 +99,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testtemplate.c 10996 2013-05-29 11:51:34Z msweet $".
  */

cgi-bin/var.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: var.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * CGI form variable and array functions for CUPS.
  *
@@ -1297,5 +1297,5 @@ cgi_unlink_file(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: var.c 13138 2016-03-15 14:59:54Z msweet $".
  */

conf/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Configuration file makefile for CUPS.
 #
@@ -139,5 +139,5 @@ uninstall:
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #

conf/mime.convs.in

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
@@ -59,5 +59,5 @@ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 @DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
 
 #
-# End of "$Id$".
+# End of "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $".
 #

config-scripts/cups-common.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-common.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Common configuration stuff for CUPS.
 dnl
@@ -474,5 +474,5 @@ esac
 AC_SUBST(BUILDDIRS)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-common.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl

config-scripts/cups-compiler.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-compiler.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Compiler stuff for CUPS.
 dnl
@@ -246,5 +246,5 @@ case $uname in
 esac
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-compiler.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl

config-scripts/cups-defaults.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-defaults.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl   Default cupsd configuration settings for CUPS.
 dnl
@@ -409,5 +409,5 @@ AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-defaults.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl

config-scripts/cups-directories.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-directories.m4 11984 2014-07-02 13:16:59Z msweet $"
 dnl
 dnl Directory stuff for CUPS.
 dnl
@@ -305,5 +305,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-directories.m4 11984 2014-07-02 13:16:59Z msweet $".
 dnl

config-scripts/cups-dnssd.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-dnssd.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl   DNS Service Discovery (aka Bonjour) stuff for CUPS.
 dnl
@@ -82,5 +82,5 @@ AC_SUBST(IPPFIND_BIN)
 AC_SUBST(IPPFIND_MAN)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-dnssd.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl

config-scripts/cups-gssapi.m4

@@ -1,5 +1,5 @@
 dnl
-dnl   "$Id$"
+dnl   "$Id: cups-gssapi.m4 11984 2014-07-02 13:16:59Z msweet $"
 dnl
 dnl   GSSAPI/Kerberos library detection for CUPS.
 dnl
@@ -129,5 +129,5 @@ AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-gssapi.m4 11984 2014-07-02 13:16:59Z msweet $".
 dnl

config-scripts/cups-largefile.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-largefile.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Large file support stuff for CUPS.
 dnl
@@ -48,5 +48,5 @@ fi
 AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-largefile.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl

config-scripts/cups-libtool.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-libtool.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Libtool stuff for CUPS.
 dnl
@@ -35,5 +35,5 @@ if test x$LIBTOOL != x; then
 fi
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-libtool.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl

config-scripts/cups-manpages.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-manpages.m4 11342 2013-10-18 20:36:01Z msweet $"
 dnl
 dnl Manpage stuff for CUPS.
 dnl
@@ -78,5 +78,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-manpages.m4 11342 2013-10-18 20:36:01Z msweet $".
 dnl

config-scripts/cups-network.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-network.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Networking stuff for CUPS.
 dnl
@@ -72,5 +72,5 @@ AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
 AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-network.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl

config-scripts/cups-opsys.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-opsys.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Operating system stuff for CUPS.
 dnl
@@ -35,5 +35,5 @@ case "$uname" in
 esac
 
 dnl
-dnl "$Id$"
+dnl "$Id: cups-opsys.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl

config-scripts/cups-pam.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-pam.m4 11342 2013-10-18 20:36:01Z msweet $"
 dnl
 dnl   PAM stuff for CUPS.
 dnl
@@ -93,5 +93,5 @@ AC_SUBST(PAMMOD)
 AC_SUBST(PAMMODAUTH)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-pam.m4 11342 2013-10-18 20:36:01Z msweet $".
 dnl

config-scripts/cups-poll.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-poll.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Select/poll stuff for CUPS.
 dnl
@@ -18,5 +18,5 @@ AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL))
 AC_CHECK_FUNC(kqueue, AC_DEFINE(HAVE_KQUEUE))
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-poll.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl

config-scripts/cups-scripting.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-scripting.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Scripting configuration stuff for CUPS.
 dnl
@@ -85,5 +85,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-scripting.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl

config-scripts/cups-sharedlibs.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-sharedlibs.m4 11342 2013-10-18 20:36:01Z msweet $"
 dnl
 dnl Shared library support for CUPS.
 dnl
@@ -158,5 +158,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-sharedlibs.m4 11342 2013-10-18 20:36:01Z msweet $".
 dnl

config-scripts/cups-ssl.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-ssl.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl TLS stuff for CUPS.
 dnl
@@ -108,5 +108,5 @@ EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-ssl.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl

config-scripts/cups-startup.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-startup.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Launch-on-demand/startup stuff for CUPS.
 dnl
@@ -188,5 +188,5 @@ fi
 
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-startup.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl

config-scripts/cups-threads.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-threads.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Threading stuff for CUPS.
 dnl
@@ -50,5 +50,5 @@ fi
 AC_SUBST(PTHREAD_FLAGS)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-threads.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl

config.h.in

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: config.h.in 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Configuration file for CUPS.
  *
@@ -740,5 +740,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: config.h.in 13138 2016-03-15 14:59:54Z msweet $".
  */

configure.ac

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: configure.ac 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Configuration script for CUPS.
 dnl
@@ -95,5 +95,5 @@ AC_OUTPUT(Makedefs
 chmod +x cups-config
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: configure.ac 13138 2016-03-15 14:59:54Z msweet $".
 dnl

cups-config.in

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# "$Id$"
+# "$Id: cups-config.in 10996 2013-05-29 11:51:34Z msweet $"
 #
 #   CUPS configuration utility.
 #
@@ -142,5 +142,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id$".
+# End of "$Id: cups-config.in 10996 2013-05-29 11:51:34Z msweet $".
 #

cups/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 # API library Makefile for CUPS.
 #
@@ -52,6 +52,7 @@ LIBOBJS	=	\
 		http-addr.o \
 		http-addrlist.o \
 		http-support.o \
+		huffman.o \
 		ipp.o \
 		ipp-support.o \
 		langprintf.o \
@@ -91,6 +92,7 @@ TESTOBJS	= \
 		testdest.o \
 		testfile.o \
 		testhttp.o \
+		testhuffman.o \
 		testi18n.o \
 		testipp.o \
 		testoptions.o \
@@ -131,6 +133,7 @@ HEADERSPRIV =	\
 		debug-private.h \
 		file-private.h \
 		http-private.h \
+		huffman-private.h \
 		ipp-private.h \
 		language-private.h \
 		md5-private.h \
@@ -159,6 +162,7 @@ UNITTARGETS =	\
 		testdest \
 		testfile \
 		testhttp \
+		testhuffman \
 		testi18n \
 		testipp \
 		testlang \
@@ -463,6 +467,18 @@ testhttp:	testhttp.o $(LIBCUPSSTATIC)
 	./testhttp
 
 
+#
+# testhuffman (dependency on static CUPS library is intentional)
+#
+
+testhuffman:	testhuffman.o $(LIBCUPSSTATIC)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhuffman.o $(LIBCUPSSTATIC) \
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running HTTP/2 Huffman tests...
+	./testhuffman
+
+
 #
 # testipp (dependency on static CUPS library is intentional)
 #
@@ -679,5 +695,5 @@ tls.o: tls-darwin.c tls-gnutls.c tls-sspi.c
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #

cups/adminutil.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: adminutil.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Administration utility API definitions for CUPS.
  *
@@ -2370,5 +2370,5 @@ write_option(cups_file_t     *dstfp,	/* I - PPD file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: adminutil.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/adminutil.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: adminutil.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Administration utility API definitions for CUPS.
  *
@@ -77,5 +77,5 @@ extern int	cupsAdminSetServerSettings(http_t *http,
 #endif /* !_CUPS_ADMINUTIL_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: adminutil.h 10996 2013-05-29 11:51:34Z msweet $".
  */

cups/array-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: array-private.h 3933 2012-10-01 03:01:10Z msweet $"
  *
  *   Private array definitions for CUPS.
  *
@@ -48,5 +48,5 @@ extern cups_array_t	*_cupsArrayNewStrings(const char *s, char delim)
 #endif /* !_CUPS_ARRAY_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: array-private.h 3933 2012-10-01 03:01:10Z msweet $".
  */

cups/array.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: array.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Sorted array routines for CUPS.
  *
@@ -1330,5 +1330,5 @@ cups_array_find(cups_array_t *a,	/* I - Array */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: array.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/array.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: array.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Sorted array definitions for CUPS.
  *
@@ -88,5 +88,5 @@ extern void		*cupsArrayUserData(cups_array_t *a) _CUPS_API_1_2;
 #endif /* !_CUPS_ARRAY_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: array.h 10996 2013-05-29 11:51:34Z msweet $".
  */

cups/auth.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: auth.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Authentication functions for CUPS.
  *
@@ -876,5 +876,5 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: auth.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/backchannel.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: backchannel.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Backchannel functions for CUPS.
  *
@@ -189,5 +189,5 @@ cups_setup(fd_set         *set,		/* I - Set for select() */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: backchannel.c 11984 2014-07-02 13:16:59Z msweet $".
  */

cups/backend.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: backend.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Backend functions for CUPS.
  *
@@ -145,5 +145,5 @@ quote_string(const char *s)		/* I - String to write */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: backend.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/backend.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: backend.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Backend definitions for CUPS.
  *
@@ -74,5 +74,5 @@ extern void		cupsBackendReport(const char *device_scheme,
 #endif /* !_CUPS_BACKEND_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: backend.h 10996 2013-05-29 11:51:34Z msweet $".
  */

cups/cups-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cups-private.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  *   Private definitions for CUPS.
  *
@@ -274,5 +274,5 @@ extern char		*_cupsUserDefault(char *name, size_t namesize);
 #endif /* !_CUPS_CUPS_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: cups-private.h 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/cups.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cups.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * API definitions for CUPS.
  *
@@ -623,5 +623,5 @@ extern ssize_t		cupsHashData(const char *algorithm, const void *data, size_t dat
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: cups.h 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/debug-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: debug-private.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Private debugging macros for CUPS.
  *
@@ -113,5 +113,5 @@ extern int	_cups_gettimeofday(struct timeval *tv, void *tz);
 #endif /* !_CUPS_DEBUG_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: debug-private.h 10996 2013-05-29 11:51:34Z msweet $".
  */

cups/debug.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: debug.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Debugging functions for CUPS.
  *
@@ -645,5 +645,5 @@ _cups_safe_vsnprintf(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: debug.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/dest-localization.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dest-localization.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Destination localization support for CUPS.
  *
@@ -535,5 +535,5 @@ cups_scan_strings(char *buffer)		/* I - Start of string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dest-localization.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/dest-options.c

@@ -2267,5 +2267,5 @@ cups_update_ready(http_t       *http,	/* I - Connection to destination */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dest-options.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/dir.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dir.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Directory routines for CUPS.
  *
@@ -468,5 +468,5 @@ cupsDirRewind(cups_dir_t *dp)		/* I - Directory pointer */
 #endif /* WIN32 */
 
 /*
- * End of "$Id$".
+ * End of "$Id: dir.c 10996 2013-05-29 11:51:34Z msweet $".
  */

cups/dir.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dir.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Public directory definitions for CUPS.
  *
@@ -65,5 +65,5 @@ extern void		cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2;
 #endif /* !_CUPS_DIR_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: dir.h 10996 2013-05-29 11:51:34Z msweet $".
  */

cups/encode.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: encode.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Option encoding routines for CUPS.
  *
@@ -854,5 +854,5 @@ compare_ipp_options(_ipp_option_t *a,	/* I - First option */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: encode.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/file-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: file-private.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Private file definitions for CUPS.
  *
@@ -135,5 +135,5 @@ extern void			_cupsFileCheckFilter(void *context,
 #endif /* !_CUPS_FILE_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: file-private.h 11984 2014-07-02 13:16:59Z msweet $".
  */

cups/file.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: file.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * File functions for CUPS.
  *
@@ -2752,5 +2752,5 @@ cups_write(cups_file_t *fp,		/* I - CUPS file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: file.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/file.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: file.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Public file definitions for CUPS.
  *
@@ -114,5 +114,5 @@ extern ssize_t		cupsFileWrite(cups_file_t *fp, const char *buf,
 #endif /* !_CUPS_FILE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: file.h 11984 2014-07-02 13:16:59Z msweet $".
  */

cups/getdevices.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: getdevices.c 4216 2013-03-11 13:57:36Z msweet $"
  *
  *   cupsGetDevices implementation for CUPS.
  *
@@ -280,5 +280,5 @@ cupsGetDevices(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: getdevices.c 4216 2013-03-11 13:57:36Z msweet $".
  */

cups/getifaddrs.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: getifaddrs.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Network interface functions for CUPS.
  *
@@ -262,5 +262,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: getifaddrs.c 10996 2013-05-29 11:51:34Z msweet $".
  */

cups/getputfile.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: getputfile.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Get/put file functions for CUPS.
  *
@@ -511,5 +511,5 @@ cupsPutFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: getputfile.c 11984 2014-07-02 13:16:59Z msweet $".
  */

cups/globals.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: globals.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Global variable access routines for CUPS.
  *
@@ -382,5 +382,5 @@ cups_globals_init(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: globals.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/hash.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: hash.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Hashing function for CUPS.
  *
@@ -248,5 +248,5 @@ cupsHashData(const char    *algorithm,	/* I - Algorithm name */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: hash.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/http-addr.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http-addr.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * HTTP address routines for CUPS.
  *
@@ -924,5 +924,5 @@ httpResolveHostname(http_t *http,	/* I - HTTP connection */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: http-addr.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/http-addrlist.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http-addrlist.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * HTTP address list routines for CUPS.
  *
@@ -892,5 +892,5 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: http-addrlist.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/http-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http-private.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Private HTTP definitions for CUPS.
  *
@@ -442,5 +442,5 @@ extern int		_httpWait(http_t *http, int msec, int usessl);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: http-private.h 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/http.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * HTTP routines for CUPS.
  *
@@ -4849,5 +4849,5 @@ http_write_chunk(http_t     *http,	/* I - HTTP connection */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: http.c 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/http.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Hyper-Text Transport Protocol definitions for CUPS.
  *
@@ -656,5 +656,5 @@ extern const char	*httpURIStatusString(http_uri_status_t status) _CUPS_API_2_0;
 #endif /* !_CUPS_HTTP_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: http.h 13138 2016-03-15 14:59:54Z msweet $".
  */

cups/huffman-private.h

@@ -0,0 +1,56 @@
+/*
+ * "$Id: huffman-private.h 11985 2014-07-02 15:41:16Z msweet $"
+ *
+ * HTTP/2 Huffman compression/decompression definitions for CUPS.
+ *
+ * Copyright 2014 by Apple Inc.
+ *
+ * These coded instructions, statements, and computer programs are the
+ * 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.
+ */
+
+#ifndef _CUPS_HUFFMAN_PRIVATE_H_
+#  define _CUPS_HUFFMAN_PRIVATE_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include "versioning.h"
+#  include <stdlib.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * Functions...
+ */
+
+extern size_t	_http2HuffmanDecode(char *dst, size_t dstsize, const unsigned char *src, size_t srclen);
+extern size_t	_http2HuffmanEncode(unsigned char *dst, size_t dstsize, const char *src);
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+#endif /* !_CUPS_HUFFMAN_PRIVATE_H_ */
+
+/*
+ * End of "$Id: huffman-private.h 11985 2014-07-02 15:41:16Z msweet $".
+ */