]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - scheduler/client.c
Load cups into easysw/current.
[thirdparty/cups.git] / scheduler / client.c
index b35ed9ba9c3599a0ad7e88b20b557d3426921219..9c0a17dc68191759b1e521f654192352769283b9 100644 (file)
@@ -1,9 +1,12 @@
 /*
- * "$Id: client.c 5083 2006-02-06 02:57:43Z mike $"
+ * "$Id: client.c 6329 2007-03-12 14:48:28Z mike $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *
+ *   This file contains Kerberos support code, copyright 2006 by
+ *   Jelmer Vernooij.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
  *   cupsdAcceptClient()     - Accept a new client.
  *   cupsdCloseAllClients()  - Close all remote clients immediately.
  *   cupsdCloseClient()      - Close a remote client.
- *   cupsdEncryptClient()    - Enable encryption for the client...
- *   cupsdIsCGI()            - Is the resource a CGI script/program?
+ *   cupsdFlushHeader()      - Flush the header fields to the client.
  *   cupsdReadClient()       - Read data from a client.
  *   cupsdSendCommand()      - Send output from a command via HTTP.
  *   cupsdSendError()        - Send an error message via HTTP.
- *   cupsdSendFile()         - Send a file via HTTP.
  *   cupsdSendHeader()       - Send an HTTP request.
  *   cupsdUpdateCGI()        - Read status messages from CGI scripts and programs.
  *   cupsdWriteClient()      - Write data to a client as needed.
+ *   cupsdWritePipe()        - Flag that data is available on the CGI pipe.
  *   check_if_modified()     - Decode an "If-Modified-Since" line.
- *   get_cdsa_server_certs() - Convert a keychain name into the CFArrayRef
+ *   encrypt_client()        - Enable encryption for the client...
+ *   get_cdsa_certificate()  - Convert a keychain name into the CFArrayRef
  *                            required by SSLSetCertificate.
  *   get_file()              - Get a filename and state info.
  *   install_conf_file()     - Install a configuration file.
+ *   is_cgi()                - Is the resource a CGI script/program?
  *   is_path_absolute()      - Is a path absolute and free of relative elements.
+ *   make_certificate()      - Make a self-signed SSL/TLS certificate.
  *   pipe_command()          - Pipe the output of a command to the remote client.
+ *   write_file()            - Send a file via HTTP.
  */
 
 /*
 
 #ifdef HAVE_CDSASSL
 #  include <Security/Security.h>
+#  ifdef HAVE_SECIDENTITYSEARCHPRIV_H
+#    include <Security/SecIdentitySearchPriv.h>
+#  else /* Declare prototype for function in that header... */
+extern OSStatus SecIdentitySearchCreateWithPolicy(SecPolicyRef policy, 
+                               CFStringRef idString, CSSM_KEYUSE keyUsage, 
+                               CFTypeRef keychainOrArray, 
+                               Boolean returnOnlyValidIdentities, 
+                               SecIdentitySearchRef* searchRef);
+#  endif /* HAVE_SECIDENTITYSEARCHPRIV_H */
+#  ifdef HAVE_SECPOLICYPRIV_H
+#    include <Security/SecPolicyPriv.h>
+#  else /* Declare prototype for function in that header... */
+extern OSStatus SecPolicySetValue(SecPolicyRef policyRef, 
+                                  const CSSM_DATA *value);
+#  endif /* HAVE_SECPOLICYPRIV_H */
+#  ifdef HAVE_SECBASEPRIV_H
+#    include <Security/SecBasePriv.h>
+#  else /* Declare prototype for function in that header... */
+extern const char *cssmErrorString(int error);
+#  endif /* HAVE_SECBASEPRIV_H */
 #endif /* HAVE_CDSASSL */
 
+#ifdef HAVE_GNUTLS
+#  include <gnutls/x509.h>
+#endif /* HAVE_GNUTLS */
+
 
 /*
  * Local functions...
 
 static int             check_if_modified(cupsd_client_t *con,
                                          struct stat *filestats);
+#ifdef HAVE_SSL
+static int             encrypt_client(cupsd_client_t *con);
+#endif /* HAVE_SSL */
 #ifdef HAVE_CDSASSL
-static CFArrayRef      get_cdsa_server_certs(void);
+static CFArrayRef      get_cdsa_certificate(cupsd_client_t *con);
 #endif /* HAVE_CDSASSL */
-static char            *get_file(cupsd_client_t *con, struct stat *filestats, 
+static char            *get_file(cupsd_client_t *con, struct stat *filestats,
                                  char *filename, int len);
 static http_status_t   install_conf_file(cupsd_client_t *con);
+static int             is_cgi(cupsd_client_t *con, const char *filename,
+                              struct stat *filestats, mime_type_t *type);
 static int             is_path_absolute(const char *path);
+#ifdef HAVE_SSL
+static int             make_certificate(cupsd_client_t *con);
+#endif /* HAVE_SSL */
 static int             pipe_command(cupsd_client_t *con, int infile, int *outfile,
                                     char *command, char *options, int root);
+static int             write_file(cupsd_client_t *con, http_status_t code,
+                                  char *filename, char *type,
+                                  struct stat *filestats);
 
 
 /*
@@ -368,7 +409,7 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */
   */
 
   val = 1;
-  setsockopt(con->http.fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)); 
+  setsockopt(con->http.fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
 
  /*
   * Close this file on all execs...
@@ -380,10 +421,7 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */
   * Add the socket to the select() input mask.
   */
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdAcceptClient: Adding fd %d to InputSet...",
-                  con->http.fd);
-  FD_SET(con->http.fd, InputSet);
+  cupsdAddSelect(con->http.fd, (cupsd_selfunc_t)cupsdReadClient, NULL, con);
 
  /*
   * Temporarily suspend accept()'s until we lose a client...
@@ -405,7 +443,8 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */
 
     con->http.encryption = HTTP_ENCRYPT_ALWAYS;
 
-    cupsdEncryptClient(con);
+    if (!encrypt_client(con))
+      cupsdCloseClient(con);
   }
   else
     con->auto_ssl = 1;
@@ -443,10 +482,12 @@ cupsdCloseClient(cupsd_client_t *con)     /* I - Client to close */
   SSL          *conn;                  /* Connection for encryption */
   unsigned long        error;                  /* Error code */
 #elif defined(HAVE_GNUTLS)
-  http_tls_t     *conn;                        /* TLS connection information */
-  int            error;                        /* Error code */
+  http_tls_t   *conn;                  /* TLS connection information */
+  int          error;                  /* Error code */
   gnutls_certificate_server_credentials *credentials;
                                        /* TLS credentials */
+#  elif defined(HAVE_CDSASSL)
+  http_tls_t   *conn;                  /* CDSA connection information */
 #endif /* HAVE_LIBSSL */
 
 
@@ -515,8 +556,17 @@ cupsdCloseClient(cupsd_client_t *con)      /* I - Client to close */
     free(conn);
 
 #  elif defined(HAVE_CDSASSL)
-    SSLClose((SSLContextRef)con->http.tls);
-    SSLDisposeContext((SSLContextRef)con->http.tls);
+    conn = (http_tls_t *)(con->http.tls);
+
+    while (SSLClose(conn->session) == errSSLWouldBlock)
+      usleep(1000);
+
+    SSLDisposeContext(conn->session);
+
+    if (conn->certsArray)
+      CFRelease(conn->certsArray);
+
+    free(conn);
 #  endif /* HAVE_LIBSSL */
 
     con->http.tls = NULL;
@@ -538,13 +588,7 @@ cupsdCloseClient(cupsd_client_t *con)      /* I - Client to close */
 
   if (con->file >= 0)
   {
-    if (FD_ISSET(con->file, InputSet))
-    {
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdCloseClient: %d Removing fd %d from InputSet...",
-                     con->http.fd, con->file);
-      FD_CLR(con->file, InputSet);
-    }
+    cupsdRemoveSelect(con->file);
 
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
                     "cupsdCloseClient: %d Closing data file %d.",
@@ -566,11 +610,8 @@ cupsdCloseClient(cupsd_client_t *con)      /* I - Client to close */
       * Only do a partial close so that the encrypted client gets everything.
       */
 
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdCloseClient: Removing fd %d from OutputSet...",
-                     con->http.fd);
       shutdown(con->http.fd, 0);
-      FD_CLR(con->http.fd, OutputSet);
+      cupsdAddSelect(con->http.fd, (cupsd_selfunc_t)cupsdReadClient, NULL, con);
     }
     else
     {
@@ -578,12 +619,8 @@ cupsdCloseClient(cupsd_client_t *con)      /* I - Client to close */
       * Shut the socket down fully...
       */
 
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdCloseClient: Removing fd %d from InputSet and OutputSet...",
-                     con->http.fd);
+      cupsdRemoveSelect(con->http.fd);
       close(con->http.fd);
-      FD_CLR(con->http.fd, InputSet);
-      FD_CLR(con->http.fd, OutputSet);
       con->http.fd = -1;
     }
   }
@@ -602,6 +639,7 @@ cupsdCloseClient(cupsd_client_t *con)       /* I - Client to close */
     cupsdClearString(&con->filename);
     cupsdClearString(&con->command);
     cupsdClearString(&con->options);
+    cupsdClearString(&con->query_string);
 
     if (con->request)
     {
@@ -621,6 +659,14 @@ cupsdCloseClient(cupsd_client_t *con)      /* I - Client to close */
       con->language = NULL;
     }
 
+#ifdef HAVE_AUTHORIZATION_H
+    if (con->authref)
+    {
+      AuthorizationFree(con->authref, kAuthorizationFlagDefaults);
+      con->authref = NULL;
+    }
+#endif /* HAVE_AUTHORIZATION_H */
+
    /*
     * Re-enable new client connections if we are going back under the
     * limit...
@@ -643,2562 +689,3471 @@ cupsdCloseClient(cupsd_client_t *con) /* I - Client to close */
 
 
 /*
- * 'cupsdEncryptClient()' - Enable encryption for the client...
+ * 'cupsdFlushHeader()' - Flush the header fields to the client.
  */
 
-int                                    /* O - 1 on success, 0 on error */
-cupsdEncryptClient(cupsd_client_t *con)        /* I - Client to encrypt */
+int                                    /* I - Bytes written or -1 on error */
+cupsdFlushHeader(cupsd_client_t *con)  /* I - Client to flush to */
 {
-#ifdef HAVE_LIBSSL
-  SSL_CTX      *context;               /* Context for encryption */
-  SSL          *conn;                  /* Connection for encryption */
-  unsigned long        error;                  /* Error code */
+  int bytes = httpFlushWrite(HTTP(con));
 
+  con->http.data_encoding = HTTP_ENCODE_LENGTH;
 
- /*
-  * Create the SSL context and accept the connection...
-  */
+  return (bytes);
+}
 
-  context = SSL_CTX_new(SSLv23_server_method());
 
-  SSL_CTX_set_options(context, SSL_OP_NO_SSLv2); /* Only use SSLv3 or TLS */
-  SSL_CTX_use_PrivateKey_file(context, ServerKey, SSL_FILETYPE_PEM);
-  SSL_CTX_use_certificate_file(context, ServerCertificate, SSL_FILETYPE_PEM);
+/*
+ * 'cupsdReadClient()' - Read data from a client.
+ */
 
-  conn = SSL_new(context);
+void
+cupsdReadClient(cupsd_client_t *con)   /* I - Client to read from */
+{
+  char                 line[32768],    /* Line from client... */
+                       operation[64],  /* Operation code from socket */
+                       version[64],    /* HTTP version number string */
+                       locale[64],     /* Locale */
+                       *ptr;           /* Pointer into strings */
+  int                  major, minor;   /* HTTP version numbers */
+  http_status_t                status;         /* Transfer status */
+  ipp_state_t          ipp_state;      /* State of IPP transfer */
+  int                  bytes;          /* Number of bytes to POST */
+  char                 *filename;      /* Name of file for GET/HEAD */
+  char                 buf[1024];      /* Buffer for real filename */
+  struct stat          filestats;      /* File information */
+  mime_type_t          *type;          /* MIME type of file */
+  cupsd_printer_t      *p;             /* Printer */
+  static unsigned      request_id = 0; /* Request ID for temp files */
 
-  SSL_set_fd(conn, con->http.fd);
-  if (SSL_accept(conn) != 1)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdEncryptClient: Unable to encrypt connection from %s!",
-                    con->http.hostname);
 
-    while ((error = ERR_get_error()) != 0)
-      cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdEncryptClient: %s",
-                      ERR_error_string(error, NULL));
+  status = HTTP_CONTINUE;
 
-    SSL_CTX_free(context);
-    SSL_free(conn);
-    return (0);
-  }
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "cupsdReadClient: %d, used=%d, file=%d state=%d",
+                  con->http.fd, con->http.used, con->file, con->http.state);
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG,
-                  "cupsdEncryptClient: %d Connection from %s now encrypted.",
-                  con->http.fd, con->http.hostname);
+  if (con->http.error)
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: http error seen...");
+    cupsdCloseClient(con);
+    return;
+  }
 
-  con->http.tls = conn;
-  return (1);
-  
-#elif defined(HAVE_GNUTLS)
-  http_tls_t   *conn;                  /* TLS session object */
-  int          error;                  /* Error code */
-  gnutls_certificate_server_credentials *credentials;
-                                       /* TLS credentials */
+#ifdef HAVE_SSL
+  if (con->auto_ssl)
+  {
+   /*
+    * Automatically check for a SSL/TLS handshake...
+    */
 
- /*
-  * Create the SSL object and perform the SSL handshake...
-  */
+    con->auto_ssl = 0;
 
-  conn = (http_tls_t *)malloc(sizeof(gnutls_session));
+    if (recv(con->http.fd, buf, 1, MSG_PEEK) == 1 &&
+        (!buf[0] || !strchr("DGHOPT", buf[0])))
+    {
+     /*
+      * Encrypt this connection...
+      */
 
-  if (conn == NULL)
-    return (0);
+      cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                      "cupsdReadClient: Saw first byte %02X, auto-negotiating SSL/TLS session...",
+                      buf[0] & 255);
 
-  credentials = (gnutls_certificate_server_credentials *)
-                    malloc(sizeof(gnutls_certificate_server_credentials));
-  if (credentials == NULL)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdEncryptClient: Unable to encrypt connection from %s!",
-                    con->http.hostname);
-    cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdEncryptClient: %s", strerror(errno));
+      if (!encrypt_client(con))
+        cupsdCloseClient(con);
 
-    free(conn);
-    return (0);
+      return;
+    }
   }
+#endif /* HAVE_SSL */
 
-  gnutls_certificate_allocate_credentials(credentials);
-  gnutls_certificate_set_x509_key_file(*credentials, ServerCertificate, 
-                                      ServerKey, GNUTLS_X509_FMT_PEM);
+  switch (con->http.state)
+  {
+    case HTTP_WAITING :
+       /*
+        * See if we've received a request line...
+       */
 
-  gnutls_init(&(conn->session), GNUTLS_SERVER);
-  gnutls_set_default_priority(conn->session);
-  gnutls_credentials_set(conn->session, GNUTLS_CRD_CERTIFICATE, *credentials);
-  gnutls_transport_set_ptr(conn->session, con->http.fd);
+        if (httpGets(line, sizeof(line) - 1, HTTP(con)) == NULL)
+       {
+         cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                         "cupsdReadClient: httpGets returned EOF...");
+         cupsdCloseClient(con);
+         return;
+       }
 
-  error = gnutls_handshake(conn->session);
+       /*
+        * Ignore blank request lines...
+       */
 
-  if (error != GNUTLS_E_SUCCESS)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdEncryptClient: Unable to encrypt connection from %s!",
-                    con->http.hostname);
-    cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdEncryptClient: %s",
-                    gnutls_strerror(error));
+        if (line[0] == '\0')
+         break;
 
-    gnutls_deinit(conn->session);
-    gnutls_certificate_free_credentials(*credentials);
-    free(conn);
-    free(credentials);
-    return (0);
-  }
+       /*
+        * Clear other state variables...
+       */
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG,
-                  "cupsdEncryptClient: %d Connection from %s now encrypted.",
-                  con->http.fd, con->http.hostname);
+        httpClearFields(HTTP(con));
 
-  conn->credentials = credentials;
-  con->http.tls = conn;
-  return (1);
+        con->http.activity        = time(NULL);
+        con->http.version         = HTTP_1_0;
+       con->http.keep_alive      = HTTP_KEEPALIVE_OFF;
+       con->http.data_encoding   = HTTP_ENCODE_LENGTH;
+       con->http.data_remaining  = 0;
+       con->http._data_remaining = 0;
+       con->operation            = HTTP_WAITING;
+       con->bytes                = 0;
+       con->file                 = -1;
+       con->file_ready           = 0;
+       con->pipe_pid             = 0;
+       con->username[0]          = '\0';
+       con->password[0]          = '\0';
+       con->uri[0]               = '\0';
 
-#elif defined(HAVE_CDSASSL)
-  OSStatus     error;                  /* Error info */
-  SSLContextRef        conn;                   /* New connection */
-  int          allowExpired;           /* Allow expired certificates? */
-  int          allowAnyRoot;           /* Allow any root certificate? */
+       cupsdClearString(&con->command);
+       cupsdClearString(&con->options);
+       cupsdClearString(&con->query_string);
 
+       if (con->request)
+       {
+         ippDelete(con->request);
+         con->request = NULL;
+       }
 
-  conn         = NULL;
-  error        = SSLNewContext(true, &conn);
-  allowExpired = 1;
-  allowAnyRoot = 1;
+       if (con->response)
+       {
+         ippDelete(con->response);
+         con->response = NULL;
+       }
 
-  if (!ServerCertificatesArray)
-    ServerCertificatesArray = get_cdsa_server_certs();
+       if (con->language)
+       {
+         cupsLangFree(con->language);
+         con->language = NULL;
+       }
 
-  if (!ServerCertificatesArray)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                   "EncryptClient: Could not find signing key in keychain "
-                   "\"%s\"", ServerCertificate);
-    error = errSSLBadCert; /* errSSLBadConfiguration is a better choice, but not available on 10.2.x */
-  }
+       /*
+        * Grab the request line...
+       */
 
-  if (!error)
-    error = SSLSetIOFuncs(conn, _httpReadCDSA, _httpWriteCDSA);
+        switch (sscanf(line, "%63s%1023s%63s", operation, con->uri, version))
+       {
+         case 1 :
+             cupsdLogMessage(CUPSD_LOG_ERROR,
+                             "Bad request line \"%s\" from %s!", line,
+                             con->http.hostname);
+             cupsdSendError(con, HTTP_BAD_REQUEST);
+             cupsdCloseClient(con);
+             return;
+         case 2 :
+             con->http.version = HTTP_0_9;
+             break;
+         case 3 :
+             if (sscanf(version, "HTTP/%d.%d", &major, &minor) != 2)
+             {
+               cupsdLogMessage(CUPSD_LOG_ERROR,
+                               "Bad request line \"%s\" from %s!", line,
+                               con->http.hostname);
+               cupsdSendError(con, HTTP_BAD_REQUEST);
+               cupsdCloseClient(con);
+               return;
+             }
 
-  if (!error)
-    error = SSLSetProtocolVersion(conn, kSSLProtocol3);
+             if (major < 2)
+             {
+               con->http.version = (http_version_t)(major * 100 + minor);
+               if (con->http.version == HTTP_1_1 && KeepAlive)
+                 con->http.keep_alive = HTTP_KEEPALIVE_ON;
+               else
+                 con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+             }
+             else
+             {
+               cupsdSendError(con, HTTP_NOT_SUPPORTED);
+               cupsdCloseClient(con);
+               return;
+             }
+             break;
+       }
 
-  if (!error)
-    error = SSLSetConnection(conn, (SSLConnectionRef)con->http.fd);
+       /*
+        * Handle full URLs in the request line...
+       */
 
-  if (!error)
-    error = SSLSetPeerDomainName(conn, ServerName, strlen(ServerName) + 1);
+        if (strcmp(con->uri, "*"))
+       {
+         char  method[HTTP_MAX_URI],   /* Method/scheme */
+               userpass[HTTP_MAX_URI], /* Username:password */
+               hostname[HTTP_MAX_URI], /* Hostname */
+               resource[HTTP_MAX_URI]; /* Resource path */
+          int  port;                   /* Port number */
 
-  /* have to do these options before setting server certs */
-  if (!error && allowExpired)
-    error = SSLSetAllowsExpiredCerts(conn, true);
 
-  if (!error && allowAnyRoot)
-    error = SSLSetAllowsAnyRoot(conn, true);
+         /*
+         * Separate the URI into its components...
+         */
 
-  if (!error && ServerCertificatesArray)
-  {
-    error = SSLSetCertificate(conn, ServerCertificatesArray);
+          httpSeparateURI(HTTP_URI_CODING_MOST, con->uri,
+                         method, sizeof(method),
+                         userpass, sizeof(userpass),
+                         hostname, sizeof(hostname), &port,
+                         resource, sizeof(resource));
 
-   /*
-    * Perform SSL/TLS handshake
-    */
-  
-    if (!error)
-    {
-      do
-      {
-       error = SSLHandshake(conn);
-      }
-      while (error == errSSLWouldBlock);
-    }
-  }
-
-  if (error)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdEncryptClient: Unable to encrypt connection from %s!",
-                    con->http.hostname);
-
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdEncryptClient: CDSA error code is %d", (int)error);
+         /*
+         * Only allow URIs with the servername, localhost, or an IP
+         * address...
+         */
 
-    con->http.error  = error;
-    con->http.status = HTTP_ERROR;
+         if (strcmp(method, "file") &&
+             strcasecmp(hostname, ServerName) &&
+             strcasecmp(hostname, "localhost") &&
+             !isdigit(hostname[0]))
+         {
+          /*
+           * Nope, we don't do proxies...
+           */
 
-    if (conn != NULL)
-      SSLDisposeContext(conn);
+           cupsdLogMessage(CUPSD_LOG_ERROR, "Bad URI \"%s\" in request!",
+                           con->uri);
+           cupsdSendError(con, HTTP_METHOD_NOT_ALLOWED);
+           cupsdCloseClient(con);
+           return;
+         }
 
-    return (0);
-  }
+         /*
+         * Copy the resource portion back into the URI; both resource and
+         * con->uri are HTTP_MAX_URI bytes in size...
+         */
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG,
-                  "cupsdEncryptClient: %d Connection from %s now encrypted.",
-                  con->http.fd, con->http.hostname);
+          strcpy(con->uri, resource);
+       }
 
-  con->http.tls = conn;
-  return (1);
+       /*
+        * Process the request...
+       */
 
-#else
-  return (0);
-#endif /* HAVE_LIBSSL */
-}
+        if (!strcmp(operation, "GET"))
+         con->http.state = HTTP_GET;
+        else if (!strcmp(operation, "PUT"))
+         con->http.state = HTTP_PUT;
+        else if (!strcmp(operation, "POST"))
+         con->http.state = HTTP_POST;
+        else if (!strcmp(operation, "DELETE"))
+         con->http.state = HTTP_DELETE;
+        else if (!strcmp(operation, "TRACE"))
+         con->http.state = HTTP_TRACE;
+        else if (!strcmp(operation, "OPTIONS"))
+         con->http.state = HTTP_OPTIONS;
+        else if (!strcmp(operation, "HEAD"))
+         con->http.state = HTTP_HEAD;
+       else
+       {
+         cupsdLogMessage(CUPSD_LOG_ERROR, "Bad operation \"%s\"!", operation);
+         cupsdSendError(con, HTTP_BAD_REQUEST);
+         cupsdCloseClient(con);
+         return;
+       }
 
+        con->start     = time(NULL);
+        con->operation = con->http.state;
 
-/*
- * 'cupsdIsCGI()' - Is the resource a CGI script/program?
- */
+        cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdReadClient: %d %s %s HTTP/%d.%d",
+                       con->http.fd, operation, con->uri,
+                       con->http.version / 100, con->http.version % 100);
 
-int                                    /* O - 1 = CGI, 0 = file */
-cupsdIsCGI(cupsd_client_t *con,                /* I - Client connection */
-          const char     *filename,    /* I - Real filename */
-          struct stat    *filestats,   /* I - File information */
-          mime_type_t    *type)        /* I - MIME type */
-{
-  const char   *options;               /* Options on URL */
+       con->http.status = HTTP_OK;
 
+    case HTTP_OPTIONS :
+    case HTTP_DELETE :
+    case HTTP_GET :
+    case HTTP_HEAD :
+    case HTTP_POST :
+    case HTTP_PUT :
+    case HTTP_TRACE :
+       /*
+        * Parse incoming parameters until the status changes...
+       */
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdIsCGI(con=%p, filename=\"%s\", filestats=%p, type=%s/%s)\n",
-                 con, filename, filestats, type ? type->super : "unknown",
-                 type ? type->type : "unknown");
+        while ((status = httpUpdate(HTTP(con))) == HTTP_CONTINUE)
+         if (con->http.used == 0 ||
+             !memchr(con->http.buffer, '\n', con->http.used))
+           break;
 
- /*
-  * Get the options, if any...
-  */
+       if (status != HTTP_OK && status != HTTP_CONTINUE)
+       {
+         cupsdSendError(con, HTTP_BAD_REQUEST);
+         cupsdCloseClient(con);
+         return;
+       }
+       break;
 
-  if ((options = strchr(con->uri, '?')) != NULL)
-    options ++;
+    default :
+        break; /* Anti-compiler-warning-code */
+  }
 
  /*
-  * Check for known types...
+  * Handle new transfers...
   */
 
-  if (!type || strcasecmp(type->super, "application"))
-  {
-    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsCGI: Returning 0...");
-    return (0);
-  }
-
-  if (!strcasecmp(type->type, "x-httpd-cgi") &&
-      (filestats->st_mode & 0111))
+  if (status == HTTP_OK)
   {
-   /*
-    * "application/x-httpd-cgi" is a CGI script.
-    */
+    if (con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE][0])
+    {
+     /*
+      * Figure out the locale from the Accept-Language and Content-Type
+      * fields...
+      */
 
-    cupsdSetString(&con->command, filename);
+      if ((ptr = strchr(con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], ',')) != NULL)
+        *ptr = '\0';
 
-    filename = strrchr(filename, '/') + 1; /* Filename always absolute */
+      if ((ptr = strchr(con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], ';')) != NULL)
+        *ptr = '\0';
 
-    if (options)
-      cupsdSetStringf(&con->options, "%s %s", filename, options);
-    else
-      cupsdSetStringf(&con->options, "%s", filename);
+      if ((ptr = strstr(con->http.fields[HTTP_FIELD_CONTENT_TYPE], "charset=")) != NULL)
+      {
+       /*
+        * Combine language and charset, and trim any extra params in the
+       * content-type.
+       */
 
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdIsCGI: Returning 1 with command=\"%s\" and options=\"%s\"",
-                    con->command, con->options);
+        snprintf(locale, sizeof(locale), "%s.%s",
+                con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], ptr + 8);
 
-    return (1);
-  }
-#ifdef HAVE_JAVA
-  else if (!strcasecmp(type->type, "x-httpd-java"))
-  {
-   /*
-    * "application/x-httpd-java" is a Java servlet.
-    */
+       if ((ptr = strchr(locale, ',')) != NULL)
+         *ptr = '\0';
+      }
+      else
+        snprintf(locale, sizeof(locale), "%s.%s",
+                con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], DefaultCharset);
 
-    cupsdSetString(&con->command, CUPS_JAVA);
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                      "cupsdReadClient: %d Browser asked for language \"%s\"...",
+                      con->http.fd, locale);
 
-    if (options)
-      cupsdSetStringf(&con->options, "java %s %s", filename, options);
+      con->language = cupsLangGet(locale);
+    }
     else
-      cupsdSetStringf(&con->options, "java %s", filename);
-
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdIsCGI: Returning 1 with command=\"%s\" and options=\"%s\"",
-                    con->command, con->options);
+      con->language = cupsLangGet(DefaultLocale);
 
-    return (1);
-  }
-#endif /* HAVE_JAVA */
-#ifdef HAVE_PERL
-  else if (!strcasecmp(type->type, "x-httpd-perl"))
-  {
-   /*
-    * "application/x-httpd-perl" is a Perl page.
-    */
+    cupsdAuthorize(con);
 
-    cupsdSetString(&con->command, CUPS_PERL);
+    if (!strncmp(con->http.fields[HTTP_FIELD_CONNECTION], "Keep-Alive", 10) &&
+        KeepAlive)
+      con->http.keep_alive = HTTP_KEEPALIVE_ON;
 
-    if (options)
-      cupsdSetStringf(&con->options, "perl %s %s", filename, options);
-    else
-      cupsdSetStringf(&con->options, "perl %s", filename);
+    if (!con->http.fields[HTTP_FIELD_HOST][0] &&
+        con->http.version >= HTTP_1_1)
+    {
+     /*
+      * HTTP/1.1 and higher require the "Host:" field...
+      */
 
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdIsCGI: Returning 1 with command=\"%s\" and options=\"%s\"",
-                    con->command, con->options);
+      if (!cupsdSendError(con, HTTP_BAD_REQUEST))
+      {
+       cupsdCloseClient(con);
+       return;
+      }
+    }
+    else if (con->operation == HTTP_OPTIONS)
+    {
+     /*
+      * Do OPTIONS command...
+      */
 
-    return (1);
-  }
-#endif /* HAVE_PERL */
-#ifdef HAVE_PHP
-  else if (!strcasecmp(type->type, "x-httpd-php"))
-  {
-   /*
-    * "application/x-httpd-php" is a PHP page.
-    */
+      if (con->best && con->best->type != AUTH_NONE)
+      {
+       if (!cupsdSendHeader(con, HTTP_UNAUTHORIZED, NULL))
+       {
+         cupsdCloseClient(con);
+         return;
+       }
+      }
 
-    cupsdSetString(&con->command, CUPS_PHP);
+      if (!strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Upgrade") &&
+         con->http.tls == NULL)
+      {
+#ifdef HAVE_SSL
+       /*
+        * Do encryption stuff...
+       */
 
-    if (options)
-      cupsdSetStringf(&con->options, "php %s %s", filename, options);
-    else
-      cupsdSetStringf(&con->options, "php %s", filename);
+       if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL))
+       {
+         cupsdCloseClient(con);
+         return;
+       }
 
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdIsCGI: Returning 1 with command=\"%s\" and options=\"%s\"",
-                    con->command, con->options);
+       httpPrintf(HTTP(con), "Connection: Upgrade\r\n");
+       httpPrintf(HTTP(con), "Upgrade: TLS/1.0,HTTP/1.1\r\n");
+       httpPrintf(HTTP(con), "Content-Length: 0\r\n");
+       httpPrintf(HTTP(con), "\r\n");
 
-    return (1);
-  }
-#endif /* HAVE_PHP */
-#ifdef HAVE_PYTHON
-  else if (!strcasecmp(type->type, "x-httpd-python"))
-  {
-   /*
-    * "application/x-httpd-python" is a Python page.
-    */
+       if (cupsdFlushHeader(con) < 0)
+        {
+         cupsdCloseClient(con);
+         return;
+       }
 
-    cupsdSetString(&con->command, CUPS_PYTHON);
+        if (!encrypt_client(con))
+        {
+         cupsdCloseClient(con);
+         return;
+       }
+#else
+       if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED))
+       {
+         cupsdCloseClient(con);
+         return;
+       }
+#endif /* HAVE_SSL */
+      }
 
-    if (options)
-      cupsdSetStringf(&con->options, "python %s %s", filename, options);
-    else
-      cupsdSetStringf(&con->options, "python %s", filename);
+      if (!cupsdSendHeader(con, HTTP_OK, NULL))
+      {
+       cupsdCloseClient(con);
+       return;
+      }
 
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdIsCGI: Returning 1 with command=\"%s\" and options=\"%s\"",
-                    con->command, con->options);
+      httpPrintf(HTTP(con), "Allow: GET, HEAD, OPTIONS, POST, PUT\r\n");
+      httpPrintf(HTTP(con), "Content-Length: 0\r\n");
+      httpPrintf(HTTP(con), "\r\n");
 
-    return (1);
-  }
-#endif /* HAVE_PYTHON */
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsCGI: Returning 0...");
-
-  return (0);
-}
-
-
-/*
- * 'cupsdReadClient()' - Read data from a client.
- */
-
-int                                    /* O - 1 on success, 0 on error */
-cupsdReadClient(cupsd_client_t *con)   /* I - Client to read from */
-{
-  char                 line[32768],    /* Line from client... */
-                       operation[64],  /* Operation code from socket */
-                       version[64],    /* HTTP version number string */
-                       locale[64],     /* Locale */
-                       *ptr;           /* Pointer into strings */
-  int                  major, minor;   /* HTTP version numbers */
-  http_status_t                status;         /* Transfer status */
-  ipp_state_t          ipp_state;      /* State of IPP transfer */
-  int                  bytes;          /* Number of bytes to POST */
-  char                 *filename;      /* Name of file for GET/HEAD */
-  char                 buf[1024];      /* Buffer for real filename */
-  struct stat          filestats;      /* File information */
-  mime_type_t          *type;          /* MIME type of file */
-  cupsd_printer_t      *p;             /* Printer */
-  static unsigned      request_id = 0; /* Request ID for temp files */
-
-
-  status = HTTP_CONTINUE;
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdReadClient: %d, used=%d, file=%d state=%d",
-                  con->http.fd, con->http.used, con->file, con->http.state);
-
-  if (con->http.error)
-  {
-    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: http error seen...");
-    return (cupsdCloseClient(con));
-  }
-
-#ifdef HAVE_SSL
-  if (con->auto_ssl)
-  {
-   /*
-    * Automatically check for a SSL/TLS handshake...
-    */
-
-    con->auto_ssl = 0;
-
-    if (recv(con->http.fd, buf, 1, MSG_PEEK) == 1 &&
-        (!buf[0] || !strchr("DGHOPT", buf[0])))
+      if (cupsdFlushHeader(con) < 0)
+      {
+       cupsdCloseClient(con);
+       return;
+      }
+    }
+    else if (!is_path_absolute(con->uri))
     {
      /*
-      * Encrypt this connection...
+      * Protect against malicious users!
       */
 
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdReadClient: Saw first byte %02X, auto-negotiating SSL/TLS session...",
-                      buf[0] & 255);
-
-      cupsdEncryptClient(con);
-      return (1);
+      if (!cupsdSendError(con, HTTP_FORBIDDEN))
+      {
+       cupsdCloseClient(con);
+       return;
+      }
     }
-  }
-#endif /* HAVE_SSL */
-
-  switch (con->http.state)
-  {
-    case HTTP_WAITING :
+    else
+    {
+      if (!strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Upgrade") &&
+         con->http.tls == NULL)
+      {
+#ifdef HAVE_SSL
        /*
-        * See if we've received a request line...
+        * Do encryption stuff...
        */
 
-        if (httpGets(line, sizeof(line) - 1, HTTP(con)) == NULL)
+       if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL))
        {
-         cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                         "cupsdReadClient: httpGets returned EOF...");
-          return (cupsdCloseClient(con));
+         cupsdCloseClient(con);
+         return;
        }
 
-       /*
-        * Ignore blank request lines...
-       */
-
-        if (line[0] == '\0')
-         break;
+       httpPrintf(HTTP(con), "Connection: Upgrade\r\n");
+       httpPrintf(HTTP(con), "Upgrade: TLS/1.0,HTTP/1.1\r\n");
+       httpPrintf(HTTP(con), "Content-Length: 0\r\n");
+       httpPrintf(HTTP(con), "\r\n");
 
-       /*
-        * Clear other state variables...
-       */
+       if (cupsdFlushHeader(con) < 0)
+        {
+         cupsdCloseClient(con);
+         return;
+       }
 
-        httpClearFields(HTTP(con));
+        if (!encrypt_client(con))
+        {
+         cupsdCloseClient(con);
+         return;
+       }
+#else
+       if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED))
+       {
+         cupsdCloseClient(con);
+         return;
+       }
+#endif /* HAVE_SSL */
+      }
 
-        con->http.activity        = time(NULL);
-        con->http.version         = HTTP_1_0;
-       con->http.keep_alive      = HTTP_KEEPALIVE_OFF;
-       con->http.data_encoding   = HTTP_ENCODE_LENGTH;
-       con->http.data_remaining  = 0;
-       con->http._data_remaining = 0;
-       con->operation            = HTTP_WAITING;
-       con->bytes                = 0;
-       con->file                 = -1;
-       con->file_ready           = 0;
-       con->pipe_pid             = 0;
-       con->username[0]          = '\0';
-       con->password[0]          = '\0';
-       con->uri[0]               = '\0';
+      if ((status = cupsdIsAuthorized(con, NULL)) != HTTP_OK)
+      {
+        cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                       "cupsdReadClient: Unauthorized request for %s...\n",
+                       con->uri);
+       cupsdSendError(con, status);
+       cupsdCloseClient(con);
+       return;
+      }
 
-       cupsdClearString(&con->command);
-       cupsdClearString(&con->options);
+      if (con->http.expect &&
+          (con->operation == HTTP_POST || con->operation == HTTP_PUT))
+      {
+        if (con->http.expect == HTTP_CONTINUE)
+       {
+        /*
+         * Send 100-continue header...
+         */
 
-       if (con->language != NULL)
+         if (!cupsdSendHeader(con, HTTP_CONTINUE, NULL))
+         {
+           cupsdCloseClient(con);
+           return;
+         }
+       }
+       else
        {
-         cupsLangFree(con->language);
-         con->language = NULL;
+        /*
+         * Send 417-expectation-failed header...
+         */
+
+         if (!cupsdSendHeader(con, HTTP_EXPECTATION_FAILED, NULL))
+         {
+           cupsdCloseClient(con);
+           return;
+         }
+
+         httpPrintf(HTTP(con), "Content-Length: 0\r\n");
+         httpPrintf(HTTP(con), "\r\n");
+
+         if (cupsdFlushHeader(con) < 0)
+          {
+           cupsdCloseClient(con);
+           return;
+         }
        }
+      }
 
-       /*
-        * Grab the request line...
-       */
+      switch (con->http.state)
+      {
+       case HTTP_GET_SEND :
+            if (!strncmp(con->uri, "/printers/", 10) &&
+               !strcmp(con->uri + strlen(con->uri) - 4, ".ppd"))
+           {
+            /*
+             * Send PPD file - get the real printer name since printer
+             * names are not case sensitive but filenames can be...
+             */
 
-        switch (sscanf(line, "%63s%1023s%63s", operation, con->uri, version))
-       {
-         case 1 :
-             cupsdLogMessage(CUPSD_LOG_ERROR,
-                             "Bad request line \"%s\" from %s!", line,
-                             con->http.hostname);
-             cupsdSendError(con, HTTP_BAD_REQUEST);
-             return (cupsdCloseClient(con));
-         case 2 :
-             con->http.version = HTTP_0_9;
-             break;
-         case 3 :
-             if (sscanf(version, "HTTP/%d.%d", &major, &minor) != 2)
+              con->uri[strlen(con->uri) - 4] = '\0';   /* Drop ".ppd" */
+
+              if ((p = cupsdFindPrinter(con->uri + 10)) != NULL)
+               snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
+             else
              {
-               cupsdLogMessage(CUPSD_LOG_ERROR,
-                               "Bad request line \"%s\" from %s!", line,
-                               con->http.hostname);
-               cupsdSendError(con, HTTP_BAD_REQUEST);
-               return (cupsdCloseClient(con));
+               if (!cupsdSendError(con, HTTP_NOT_FOUND))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+
+               break;
              }
+           }
 
-             if (major < 2)
+           if ((!strncmp(con->uri, "/admin", 6) &&
+                strncmp(con->uri, "/admin/conf/", 12) &&
+                strncmp(con->uri, "/admin/log/", 11)) ||
+               !strncmp(con->uri, "/printers", 9) ||
+               !strncmp(con->uri, "/classes", 8) ||
+               !strncmp(con->uri, "/help", 5) ||
+               !strncmp(con->uri, "/jobs", 5))
+           {
+            /*
+             * Send CGI output...
+             */
+
+              if (!strncmp(con->uri, "/admin", 6))
              {
-               con->http.version = (http_version_t)(major * 100 + minor);
-               if (con->http.version == HTTP_1_1 && KeepAlive)
-                 con->http.keep_alive = HTTP_KEEPALIVE_ON;
-               else
-                 con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+               cupsdSetStringf(&con->command, "%s/cgi-bin/admin.cgi",
+                               ServerBin);
+
+               cupsdSetString(&con->options, strchr(con->uri + 6, '?'));
              }
-             else
+              else if (!strncmp(con->uri, "/printers", 9))
              {
-               cupsdSendError(con, HTTP_NOT_SUPPORTED);
-               return (cupsdCloseClient(con));
+               cupsdSetStringf(&con->command, "%s/cgi-bin/printers.cgi",
+                               ServerBin);
+
+                if (con->uri[9] && con->uri[10])
+                 cupsdSetString(&con->options, con->uri + 9);
+               else
+                 cupsdSetString(&con->options, NULL);
              }
-             break;
-       }
+             else if (!strncmp(con->uri, "/classes", 8))
+             {
+               cupsdSetStringf(&con->command, "%s/cgi-bin/classes.cgi",
+                               ServerBin);
 
-       /*
-        * Handle full URLs in the request line...
-       */
+                if (con->uri[8] && con->uri[9])
+                 cupsdSetString(&con->options, con->uri + 8);
+               else
+                 cupsdSetString(&con->options, NULL);
+             }
+             else if (!strncmp(con->uri, "/jobs", 5))
+             {
+               cupsdSetStringf(&con->command, "%s/cgi-bin/jobs.cgi",
+                               ServerBin);
 
-        if (strcmp(con->uri, "*"))
-       {
-         char  method[HTTP_MAX_URI],   /* Method/scheme */
-               userpass[HTTP_MAX_URI], /* Username:password */
-               hostname[HTTP_MAX_URI], /* Hostname */
-               resource[HTTP_MAX_URI]; /* Resource path */
-          int  port;                   /* Port number */
+                if (con->uri[5] && con->uri[6])
+                 cupsdSetString(&con->options, con->uri + 5);
+               else
+                 cupsdSetString(&con->options, NULL);
+             }
+             else
+             {
+               cupsdSetStringf(&con->command, "%s/cgi-bin/help.cgi",
+                               ServerBin);
 
+                if (con->uri[5] && con->uri[6])
+                 cupsdSetString(&con->options, con->uri + 5);
+               else
+                 cupsdSetString(&con->options, NULL);
+             }
 
-         /*
-         * Separate the URI into its components...
-         */
+              if (!cupsdSendCommand(con, con->command, con->options, 0))
+             {
+               if (!cupsdSendError(con, HTTP_NOT_FOUND))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+              }
+             else
+               cupsdLogRequest(con, HTTP_OK);
 
-          httpSeparateURI(HTTP_URI_CODING_MOST, con->uri,
-                         method, sizeof(method),
-                         userpass, sizeof(userpass),
-                         hostname, sizeof(hostname), &port,
-                         resource, sizeof(resource));
+             if (con->http.version <= HTTP_1_0)
+               con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+           }
+            else if ((!strncmp(con->uri, "/admin/conf/", 12) &&
+                     (strchr(con->uri + 12, '/') ||
+                      strlen(con->uri) == 12)) ||
+                    (!strncmp(con->uri, "/admin/log/", 11) &&
+                     (strchr(con->uri + 11, '/') ||
+                      strlen(con->uri) == 11)))
+           {
+            /*
+             * GET can only be done to configuration files under
+             * /admin/conf...
+             */
+
+             if (!cupsdSendError(con, HTTP_FORBIDDEN))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             break;
+           }
+           else
+           {
+            /*
+             * Serve a file...
+             */
+
+              if ((filename = get_file(con, &filestats, buf,
+                                      sizeof(buf))) == NULL)
+             {
+               if (!cupsdSendError(con, HTTP_NOT_FOUND))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+
+               break;
+             }
+
+             type = mimeFileType(MimeDatabase, filename, NULL, NULL);
+
+              if (is_cgi(con, filename, &filestats, type))
+             {
+              /*
+               * Note: con->command and con->options were set by
+               * is_cgi()...
+               */
+
+               if (!cupsdSendCommand(con, con->command, con->options, 0))
+               {
+                 if (!cupsdSendError(con, HTTP_NOT_FOUND))
+                 {
+                   cupsdCloseClient(con);
+                   return;
+                 }
+               }
+               else
+                 cupsdLogRequest(con, HTTP_OK);
+
+               if (con->http.version <= HTTP_1_0)
+                 con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+               break;
+             }
+
+             if (!check_if_modified(con, &filestats))
+              {
+               if (!cupsdSendError(con, HTTP_NOT_MODIFIED))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+             }
+             else
+              {
+               if (type == NULL)
+                 strcpy(line, "text/plain");
+               else
+                 snprintf(line, sizeof(line), "%s/%s", type->super, type->type);
+
+               if (!write_file(con, HTTP_OK, filename, line, &filestats))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+             }
+           }
+            break;
+
+       case HTTP_POST_RECV :
+           /*
+           * See if the POST request includes a Content-Length field, and if
+           * so check the length against any limits that are set...
+           */
+
+            cupsdLogMessage(CUPSD_LOG_DEBUG2, "POST %s", con->uri);
+           cupsdLogMessage(CUPSD_LOG_DEBUG2, "CONTENT_TYPE = %s",
+                           con->http.fields[HTTP_FIELD_CONTENT_TYPE]);
+
+            if (con->http.fields[HTTP_FIELD_CONTENT_LENGTH][0] &&
+               MaxRequestSize > 0 &&
+               con->http.data_remaining > MaxRequestSize)
+           {
+            /*
+             * Request too large...
+             */
+
+              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             break;
+            }
+           else if (con->http.data_remaining < 0)
+           {
+            /*
+             * Negative content lengths are invalid!
+             */
+
+              if (!cupsdSendError(con, HTTP_BAD_REQUEST))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             break;
+           }
+
+           /*
+           * See what kind of POST request this is; for IPP requests the
+           * content-type field will be "application/ipp"...
+           */
+
+           if (!strcmp(con->http.fields[HTTP_FIELD_CONTENT_TYPE],
+                       "application/ipp"))
+              con->request = ippNew();
+           else if ((!strncmp(con->uri, "/admin", 6) &&
+                     strncmp(con->uri, "/admin/conf/", 12) &&
+                     strncmp(con->uri, "/admin/log/", 11)) ||
+                    !strncmp(con->uri, "/printers", 9) ||
+                    !strncmp(con->uri, "/classes", 8) ||
+                    !strncmp(con->uri, "/help", 5) ||
+                    !strncmp(con->uri, "/jobs", 5))
+           {
+            /*
+             * CGI request...
+             */
+
+              if (!strncmp(con->uri, "/admin", 6))
+             {
+               cupsdSetStringf(&con->command, "%s/cgi-bin/admin.cgi",
+                               ServerBin);
+
+               cupsdSetString(&con->options, strchr(con->uri + 6, '?'));
+             }
+              else if (!strncmp(con->uri, "/printers", 9))
+             {
+               cupsdSetStringf(&con->command, "%s/cgi-bin/printers.cgi",
+                               ServerBin);
+
+                if (con->uri[9] && con->uri[10])
+                 cupsdSetString(&con->options, con->uri + 9);
+               else
+                 cupsdSetString(&con->options, NULL);
+             }
+             else if (!strncmp(con->uri, "/classes", 8))
+             {
+               cupsdSetStringf(&con->command, "%s/cgi-bin/classes.cgi",
+                               ServerBin);
+
+                if (con->uri[8] && con->uri[9])
+                 cupsdSetString(&con->options, con->uri + 8);
+               else
+                 cupsdSetString(&con->options, NULL);
+             }
+             else if (!strncmp(con->uri, "/jobs", 5))
+             {
+               cupsdSetStringf(&con->command, "%s/cgi-bin/jobs.cgi",
+                               ServerBin);
+
+                if (con->uri[5] && con->uri[6])
+                 cupsdSetString(&con->options, con->uri + 5);
+               else
+                 cupsdSetString(&con->options, NULL);
+             }
+             else
+             {
+               cupsdSetStringf(&con->command, "%s/cgi-bin/help.cgi",
+                               ServerBin);
+
+                if (con->uri[5] && con->uri[6])
+                 cupsdSetString(&con->options, con->uri + 5);
+               else
+                 cupsdSetString(&con->options, NULL);
+             }
+
+              cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                             "cupsdReadClient: %d command=\"%s\", "
+                             "options = \"%s\"",
+                             con->http.fd, con->command,
+                             con->options ? con->options : "(null)");
+
+             if (con->http.version <= HTTP_1_0)
+               con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+           }
+           else
+           {
+            /*
+             * POST to a file...
+             */
+
+              if ((filename = get_file(con, &filestats, buf,
+                                      sizeof(buf))) == NULL)
+             {
+               if (!cupsdSendError(con, HTTP_NOT_FOUND))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+
+               break;
+             }
+
+             type = mimeFileType(MimeDatabase, filename, NULL, NULL);
+
+              if (!is_cgi(con, filename, &filestats, type))
+             {
+              /*
+               * Only POST to CGI's...
+               */
+
+               if (!cupsdSendError(con, HTTP_UNAUTHORIZED))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+             }
+           }
+           break;
+
+       case HTTP_PUT_RECV :
+          /*
+           * Validate the resource name...
+           */
+
+            if (strncmp(con->uri, "/admin/conf/", 12) ||
+               strchr(con->uri + 12, '/') ||
+               strlen(con->uri) == 12)
+           {
+            /*
+             * PUT can only be done to configuration files under
+             * /admin/conf...
+             */
+
+             if (!cupsdSendError(con, HTTP_FORBIDDEN))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             break;
+           }
+
+           /*
+           * See if the PUT request includes a Content-Length field, and if
+           * so check the length against any limits that are set...
+           */
+
+            cupsdLogMessage(CUPSD_LOG_DEBUG2, "PUT %s", con->uri);
+           cupsdLogMessage(CUPSD_LOG_DEBUG2, "CONTENT_TYPE = %s",
+                           con->http.fields[HTTP_FIELD_CONTENT_TYPE]);
+
+            if (con->http.fields[HTTP_FIELD_CONTENT_LENGTH][0] &&
+               MaxRequestSize > 0 &&
+               con->http.data_remaining > MaxRequestSize)
+           {
+            /*
+             * Request too large...
+             */
+
+              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             break;
+            }
+           else if (con->http.data_remaining < 0)
+           {
+            /*
+             * Negative content lengths are invalid!
+             */
+
+              if (!cupsdSendError(con, HTTP_BAD_REQUEST))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             break;
+           }
+
+           /*
+           * Open a temporary file to hold the request...
+           */
+
+            cupsdSetStringf(&con->filename, "%s/%08x", RequestRoot,
+                           request_id ++);
+           con->file = open(con->filename, O_WRONLY | O_CREAT | O_TRUNC, 0640);
+
+            cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                           "cupsdReadClient: %d REQUEST %s=%d", con->http.fd,
+                           con->filename, con->file);
+
+           if (con->file < 0)
+           {
+             if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+           }
+
+           fchmod(con->file, 0640);
+           fchown(con->file, RunUser, Group);
+           fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
+           break;
+
+       case HTTP_DELETE :
+       case HTTP_TRACE :
+            cupsdSendError(con, HTTP_NOT_IMPLEMENTED);
+           cupsdCloseClient(con);
+           return;
+
+       case HTTP_HEAD :
+            if (!strncmp(con->uri, "/printers/", 10) &&
+               !strcmp(con->uri + strlen(con->uri) - 4, ".ppd"))
+           {
+            /*
+             * Send PPD file - get the real printer name since printer
+             * names are not case sensitive but filenames can be...
+             */
+
+              con->uri[strlen(con->uri) - 4] = '\0';   /* Drop ".ppd" */
+
+              if ((p = cupsdFindPrinter(con->uri + 10)) != NULL)
+               snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
+             else
+             {
+               if (!cupsdSendError(con, HTTP_NOT_FOUND))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+
+               break;
+             }
+           }
+
+           if ((!strncmp(con->uri, "/admin", 6) &&
+                strncmp(con->uri, "/admin/conf/", 12) &&
+                strncmp(con->uri, "/admin/log/", 11)) ||
+               !strncmp(con->uri, "/printers", 9) ||
+               !strncmp(con->uri, "/classes", 8) ||
+               !strncmp(con->uri, "/help", 5) ||
+               !strncmp(con->uri, "/jobs", 5))
+           {
+            /*
+             * CGI output...
+             */
+
+              if (!cupsdSendHeader(con, HTTP_OK, "text/html"))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             if (httpPrintf(HTTP(con), "\r\n") < 0)
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             if (cupsdFlushHeader(con) < 0)
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+              cupsdLogRequest(con, HTTP_OK);
+           }
+            else if ((!strncmp(con->uri, "/admin/conf/", 12) &&
+                     (strchr(con->uri + 12, '/') ||
+                      strlen(con->uri) == 12)) ||
+                    (!strncmp(con->uri, "/admin/log/", 11) &&
+                     (strchr(con->uri + 11, '/') ||
+                      strlen(con->uri) == 11)))
+           {
+            /*
+             * HEAD can only be done to configuration files under
+             * /admin/conf...
+             */
+
+             if (!cupsdSendError(con, HTTP_FORBIDDEN))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             break;
+           }
+           else if ((filename = get_file(con, &filestats, buf,
+                                         sizeof(buf))) == NULL)
+           {
+             if (!cupsdSendHeader(con, HTTP_NOT_FOUND, "text/html"))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+              cupsdLogRequest(con, HTTP_NOT_FOUND);
+           }
+           else if (!check_if_modified(con, &filestats))
+            {
+              if (!cupsdSendError(con, HTTP_NOT_MODIFIED))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+              cupsdLogRequest(con, HTTP_NOT_MODIFIED);
+           }
+           else
+           {
+            /*
+             * Serve a file...
+             */
+
+             type = mimeFileType(MimeDatabase, filename, NULL, NULL);
+             if (type == NULL)
+               strcpy(line, "text/plain");
+             else
+               snprintf(line, sizeof(line), "%s/%s", type->super, type->type);
+
+              if (!cupsdSendHeader(con, HTTP_OK, line))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             if (httpPrintf(HTTP(con), "Last-Modified: %s\r\n",
+                            httpGetDateString(filestats.st_mtime)) < 0)
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+             if (httpPrintf(HTTP(con), "Content-Length: %lu\r\n",
+                            (unsigned long)filestats.st_size) < 0)
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+
+              cupsdLogRequest(con, HTTP_OK);
+           }
+
+            if (httpPrintf(HTTP(con), "\r\n") < 0)
+           {
+             cupsdCloseClient(con);
+             return;
+           }
+
+           if (cupsdFlushHeader(con) < 0)
+            {
+             cupsdCloseClient(con);
+             return;
+           }
+
+            con->http.state = HTTP_WAITING;
+            break;
+
+       default :
+            break; /* Anti-compiler-warning-code */
+      }
+    }
+  }
+
+ /*
+  * Handle any incoming data...
+  */
+
+  switch (con->http.state)
+  {
+    case HTTP_PUT_RECV :
+        cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                       "cupsdReadClient: %d con->data_encoding=HTTP_ENCODE_%s, "
+                       "con->data_remaining=" CUPS_LLFMT ", con->file=%d",
+                       con->http.fd,
+                       con->http.data_encoding == HTTP_ENCODE_CHUNKED ?
+                           "CHUNKED" : "LENGTH",
+                       CUPS_LLCAST con->http.data_remaining, con->file);
+
+        do
+       {
+          if ((bytes = httpRead2(HTTP(con), line, sizeof(line))) < 0)
+         {
+           cupsdCloseClient(con);
+           return;
+         }
+         else if (bytes > 0)
+         {
+           con->bytes += bytes;
+
+            cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                           "cupsdReadClient: %d writing %d bytes to %d",
+                           con->http.fd, bytes, con->file);
+
+            if (write(con->file, line, bytes) < bytes)
+           {
+              cupsdLogMessage(CUPSD_LOG_ERROR,
+                             "cupsdReadClient: Unable to write %d bytes to %s: %s",
+                             bytes, con->filename, strerror(errno));
+
+             cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                             "cupsdReadClient: Closing data file %d...",
+                             con->file);
+
+             close(con->file);
+             con->file = -1;
+             unlink(con->filename);
+             cupsdClearString(&con->filename);
+
+              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+           }
+         }
+        }
+       while (con->http.state == HTTP_PUT_RECV && con->http.used > 0);
+
+        if (con->http.state == HTTP_WAITING)
+       {
+        /*
+         * End of file, see how big it is...
+         */
+
+         fstat(con->file, &filestats);
+
+          cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                         "cupsdReadClient: %d Closing data file %d, size="
+                         CUPS_LLFMT ".",
+                          con->http.fd, con->file,
+                         CUPS_LLCAST filestats.st_size);
+
+         close(con->file);
+         con->file = -1;
+
+          if (filestats.st_size > MaxRequestSize &&
+             MaxRequestSize > 0)
+         {
+          /*
+           * Request is too big; remove it and send an error...
+           */
+
+            cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                           "cupsdReadClient: %d Removing temp file %s",
+                           con->http.fd, con->filename);
+           unlink(con->filename);
+           cupsdClearString(&con->filename);
+
+            if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
+           {
+             cupsdCloseClient(con);
+             return;
+           }
+         }
+
+         /*
+         * Install the configuration file...
+         */
+
+          status = install_conf_file(con);
+
+         /*
+         * Return the status to the client...
+         */
+
+          if (!cupsdSendError(con, status))
+         {
+           cupsdCloseClient(con);
+           return;
+         }
+       }
+        break;
+
+    case HTTP_POST_RECV :
+        cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                       "cupsdReadClient: %d con->data_encoding=HTTP_ENCODE_"
+                       "%s, con->data_remaining=" CUPS_LLFMT ", con->file=%d",
+                       con->http.fd,
+                       con->http.data_encoding == HTTP_ENCODE_CHUNKED ?
+                           "CHUNKED" : "LENGTH",
+                       CUPS_LLCAST con->http.data_remaining, con->file);
+
+        do
+       {
+          if (con->request)
+         {
+          /*
+           * Grab any request data from the connection...
+           */
+
+           if ((ipp_state = ippRead(&(con->http), con->request)) == IPP_ERROR)
+           {
+              cupsdLogMessage(CUPSD_LOG_ERROR,
+                             "cupsdReadClient: %d IPP Read Error!",
+                             con->http.fd);
+
+             cupsdSendError(con, HTTP_BAD_REQUEST);
+             cupsdCloseClient(con);
+             return;
+           }
+           else if (ipp_state != IPP_DATA)
+           {
+              if (con->http.state == HTTP_POST_SEND)
+             {
+               cupsdSendError(con, HTTP_BAD_REQUEST);
+               cupsdCloseClient(con);
+               return;
+             }
+
+             break;
+            }
+           else
+             con->bytes += ippLength(con->request);
+         }
+
+          if (con->file < 0 && con->http.state != HTTP_POST_SEND)
+         {
+           /*
+           * Create a file as needed for the request data...
+           */
+
+            cupsdSetStringf(&con->filename, "%s/%08x", RequestRoot, request_id ++);
+           con->file = open(con->filename, O_WRONLY | O_CREAT | O_TRUNC, 0640);
+
+            cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %d REQUEST %s=%d", con->http.fd,
+                           con->filename, con->file);
+
+           if (con->file < 0)
+           {
+             if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+           }
 
-         /*
-         * Only allow URIs with the servername, localhost, or an IP
-         * address...
-         */
+           fchmod(con->file, 0640);
+           fchown(con->file, RunUser, Group);
+            fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
+         }
 
-         if (strcmp(method, "file") &&
-             strcasecmp(hostname, ServerName) &&
-             strcasecmp(hostname, "localhost") &&
-             !isdigit(hostname[0]))
+         if (con->http.state != HTTP_POST_SEND)
          {
-          /*
-           * Nope, we don't do proxies...
-           */
+            if ((bytes = httpRead2(HTTP(con), line, sizeof(line))) < 0)
+           {
+             cupsdCloseClient(con);
+             return;
+           }
+           else if (bytes > 0)
+           {
+             con->bytes += bytes;
 
-           cupsdLogMessage(CUPSD_LOG_ERROR, "Bad URI \"%s\" in request!",
-                           con->uri);
-           cupsdSendError(con, HTTP_METHOD_NOT_ALLOWED);
-           return (cupsdCloseClient(con));
-         }
+              cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                             "cupsdReadClient: %d writing %d bytes to %d",
+                             con->http.fd, bytes, con->file);
 
-         /*
-         * Copy the resource portion back into the URI; both resource and
-         * con->uri are HTTP_MAX_URI bytes in size...
-         */
+              if (write(con->file, line, bytes) < bytes)
+             {
+               cupsdLogMessage(CUPSD_LOG_ERROR,
+                               "cupsdReadClient: Unable to write %d bytes to %s: %s",
+                               bytes, con->filename, strerror(errno));
 
-          strcpy(con->uri, resource);
-       }
+               cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                               "cupsdReadClient: Closing file %d...",
+                               con->file);
 
-       /*
-        * Process the request...
-       */
+               close(con->file);
+               con->file = -1;
+               unlink(con->filename);
+               cupsdClearString(&con->filename);
 
-        if (!strcmp(operation, "GET"))
-         con->http.state = HTTP_GET;
-        else if (!strcmp(operation, "PUT"))
-         con->http.state = HTTP_PUT;
-        else if (!strcmp(operation, "POST"))
-         con->http.state = HTTP_POST;
-        else if (!strcmp(operation, "DELETE"))
-         con->http.state = HTTP_DELETE;
-        else if (!strcmp(operation, "TRACE"))
-         con->http.state = HTTP_TRACE;
-        else if (!strcmp(operation, "OPTIONS"))
-         con->http.state = HTTP_OPTIONS;
-        else if (!strcmp(operation, "HEAD"))
-         con->http.state = HTTP_HEAD;
-       else
+               if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+             }
+           }
+           else if (con->http.state == HTTP_POST_RECV)
+              return;
+           else if (con->http.state != HTTP_POST_SEND)
+           {
+             cupsdCloseClient(con);
+             return;
+           }
+         }
+        }
+       while (con->http.state == HTTP_POST_RECV && con->http.used > 0);
+
+       if (con->http.state == HTTP_POST_SEND)
        {
-         cupsdLogMessage(CUPSD_LOG_ERROR, "Bad operation \"%s\"!", operation);
-         cupsdSendError(con, HTTP_BAD_REQUEST);
-         return (cupsdCloseClient(con));
+         if (con->file >= 0)
+         {
+           fstat(con->file, &filestats);
+
+            cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                           "cupsdReadClient: %d Closing data file %d, "
+                           "size=" CUPS_LLFMT ".",
+                            con->http.fd, con->file,
+                           CUPS_LLCAST filestats.st_size);
+
+           close(con->file);
+           con->file = -1;
+
+            if (filestats.st_size > MaxRequestSize &&
+               MaxRequestSize > 0)
+           {
+            /*
+             * Request is too big; remove it and send an error...
+             */
+
+              cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                             "cupsdReadClient: %d Removing temp file %s",
+                             con->http.fd, con->filename);
+             unlink(con->filename);
+             cupsdClearString(&con->filename);
+
+             if (con->request)
+             {
+              /*
+               * Delete any IPP request data...
+               */
+
+               ippDelete(con->request);
+               con->request = NULL;
+              }
+
+              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
+             {
+               cupsdCloseClient(con);
+               return;
+             }
+           }
+
+           if (con->command)
+           {
+             if (!cupsdSendCommand(con, con->command, con->options, 0))
+             {
+               if (!cupsdSendError(con, HTTP_NOT_FOUND))
+               {
+                 cupsdCloseClient(con);
+                 return;
+               }
+              }
+             else
+               cupsdLogRequest(con, HTTP_OK);
+            }
+         }
+
+          if (con->request)
+         {
+           cupsdProcessIPPRequest(con);
+           return;
+         }
        }
+        break;
+
+    default :
+        break; /* Anti-compiler-warning-code */
+  }
+
+  if (!con->http.keep_alive && con->http.state == HTTP_WAITING)
+    cupsdCloseClient(con);
+}
+
+
+/*
+ * 'cupsdSendCommand()' - Send output from a command via HTTP.
+ */
+
+int                                    /* O - 1 on success, 0 on failure */
+cupsdSendCommand(
+    cupsd_client_t *con,               /* I - Client connection */
+    char           *command,           /* I - Command to run */
+    char           *options,           /* I - Command-line options */
+    int            root)               /* I - Run as root? */
+{
+  int  fd;                             /* Standard input file descriptor */
+
+
+  if (con->filename)
+  {
+    fd = open(con->filename, O_RDONLY);
+
+    if (fd < 0)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s",
+                      con->http.fd, con->filename ? con->filename : "/dev/null",
+                     strerror(errno));
+      return (0);
+    }
+
+    fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+  }
+  else
+    fd = -1;
+
+  con->pipe_pid = pipe_command(con, fd, &(con->file), command, options, root);
+
+  if (fd >= 0)
+    close(fd);
+
+  cupsdLogMessage(CUPSD_LOG_INFO, "Started \"%s\" (pid=%d)", command,
+                  con->pipe_pid);
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSendCommand: %d file=%d",
+                  con->http.fd, con->file);
+
+  if (con->pipe_pid == 0)
+    return (0);
+
+  fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
+
+  cupsdAddSelect(con->file, (cupsd_selfunc_t)cupsdWritePipe, NULL, con);
+
+  con->sent_header = 0;
+  con->file_ready  = 0;
+  con->got_fields  = 0;
+  con->field_col   = 0;
+
+  return (1);
+}
+
+
+/*
+ * 'cupsdSendError()' - Send an error message via HTTP.
+ */
+
+int                                    /* O - 1 if successful, 0 otherwise */
+cupsdSendError(cupsd_client_t *con,    /* I - Connection */
+               http_status_t  code)    /* I - Error code */
+{
+#ifdef HAVE_SSL
+ /*
+  * Force client to upgrade for authentication if that is how the
+  * server is configured...
+  */
+
+  if (code == HTTP_UNAUTHORIZED &&
+      DefaultEncryption == HTTP_ENCRYPT_REQUIRED &&
+      strcasecmp(con->http.hostname, "localhost") &&
+      !con->http.tls)
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                    "cupsdSendError: Encryption before authentication!");
+    code = HTTP_UPGRADE_REQUIRED;
+  }
+#endif /* HAVE_SSL */
+
+ /*
+  * Put the request in the access_log file...
+  */
+
+  cupsdLogRequest(con, code);
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSendError: %d code=%d (%s)",
+                  con->http.fd, code, httpStatus(code));
+
+ /*
+  * To work around bugs in some proxies, don't use Keep-Alive for some
+  * error messages...
+  *
+  * Kerberos authentication doesn't work without Keep-Alive, so
+  * never disable it in that case.
+  */
+
+  if (code >= HTTP_BAD_REQUEST && con->http.auth_type != AUTH_KERBEROS)
+    con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+
+ /*
+  * Send an error message back to the client.  If the error code is a
+  * 400 or 500 series, make sure the message contains some text, too!
+  */
+
+  if (!cupsdSendHeader(con, code, NULL))
+    return (0);
+
+#ifdef HAVE_SSL
+  if (code == HTTP_UPGRADE_REQUIRED)
+    if (httpPrintf(HTTP(con), "Connection: Upgrade\r\n") < 0)
+      return (0);
+
+  if (httpPrintf(HTTP(con), "Upgrade: TLS/1.0,HTTP/1.1\r\n") < 0)
+    return (0);
+#endif /* HAVE_SSL */
+
+  if (con->http.version >= HTTP_1_1 &&
+      con->http.keep_alive == HTTP_KEEPALIVE_OFF)
+  {
+    if (httpPrintf(HTTP(con), "Connection: close\r\n") < 0)
+      return (0);
+  }
+
+  if (code >= HTTP_BAD_REQUEST)
+  {
+   /*
+    * Send a human-readable error message.
+    */
+
+    char       message[4096],          /* Message for user */
+               urltext[1024],          /* URL redirection text */
+               redirect[1024];         /* Redirection link */
+    const char *text;                  /* Status-specific text */
+
+
+    redirect[0] = '\0';
+
+    if (code == HTTP_UNAUTHORIZED)
+      text = _cupsLangString(con->language,
+                             _("Enter your username and password or the "
+                              "root username and password to access this "
+                              "page. If you are using Kerberos authentication, "
+                              "make sure you have a valid Kerberos ticket."));
+    else if (code == HTTP_UPGRADE_REQUIRED)
+    {
+      text = urltext;
+
+      snprintf(urltext, sizeof(urltext),
+               _cupsLangString(con->language,
+                               _("You must access this page using the URL "
+                                "<A HREF=\"https://%s:%d%s\">"
+                                "https://%s:%d%s</A>.")),
+               con->servername, con->serverport, con->uri,
+              con->servername, con->serverport, con->uri);
+
+      snprintf(redirect, sizeof(redirect),
+               "<META HTTP-EQUIV=\"Refresh\" "
+              "CONTENT=\"3;URL=https://%s:%d%s\">\n",
+              con->servername, con->serverport, con->uri);
+    }
+    else
+      text = "";
+
+    snprintf(message, sizeof(message),
+             "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" "
+            "\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n"
+            "<HTML>\n"
+            "<HEAD>\n"
+             "\t<META HTTP-EQUIV=\"Content-Type\" "
+            "CONTENT=\"text/html; charset=utf-8\">\n"
+            "\t<TITLE>%d %s</TITLE>\n"
+            "\t<LINK REL=\"STYLESHEET\" TYPE=\"text/css\" "
+            "HREF=\"/cups.css\">\n"
+            "%s"
+            "</HEAD>\n"
+             "<BODY>\n"
+            "<H1>%d %s</H1>\n"
+            "<P>%s</P>\n"
+            "</BODY>\n"
+            "</HTML>\n",
+            code, httpStatus(code), redirect, code, httpStatus(code), text);
 
-        con->start     = time(NULL);
-        con->operation = con->http.state;
+    if (httpPrintf(HTTP(con), "Content-Type: text/html; charset=utf-8\r\n") < 0)
+      return (0);
+    if (httpPrintf(HTTP(con), "Content-Length: %d\r\n",
+                   (int)strlen(message)) < 0)
+      return (0);
+    if (httpPrintf(HTTP(con), "\r\n") < 0)
+      return (0);
+    if (httpPrintf(HTTP(con), "%s", message) < 0)
+      return (0);
+  }
+  else if (httpPrintf(HTTP(con), "\r\n") < 0)
+    return (0);
 
-        cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdReadClient: %d %s %s HTTP/%d.%d", con->http.fd,
-                       operation, con->uri,
-                       con->http.version / 100, con->http.version % 100);
+  if (cupsdFlushHeader(con) < 0)
+    return (0);
 
-       con->http.status = HTTP_OK;
+  con->http.state = HTTP_WAITING;
 
-    case HTTP_OPTIONS :
-    case HTTP_DELETE :
-    case HTTP_GET :
-    case HTTP_HEAD :
-    case HTTP_POST :
-    case HTTP_PUT :
-    case HTTP_TRACE :
-       /*
-        * Parse incoming parameters until the status changes...
-       */
+  return (1);
+}
 
-        status = httpUpdate(HTTP(con));
 
-       if (status != HTTP_OK && status != HTTP_CONTINUE)
-       {
-         cupsdSendError(con, HTTP_BAD_REQUEST);
-         return (cupsdCloseClient(con));
-       }
-       break;
+/*
+ * 'cupsdSendHeader()' - Send an HTTP request.
+ */
+
+int                                    /* O - 1 on success, 0 on failure */
+cupsdSendHeader(cupsd_client_t *con,   /* I - Client to send to */
+                http_status_t  code,   /* I - HTTP status code */
+               char           *type)   /* I - MIME type of document */
+{
+  char auth_str[1024];                 /* Authorization string */
 
-    default :
-        break; /* Anti-compiler-warning-code */
-  }
 
  /*
-  * Handle new transfers...
+  * Send the HTTP status header...
   */
 
-  if (status == HTTP_OK)
+  if (code == HTTP_CONTINUE)
   {
-    if (con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE][0])
-    {
-     /*
-      * Figure out the locale from the Accept-Language and Content-Type
-      * fields...
-      */
-
-      if ((ptr = strchr(con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], ',')) != NULL)
-        *ptr = '\0';
+   /*
+    * 100-continue doesn't send any headers...
+    */
 
-      if ((ptr = strchr(con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], ';')) != NULL)
-        *ptr = '\0';
+    return (httpPrintf(HTTP(con), "HTTP/%d.%d 100 Continue\r\n\r\n",
+                      con->http.version / 100, con->http.version % 100) > 0);
+  }
 
-      if ((ptr = strstr(con->http.fields[HTTP_FIELD_CONTENT_TYPE], "charset=")) != NULL)
-      {
-       /*
-        * Combine language and charset, and trim any extra params in the
-       * content-type.
-       */
+  httpFlushWrite(HTTP(con));
 
-        snprintf(locale, sizeof(locale), "%s.%s",
-                con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], ptr + 8);
+  con->http.data_encoding = HTTP_ENCODE_FIELDS;
 
-       if ((ptr = strchr(locale, ',')) != NULL)
-         *ptr = '\0';
-      }
-      else
-        snprintf(locale, sizeof(locale), "%s.%s",
-                con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], DefaultCharset);
-        
-      con->language = cupsLangGet(locale);
-    }
-    else
-      con->language = cupsLangGet(DefaultLocale);
+  if (httpPrintf(HTTP(con), "HTTP/%d.%d %d %s\r\n", con->http.version / 100,
+                 con->http.version % 100, code, httpStatus(code)) < 0)
+    return (0);
+  if (httpPrintf(HTTP(con), "Date: %s\r\n", httpGetDateString(time(NULL))) < 0)
+    return (0);
+  if (ServerHeader)
+    if (httpPrintf(HTTP(con), "Server: %s\r\n", ServerHeader) < 0)
+      return (0);
+  if (con->http.keep_alive && con->http.version >= HTTP_1_0)
+  {
+    if (httpPrintf(HTTP(con), "Connection: Keep-Alive\r\n") < 0)
+      return (0);
+    if (httpPrintf(HTTP(con), "Keep-Alive: timeout=%d\r\n",
+                   KeepAliveTimeout) < 0)
+      return (0);
+  }
+  if (code == HTTP_METHOD_NOT_ALLOWED)
+    if (httpPrintf(HTTP(con), "Allow: GET, HEAD, OPTIONS, POST\r\n") < 0)
+      return (0);
 
-    cupsdAuthorize(con);
+  if (code == HTTP_UNAUTHORIZED)
+  {
+    int        auth_type;                      /* Authentication type */
 
-    if (!strncmp(con->http.fields[HTTP_FIELD_CONNECTION], "Keep-Alive", 10) &&
-        KeepAlive)
-      con->http.keep_alive = HTTP_KEEPALIVE_ON;
 
-    if (!con->http.fields[HTTP_FIELD_HOST][0] &&
-        con->http.version >= HTTP_1_1)
-    {
-     /*
-      * HTTP/1.1 and higher require the "Host:" field...
-      */
+    if (!con->best || con->best->type == AUTH_NONE)
+      auth_type = DefaultAuthType;
+    else
+      auth_type = con->best->type;
 
-      if (!cupsdSendError(con, HTTP_BAD_REQUEST))
-       return (cupsdCloseClient(con));
-    }
-    else if (con->operation == HTTP_OPTIONS)
+    auth_str[0] = '\0';
+
+    if (auth_type == AUTH_BASIC || auth_type == AUTH_BASICDIGEST)
+      strlcpy(auth_str, "Basic realm=\"CUPS\"", sizeof(auth_str));
+    else if (auth_type == AUTH_DIGEST)
+      snprintf(auth_str, sizeof(auth_str), "Digest realm=\"CUPS\", nonce=\"%s\"",
+              con->http.hostname);
+#ifdef HAVE_GSSAPI
+    else if (auth_type == AUTH_KERBEROS && !con->no_negotiate &&
+            con->gss_output_token.length == 0)
+      strlcpy(auth_str, "Negotiate", sizeof(auth_str));
+#endif /* HAVE_GSSAPI */
+
+#ifdef HAVE_AUTHORIZATION_H
+    if (con->best)
     {
-     /*
-      * Do OPTIONS command...
-      */
-
-      if (con->best && con->best->type != AUTH_NONE)
-      {
-       if (!cupsdSendHeader(con, HTTP_UNAUTHORIZED, NULL))
-         return (cupsdCloseClient(con));
-      }
-
-      if (!strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Upgrade") &&
-         con->http.tls == NULL)
-      {
-#ifdef HAVE_SSL
-       /*
-        * Do encryption stuff...
-       */
-
-       if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL))
-         return (cupsdCloseClient(con));
+      int       i;                     /* Looping var */
+      char     *auth_key;              /* Auth key buffer */
+      size_t   auth_size;              /* Size of remaining buffer */
 
-       httpPrintf(HTTP(con), "Connection: Upgrade\r\n");
-       httpPrintf(HTTP(con), "Upgrade: TLS/1.0,HTTP/1.1\r\n");
-       httpPrintf(HTTP(con), "Content-Length: 0\r\n");
-       httpPrintf(HTTP(con), "\r\n");
 
-        cupsdEncryptClient(con);
-#else
-       if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED))
-         return (cupsdCloseClient(con));
-#endif /* HAVE_SSL */
-      }
+      auth_key  = auth_str + strlen(auth_str);
+      auth_size = sizeof(auth_str) - (auth_key - auth_str);
 
-      if (con->http.expect)
+      for (i = 0; i < con->best->num_names; i ++)
       {
-        /**** TODO: send expected header ****/
+       if (!strncasecmp(con->best->names[i], "@AUTHKEY(", 9))
+       {
+         snprintf(auth_key, auth_size, ", authkey=\"%s\"",
+                  con->best->names[i] + 9);
+         /* end parenthesis is stripped in conf.c */
+         break;
+        }
+       else if (!strcasecmp(con->best->names[i], "@SYSTEM") &&
+                SystemGroupAuthKey)
+       {
+         snprintf(auth_key, auth_size, ", authkey=\"%s\"", SystemGroupAuthKey);
+         break;
+       }
       }
-
-      if (!cupsdSendHeader(con, HTTP_OK, NULL))
-       return (cupsdCloseClient(con));
-
-      httpPrintf(HTTP(con), "Allow: GET, HEAD, OPTIONS, POST, PUT\r\n");
-      httpPrintf(HTTP(con), "Content-Length: 0\r\n");
-      httpPrintf(HTTP(con), "\r\n");
-    }
-    else if (!is_path_absolute(con->uri))
-    {
-     /*
-      * Protect against malicious users!
-      */
-
-      if (!cupsdSendError(con, HTTP_FORBIDDEN))
-       return (cupsdCloseClient(con));
     }
-    else
-    {
-      if (!strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Upgrade") &&
-         con->http.tls == NULL)
-      {
-#ifdef HAVE_SSL
-       /*
-        * Do encryption stuff...
-       */
-
-       if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL))
-         return (cupsdCloseClient(con));
+#endif /* HAVE_AUTHORIZATION_H */
 
-       httpPrintf(HTTP(con), "Connection: Upgrade\r\n");
-       httpPrintf(HTTP(con), "Upgrade: TLS/1.0,HTTP/1.1\r\n");
-       httpPrintf(HTTP(con), "Content-Length: 0\r\n");
-       httpPrintf(HTTP(con), "\r\n");
+    if (auth_str[0] &&
+       httpPrintf(HTTP(con), "WWW-Authenticate: %s\r\n", auth_str) < 0)
+      return (0);
+  }
 
-        cupsdEncryptClient(con);
-#else
-       if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED))
-         return (cupsdCloseClient(con));
-#endif /* HAVE_SSL */
-      }
+#ifdef HAVE_GSSAPI
+ /*
+  * WWW-Authenticate: Negotiate can be included even for
+  * non-401 replies...
+  */
 
-      if ((status = cupsdIsAuthorized(con, NULL)) != HTTP_OK)
-      {
-        cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                       "cupsdReadClient: Unauthorized request for %s...\n",
-                       con->uri);
-       cupsdSendError(con, status);
-       return (cupsdCloseClient(con));
-      }
+  if (con->gss_output_token.length > 0)
+  {
+    char       buf[2048];              /* Output token buffer */
+    OM_uint32  minor_status;           /* Minor status code */
 
-      if (con->http.expect)
-      {
-        /**** TODO: send expected header ****/
-      }
 
-      switch (con->http.state)
-      {
-       case HTTP_GET_SEND :
-            if (!strncmp(con->uri, "/printers/", 10) &&
-               !strcmp(con->uri + strlen(con->uri) - 4, ".ppd"))
-           {
-            /*
-             * Send PPD file - get the real printer name since printer
-             * names are not case sensitive but filenames can be...
-             */
+    httpEncode64_2(buf, sizeof(buf),
+                  con->gss_output_token.value,
+                  con->gss_output_token.length);
+    gss_release_buffer(&minor_status, &con->gss_output_token);
 
-              con->uri[strlen(con->uri) - 4] = '\0';   /* Drop ".ppd" */
+    if (httpPrintf(HTTP(con), "WWW-Authenticate: Negotiate %s\r\n", buf) < 0)
+      return (0);
+  }
+#endif /* HAVE_GSSAPI */
 
-              if ((p = cupsdFindPrinter(con->uri + 10)) != NULL)
-               snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
-             else
-             {
-               if (!cupsdSendError(con, HTTP_NOT_FOUND))
-                 return (cupsdCloseClient(con));
+  if (con->language && strcmp(con->language->language, "C"))
+  {
+    if (httpPrintf(HTTP(con), "Content-Language: %s\r\n",
+                   con->language->language) < 0)
+      return (0);
+  }
 
-               break;
-             }
-           }
+  if (type)
+  {
+    if (!strcmp(type, "text/html"))
+    {
+      if (httpPrintf(HTTP(con),
+                     "Content-Type: text/html; charset=utf-8\r\n") < 0)
+        return (0);
+    }
+    else if (httpPrintf(HTTP(con), "Content-Type: %s\r\n", type) < 0)
+      return (0);
+  }
 
-           if ((!strncmp(con->uri, "/admin", 6) &&
-                strncmp(con->uri, "/admin/conf/", 12) &&
-                strncmp(con->uri, "/admin/log/", 11)) ||
-               !strncmp(con->uri, "/printers", 9) ||
-               !strncmp(con->uri, "/classes", 8) ||
-               !strncmp(con->uri, "/help", 5) ||
-               !strncmp(con->uri, "/jobs", 5))
-           {
-            /*
-             * Send CGI output...
-             */
+  return (1);
+}
 
-              if (!strncmp(con->uri, "/admin", 6))
-             {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/admin.cgi",
-                               ServerBin);
 
-               if ((ptr = strchr(con->uri + 6, '?')) != NULL)
-                 cupsdSetStringf(&con->options, "admin%s", ptr);
-               else
-                 cupsdSetString(&con->options, "admin");
-             }
-              else if (!strncmp(con->uri, "/printers", 9))
-             {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/printers.cgi",
-                               ServerBin);
-               cupsdSetString(&con->options, con->uri + 9);
-             }
-             else if (!strncmp(con->uri, "/classes", 8))
-             {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/classes.cgi",
-                               ServerBin);
-               cupsdSetString(&con->options, con->uri + 8);
-             }
-             else if (!strncmp(con->uri, "/jobs", 5))
-             {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/jobs.cgi",
-                               ServerBin);
-                cupsdSetString(&con->options, con->uri + 5);
-             }
-             else
-             {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/help.cgi",
-                               ServerBin);
-                cupsdSetString(&con->options, con->uri + 5);
-             }
+/*
+ * 'cupsdUpdateCGI()' - Read status messages from CGI scripts and programs.
+ */
 
-              if (con->options[0] == '/')
-               _cups_strcpy(con->options, con->options + 1);
+void
+cupsdUpdateCGI(void)
+{
+  char         *ptr,                   /* Pointer to end of line in buffer */
+               message[1024];          /* Pointer to message text */
+  int          loglevel;               /* Log level for message */
 
-              if (!cupsdSendCommand(con, con->command, con->options, 0))
-             {
-               if (!cupsdSendError(con, HTTP_NOT_FOUND))
-                 return (cupsdCloseClient(con));
-              }
-             else
-               cupsdLogRequest(con, HTTP_OK);
 
-             if (con->http.version <= HTTP_1_0)
-               con->http.keep_alive = HTTP_KEEPALIVE_OFF;
-           }
-            else if ((!strncmp(con->uri, "/admin/conf/", 12) &&
-                     (strchr(con->uri + 12, '/') ||
-                      strlen(con->uri) == 12)) ||
-                    (!strncmp(con->uri, "/admin/log/", 11) &&
-                     (strchr(con->uri + 11, '/') ||
-                      strlen(con->uri) == 11)))
-           {
-            /*
-             * GET can only be done to configuration files under
-             * /admin/conf...
-             */
+  while ((ptr = cupsdStatBufUpdate(CGIStatusBuffer, &loglevel,
+                                   message, sizeof(message))) != NULL)
+    if (!strchr(CGIStatusBuffer->buffer, '\n'))
+      break;
 
-             if (!cupsdSendError(con, HTTP_FORBIDDEN))
-               return (cupsdCloseClient(con));
+  if (ptr == NULL && !CGIStatusBuffer->bufused)
+  {
+   /*
+    * Fatal error on pipe - should never happen!
+    */
 
-             break;
-           }
-           else
-           {
-            /*
-             * Serve a file...
-             */
+    cupsdLogMessage(CUPSD_LOG_CRIT,
+                    "cupsdUpdateCGI: error reading from CGI error pipe - %s",
+                    strerror(errno));
+  }
+}
 
-              if ((filename = get_file(con, &filestats, buf,
-                                      sizeof(buf))) == NULL)
-             {
-               if (!cupsdSendError(con, HTTP_NOT_FOUND))
-                 return (cupsdCloseClient(con));
 
-               break;
-             }
+/*
+ * 'cupsdWriteClient()' - Write data to a client as needed.
+ */
 
-             type = mimeFileType(MimeDatabase, filename, NULL, NULL);
+void
+cupsdWriteClient(cupsd_client_t *con)  /* I - Client connection */
+{
+  int          bytes;                  /* Number of bytes written */
+  char         buf[16385];             /* Data buffer */
+  char         *bufptr;                /* Pointer into buffer */
+  ipp_state_t  ipp_state;              /* IPP state value */
 
-              if (cupsdIsCGI(con, filename, &filestats, type))
-             {
-              /*
-               * Note: con->command and con->options were set by
-               * cupsdIsCGI()...
-               */
 
-               if (!cupsdSendCommand(con, con->command, con->options, 0))
-               {
-                 if (!cupsdSendError(con, HTTP_NOT_FOUND))
-                   return (cupsdCloseClient(con));
-               }
-               else
-                 cupsdLogRequest(con, HTTP_OK);
+#ifdef DEBUG
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "cupsdWriteClient(con=%p) %d response=%p, file=%d "
+                 "pipe_pid=%d state=%d",
+                  con, con->http.fd, con->response, con->file, con->pipe_pid,
+                 con->http.state);
+#endif /* DEBUG */
 
-               if (con->http.version <= HTTP_1_0)
-                 con->http.keep_alive = HTTP_KEEPALIVE_OFF;
-               break;
-             }
+  if (con->http.state != HTTP_GET_SEND &&
+      con->http.state != HTTP_POST_SEND)
+    return;
 
-             if (!check_if_modified(con, &filestats))
-              {
-               if (!cupsdSendError(con, HTTP_NOT_MODIFIED))
-                 return (cupsdCloseClient(con));
-             }
-             else
-              {
-               if (type == NULL)
-                 strcpy(line, "text/plain");
-               else
-                 snprintf(line, sizeof(line), "%s/%s", type->super, type->type);
+  if (con->pipe_pid)
+  {
+   /*
+    * Make sure we select on the CGI output...
+    */
 
-               if (!cupsdSendFile(con, HTTP_OK, filename, line, &filestats))
-                 return (cupsdCloseClient(con));
-             }
-           }
-            break;
+    cupsdAddSelect(con->file, (cupsd_selfunc_t)cupsdWritePipe, NULL, con);
 
-       case HTTP_POST_RECV :
-           /*
-           * See if the POST request includes a Content-Length field, and if
-           * so check the length against any limits that are set...
-           */
+    if (!con->file_ready)
+    {
+     /*
+      * Try again later when there is CGI output available...
+      */
 
-            cupsdLogMessage(CUPSD_LOG_DEBUG2, "POST %s", con->uri);
-           cupsdLogMessage(CUPSD_LOG_DEBUG2, "CONTENT_TYPE = %s",
-                           con->http.fields[HTTP_FIELD_CONTENT_TYPE]);
+      cupsdRemoveSelect(con->http.fd);
+      return;
+    }
 
-            if (con->http.fields[HTTP_FIELD_CONTENT_LENGTH][0] &&
-               MaxRequestSize > 0 &&
-               con->http.data_remaining > MaxRequestSize)
-           {
-            /*
-             * Request too large...
-             */
+    con->file_ready = 0;
+  }
 
-              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
-               return (cupsdCloseClient(con));
+  if (con->response)
+  {
+    ipp_state = ippWrite(HTTP(con), con->response);
+    bytes     = ipp_state != IPP_ERROR && ipp_state != IPP_DATA;
+  }
+  else if ((bytes = read(con->file, buf, sizeof(buf) - 1)) > 0)
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                    "cupsdWriteClient: Read %d bytes from file %d...",
+                    bytes, con->file);
 
-             break;
-            }
-           else if (con->http.data_remaining < 0)
-           {
-            /*
-             * Negative content lengths are invalid!
-             */
+    if (con->pipe_pid && !con->got_fields)
+    {
+     /*
+      * Inspect the data for Content-Type and other fields.
+      */
 
-              if (!cupsdSendError(con, HTTP_BAD_REQUEST))
-               return (cupsdCloseClient(con));
+      buf[bytes] = '\0';
 
-             break;
-           }
+      for (bufptr = buf; !con->got_fields && *bufptr; bufptr ++)
+        if (*bufptr == '\n')
+       {
+        /*
+         * Send line to client...
+         */
 
-           /*
-           * See what kind of POST request this is; for IPP requests the
-           * content-type field will be "application/ipp"...
+         if (bufptr > buf && bufptr[-1] == '\r')
+           bufptr[-1] = '\0';
+         *bufptr++ = '\0';
+
+          cupsdLogMessage(CUPSD_LOG_DEBUG2, "Script header: %s", buf);
+
+          if (!con->sent_header)
+         {
+          /*
+           * Handle redirection and CGI status codes...
            */
 
-           if (!strcmp(con->http.fields[HTTP_FIELD_CONTENT_TYPE],
-                       "application/ipp"))
-              con->request = ippNew();
-           else if ((!strncmp(con->uri, "/admin", 6) &&
-                     strncmp(con->uri, "/admin/conf/", 12) &&
-                     strncmp(con->uri, "/admin/log/", 11)) ||
-                    !strncmp(con->uri, "/printers", 9) ||
-                    !strncmp(con->uri, "/classes", 8) ||
-                    !strncmp(con->uri, "/help", 5) ||
-                    !strncmp(con->uri, "/jobs", 5))
+            if (!strncasecmp(buf, "Location:", 9))
            {
-            /*
-             * CGI request...
-             */
+             cupsdSendHeader(con, HTTP_SEE_OTHER, NULL);
+             con->sent_header = 2;
 
-              if (!strncmp(con->uri, "/admin", 6))
-             {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/admin.cgi",
-                               ServerBin);
+             if (httpPrintf(HTTP(con), "Content-Length: 0\r\n") < 0)
+               return;
+           }
+           else if (!strncasecmp(buf, "Status:", 7))
+           {
+             cupsdSendError(con, (http_status_t)atoi(buf + 7));
+             con->sent_header = 2;
+           }
+           else
+           {
+             cupsdSendHeader(con, HTTP_OK, NULL);
+             con->sent_header = 1;
 
-               if ((ptr = strchr(con->uri + 6, '?')) != NULL)
-                 cupsdSetStringf(&con->options, "admin%s", ptr);
-               else
-                 cupsdSetString(&con->options, "admin");
-             }
-              else if (!strncmp(con->uri, "/printers", 9))
-             {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/printers.cgi",
-                               ServerBin);
-               cupsdSetString(&con->options, con->uri + 9);
-             }
-             else if (!strncmp(con->uri, "/classes", 8))
-             {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/classes.cgi",
-                               ServerBin);
-               cupsdSetString(&con->options, con->uri + 8);
-             }
-             else if (!strncmp(con->uri, "/jobs", 5))
+             if (con->http.version == HTTP_1_1)
              {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/jobs.cgi",
-                               ServerBin);
-               cupsdSetString(&con->options, con->uri + 5);
-             }
-             else
-             {
-               cupsdSetStringf(&con->command, "%s/cgi-bin/help.cgi",
-                               ServerBin);
-               cupsdSetString(&con->options, con->uri + 5);
+               if (httpPrintf(HTTP(con), "Transfer-Encoding: chunked\r\n") < 0)
+                 return;
              }
+            }
+         }
+
+         if (strncasecmp(buf, "Status:", 7))
+           httpPrintf(HTTP(con), "%s\r\n", buf);
 
-             if (con->options[0] == '/')
-               _cups_strcpy(con->options, con->options + 1);
+         cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdWriteClient: %d %s",
+                         con->http.fd, buf);
+
+         /*
+         * Update buffer...
+         */
 
-              cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                             "cupsdReadClient: %d command=\"%s\", options = \"%s\"",
-                             con->http.fd, con->command, con->options);
+         bytes -= (bufptr - buf);
+         memmove(buf, bufptr, bytes + 1);
+         bufptr = buf - 1;
 
-             if (con->http.version <= HTTP_1_0)
-               con->http.keep_alive = HTTP_KEEPALIVE_OFF;
-           }
-           else
-           {
-            /*
-             * POST to a file...
-             */
+         /*
+         * See if the line was empty...
+         */
 
-              if ((filename = get_file(con, &filestats, buf,
-                                      sizeof(buf))) == NULL)
-             {
-               if (!cupsdSendError(con, HTTP_NOT_FOUND))
-                 return (cupsdCloseClient(con));
+         if (con->field_col == 0)
+         {
+           con->got_fields = 1;
 
-               break;
-             }
+            if (cupsdFlushHeader(con) < 0)
+           {
+             cupsdCloseClient(con);
+             return;
+           }
 
-             type = mimeFileType(MimeDatabase, filename, NULL, NULL);
+           if (con->http.version == HTTP_1_1)
+             con->http.data_encoding = HTTP_ENCODE_CHUNKED;
+          }
+         else
+           con->field_col = 0;
+       }
+       else if (*bufptr != '\r')
+         con->field_col ++;
 
-              if (!cupsdIsCGI(con, filename, &filestats, type))
-             {
-              /*
-               * Only POST to CGI's...
-               */
+      cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                      "cupsdWriteClient: %d bytes=%d, got_fields=%d",
+                      con->http.fd, bytes, con->got_fields);
 
-               if (!cupsdSendError(con, HTTP_UNAUTHORIZED))
-                 return (cupsdCloseClient(con));
-             }
-           }
-           break;
+      if (bytes > 0 && !con->got_fields)
+      {
+       /*
+        * Remaining text needs to go out...
+       */
 
-       case HTTP_PUT_RECV :
-          /*
-           * Validate the resource name...
-           */
+        httpPrintf(HTTP(con), "%s", buf);
 
-            if (strncmp(con->uri, "/admin/conf/", 12) ||
-               strchr(con->uri + 12, '/') ||
-               strlen(con->uri) == 12)
-           {
-            /*
-             * PUT can only be done to configuration files under
-             * /admin/conf...
-             */
+        con->http.activity = time(NULL);
+        return;
+      }
+      else if (bytes == 0)
+        con->http.activity = time(NULL);
+    }
 
-             if (!cupsdSendError(con, HTTP_FORBIDDEN))
-               return (cupsdCloseClient(con));
+    if (bytes > 0)
+    {
+      if (httpWrite2(HTTP(con), buf, bytes) < 0)
+      {
+       cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                       "cupsdWriteClient: %d Write of %d bytes failed!",
+                       con->http.fd, bytes);
 
-             break;
-           }
+       cupsdCloseClient(con);
+       return;
+      }
 
-           /*
-           * See if the PUT request includes a Content-Length field, and if
-           * so check the length against any limits that are set...
-           */
+      con->bytes += bytes;
 
-            cupsdLogMessage(CUPSD_LOG_DEBUG2, "PUT %s", con->uri);
-           cupsdLogMessage(CUPSD_LOG_DEBUG2, "CONTENT_TYPE = %s",
-                           con->http.fields[HTTP_FIELD_CONTENT_TYPE]);
+      if (con->http.state == HTTP_WAITING)
+       bytes = 0;
+    }
+  }
 
-            if (con->http.fields[HTTP_FIELD_CONTENT_LENGTH][0] &&
-               MaxRequestSize > 0 &&
-               con->http.data_remaining > MaxRequestSize)
-           {
-            /*
-             * Request too large...
-             */
+  if (bytes <= 0)
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdWriteClient: %d bytes < 0",
+                    con->http.fd);
 
-              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
-               return (cupsdCloseClient(con));
+    cupsdLogRequest(con, HTTP_OK);
 
-             break;
-            }
-           else if (con->http.data_remaining < 0)
-           {
-            /*
-             * Negative content lengths are invalid!
-             */
+    httpFlushWrite(HTTP(con));
 
-              if (!cupsdSendError(con, HTTP_BAD_REQUEST))
-               return (cupsdCloseClient(con));
+    if (con->http.data_encoding == HTTP_ENCODE_CHUNKED && con->sent_header == 1)
+    {
+      if (httpWrite2(HTTP(con), "", 0) < 0)
+      {
+        cupsdCloseClient(con);
+       return;
+      }
+    }
 
-             break;
-           }
+    con->http.state = HTTP_WAITING;
 
-           /*
-           * Open a temporary file to hold the request...
-           */
+    cupsdAddSelect(con->http.fd, (cupsd_selfunc_t)cupsdReadClient, NULL, con);
 
-            cupsdSetStringf(&con->filename, "%s/%08x", RequestRoot,
-                           request_id ++);
-           con->file = open(con->filename, O_WRONLY | O_CREAT | O_TRUNC, 0640);
+    if (con->file >= 0)
+    {
+      cupsdRemoveSelect(con->file);
 
-            cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                           "cupsdReadClient: %d REQUEST %s=%d", con->http.fd,
-                           con->filename, con->file);
+      if (con->pipe_pid)
+       cupsdEndProcess(con->pipe_pid, 0);
 
-           if (con->file < 0)
-           {
-             if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
-               return (cupsdCloseClient(con));
-           }
+      cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                      "cupsdWriteClient: %d Closing data file %d.",
+                      con->http.fd, con->file);
 
-           fchmod(con->file, 0640);
-           fchown(con->file, RunUser, Group);
-           fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
-           break;
+      close(con->file);
+      con->file     = -1;
+      con->pipe_pid = 0;
+    }
 
-       case HTTP_DELETE :
-       case HTTP_TRACE :
-            cupsdSendError(con, HTTP_NOT_IMPLEMENTED);
-           return (cupsdCloseClient(con));
+    if (con->filename)
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                      "cupsdWriteClient: %d Removing temp file %s",
+                      con->http.fd, con->filename);
+      unlink(con->filename);
+      cupsdClearString(&con->filename);
+    }
 
-       case HTTP_HEAD :
-            if (!strncmp(con->uri, "/printers/", 10) &&
-               !strcmp(con->uri + strlen(con->uri) - 4, ".ppd"))
-           {
-            /*
-             * Send PPD file - get the real printer name since printer
-             * names are not case sensitive but filenames can be...
-             */
+    if (con->request)
+    {
+      ippDelete(con->request);
+      con->request = NULL;
+    }
 
-              con->uri[strlen(con->uri) - 4] = '\0';   /* Drop ".ppd" */
+    if (con->response)
+    {
+      ippDelete(con->response);
+      con->response = NULL;
+    }
 
-              if ((p = cupsdFindPrinter(con->uri + 10)) != NULL)
-               snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
-             else
-             {
-               if (!cupsdSendError(con, HTTP_NOT_FOUND))
-                 return (cupsdCloseClient(con));
+    cupsdClearString(&con->command);
+    cupsdClearString(&con->options);
+    cupsdClearString(&con->query_string);
 
-               break;
-             }
-           }
+    if (!con->http.keep_alive)
+    {
+      cupsdCloseClient(con);
+      return;
+    }
+  }
 
-           if ((!strncmp(con->uri, "/admin", 6) &&
-                strncmp(con->uri, "/admin/conf/", 12) &&
-                strncmp(con->uri, "/admin/log/", 11)) ||
-               !strncmp(con->uri, "/printers", 9) ||
-               !strncmp(con->uri, "/classes", 8) ||
-               !strncmp(con->uri, "/help", 5) ||
-               !strncmp(con->uri, "/jobs", 5))
-           {
-            /*
-             * CGI output...
-             */
+  con->http.activity = time(NULL);
+}
 
-              if (!cupsdSendHeader(con, HTTP_OK, "text/html"))
-               return (cupsdCloseClient(con));
 
-             if (httpPrintf(HTTP(con), "\r\n") < 0)
-               return (cupsdCloseClient(con));
+/*
+ * 'cupsdWritePipe()' - Flag that data is available on the CGI pipe.
+ */
 
-              cupsdLogRequest(con, HTTP_OK);
-           }
-            else if ((!strncmp(con->uri, "/admin/conf/", 12) &&
-                     (strchr(con->uri + 12, '/') ||
-                      strlen(con->uri) == 12)) ||
-                    (!strncmp(con->uri, "/admin/log/", 11) &&
-                     (strchr(con->uri + 11, '/') ||
-                      strlen(con->uri) == 11)))
-           {
-            /*
-             * HEAD can only be done to configuration files under
-             * /admin/conf...
-             */
+void
+cupsdWritePipe(cupsd_client_t *con)    /* I - Client connection */
+{
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdWritePipe: CGI output on fd %d...",
+                  con->file);
 
-             if (!cupsdSendError(con, HTTP_FORBIDDEN))
-               return (cupsdCloseClient(con));
+  con->file_ready = 1;
 
-             break;
-           }
-           else if ((filename = get_file(con, &filestats, buf,
-                                         sizeof(buf))) == NULL)
-           {
-             if (!cupsdSendHeader(con, HTTP_NOT_FOUND, "text/html"))
-               return (cupsdCloseClient(con));
+  cupsdRemoveSelect(con->file);
+  cupsdAddSelect(con->http.fd, NULL, (cupsd_selfunc_t)cupsdWriteClient, con);
+}
 
-              cupsdLogRequest(con, HTTP_NOT_FOUND);
-           }
-           else if (!check_if_modified(con, &filestats))
-            {
-              if (!cupsdSendError(con, HTTP_NOT_MODIFIED))
-               return (cupsdCloseClient(con));
 
-              cupsdLogRequest(con, HTTP_NOT_MODIFIED);
-           }
-           else
-           {
-            /*
-             * Serve a file...
-             */
+/*
+ * 'check_if_modified()' - Decode an "If-Modified-Since" line.
+ */
 
-             type = mimeFileType(MimeDatabase, filename, NULL, NULL);
-             if (type == NULL)
-               strcpy(line, "text/plain");
-             else
-               snprintf(line, sizeof(line), "%s/%s", type->super, type->type);
+static int                             /* O - 1 if modified since */
+check_if_modified(
+    cupsd_client_t *con,               /* I - Client connection */
+    struct stat    *filestats)         /* I - File information */
+{
+  char         *ptr;                   /* Pointer into field */
+  time_t       date;                   /* Time/date value */
+  off_t                size;                   /* Size/length value */
 
-              if (!cupsdSendHeader(con, HTTP_OK, line))
-               return (cupsdCloseClient(con));
 
-             if (httpPrintf(HTTP(con), "Last-Modified: %s\r\n",
-                            httpGetDateString(filestats.st_mtime)) < 0)
-               return (cupsdCloseClient(con));
+  size = 0;
+  date = 0;
+  ptr  = con->http.fields[HTTP_FIELD_IF_MODIFIED_SINCE];
 
-             if (httpPrintf(HTTP(con), "Content-Length: %lu\r\n",
-                            (unsigned long)filestats.st_size) < 0)
-               return (cupsdCloseClient(con));
+  if (*ptr == '\0')
+    return (1);
 
-              cupsdLogRequest(con, HTTP_OK);
-           }
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "check_if_modified: %d If-Modified-Since=\"%s\"",
+                  con->http.fd, ptr);
 
-            if (httpPrintf(HTTP(con), "\r\n") < 0)
-             return (cupsdCloseClient(con));
+  while (*ptr != '\0')
+  {
+    while (isspace(*ptr) || *ptr == ';')
+      ptr ++;
 
-            con->http.state = HTTP_WAITING;
-            break;
+    if (strncasecmp(ptr, "length=", 7) == 0)
+    {
+      ptr += 7;
+      size = strtoll(ptr, NULL, 10);
 
-       default :
-            break; /* Anti-compiler-warning-code */
-      }
+      while (isdigit(*ptr))
+        ptr ++;
+    }
+    else if (isalpha(*ptr))
+    {
+      date = httpGetDateTime(ptr);
+      while (*ptr != '\0' && *ptr != ';')
+        ptr ++;
     }
+    else
+      ptr ++;
   }
 
- /*
-  * Handle any incoming data...
-  */
-
-  switch (con->http.state)
-  {
-    case HTTP_PUT_RECV :
-        cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                       "cupsdReadClient: %d con->data_encoding=HTTP_ENCODE_%s, "
-                       "con->data_remaining=" CUPS_LLFMT ", con->file=%d",
-                       con->http.fd,
-                       con->http.data_encoding == HTTP_ENCODE_CHUNKED ?
-                           "CHUNKED" : "LENGTH",
-                       CUPS_LLCAST con->http.data_remaining, con->file);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "check_if_modified: %d sizes=" CUPS_LLFMT ","
+                 CUPS_LLFMT " dates=%d,%d",
+                  con->http.fd, CUPS_LLCAST size,
+                 CUPS_LLCAST filestats->st_size, (int)date,
+                 (int)filestats->st_mtime);
 
-        if ((bytes = httpRead2(HTTP(con), line, sizeof(line))) < 0)
-         return (cupsdCloseClient(con));
-       else if (bytes > 0)
-       {
-         con->bytes += bytes;
+  return ((size != filestats->st_size && size != 0) ||
+          (date < filestats->st_mtime && date != 0) ||
+         (size == 0 && date == 0));
+}
 
-          cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                         "cupsdReadClient: %d writing %d bytes to %d",
-                         con->http.fd, bytes, con->file);
 
-          if (write(con->file, line, bytes) < bytes)
-         {
-            cupsdLogMessage(CUPSD_LOG_ERROR,
-                           "cupsdReadClient: Unable to write %d bytes to %s: %s",
-                           bytes, con->filename, strerror(errno));
+#ifdef HAVE_SSL
+/*
+ * 'encrypt_client()' - Enable encryption for the client...
+ */
 
-           cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                           "cupsdReadClient: Closing data file %d...",
-                           con->file);
+static int                             /* O - 1 on success, 0 on error */
+encrypt_client(cupsd_client_t *con)    /* I - Client to encrypt */
+{
+#  ifdef HAVE_LIBSSL
+  SSL_CTX      *context;               /* Context for encryption */
+  SSL          *conn;                  /* Connection for encryption */
+  BIO          *bio;                   /* BIO data */
+  unsigned long        error;                  /* Error code */
 
-           close(con->file);
-           con->file = -1;
-           unlink(con->filename);
-           cupsdClearString(&con->filename);
 
-            if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
-             return (cupsdCloseClient(con));
-         }
-       }
+ /*
+  * Verify that we have a certificate...
+  */
 
-        if (con->http.state == HTTP_WAITING)
-       {
-        /*
-         * End of file, see how big it is...
-         */
+  if (access(ServerKey, 0) || access(ServerCertificate, 0))
+  {
+   /*
+    * Nope, make a self-signed certificate...
+    */
 
-         fstat(con->file, &filestats);
+    if (!make_certificate(con))
+      return (0);
+  }
 
-          cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                         "cupsdReadClient: %d Closing data file %d, size="
-                         CUPS_LLFMT ".",
-                          con->http.fd, con->file,
-                         CUPS_LLCAST filestats.st_size);
+ /*
+  * Create the SSL context and accept the connection...
+  */
 
-         close(con->file);
-         con->file = -1;
+  context = SSL_CTX_new(SSLv23_server_method());
 
-          if (filestats.st_size > MaxRequestSize &&
-             MaxRequestSize > 0)
-         {
-          /*
-           * Request is too big; remove it and send an error...
-           */
+  SSL_CTX_set_options(context, SSL_OP_NO_SSLv2); /* Only use SSLv3 or TLS */
+  SSL_CTX_use_PrivateKey_file(context, ServerKey, SSL_FILETYPE_PEM);
+  SSL_CTX_use_certificate_file(context, ServerCertificate, SSL_FILETYPE_PEM);
 
-            cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                           "cupsdReadClient: %d Removing temp file %s",
-                           con->http.fd, con->filename);
-           unlink(con->filename);
-           cupsdClearString(&con->filename);
+  bio = BIO_new(_httpBIOMethods());
+  BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)HTTP(con));
 
-            if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
-             return (cupsdCloseClient(con));
-         }
+  conn = SSL_new(context);
+  SSL_set_bio(conn, bio, bio);
 
-         /*
-         * Install the configuration file...
-         */
+  if (SSL_accept(conn) != 1)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "encrypt_client: Unable to encrypt connection from %s!",
+                    con->http.hostname);
 
-          status = install_conf_file(con);
+    while ((error = ERR_get_error()) != 0)
+      cupsdLogMessage(CUPSD_LOG_ERROR, "encrypt_client: %s",
+                      ERR_error_string(error, NULL));
 
-         /*
-         * Return the status to the client...
-         */
+    SSL_CTX_free(context);
+    SSL_free(conn);
+    return (0);
+  }
 
-          if (!cupsdSendError(con, status))
-           return (cupsdCloseClient(con));
-       }
-        break;
+  cupsdLogMessage(CUPSD_LOG_DEBUG,
+                  "encrypt_client: %d Connection from %s now encrypted.",
+                  con->http.fd, con->http.hostname);
 
-    case HTTP_POST_RECV :
-        cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                       "cupsdReadClient: %d con->data_encoding=HTTP_ENCODE_"
-                       "%s, con->data_remaining=" CUPS_LLFMT ", con->file=%d",
-                       con->http.fd,
-                       con->http.data_encoding == HTTP_ENCODE_CHUNKED ?
-                           "CHUNKED" : "LENGTH",
-                       CUPS_LLCAST con->http.data_remaining, con->file);
+  con->http.tls = conn;
+  return (1);
 
-        if (con->request != NULL)
-       {
-        /*
-         * Grab any request data from the connection...
-         */
+#  elif defined(HAVE_GNUTLS)
+  http_tls_t   *conn;                  /* TLS session object */
+  int          error;                  /* Error code */
+  gnutls_certificate_server_credentials *credentials;
+                                       /* TLS credentials */
 
-         if ((ipp_state = ippRead(&(con->http), con->request)) == IPP_ERROR)
-         {
-            cupsdLogMessage(CUPSD_LOG_ERROR,
-                           "cupsdReadClient: %d IPP Read Error!",
-                           con->http.fd);
 
-           cupsdSendError(con, HTTP_BAD_REQUEST);
-           return (cupsdCloseClient(con));
-         }
-         else if (ipp_state != IPP_DATA)
-         {
-            if (con->http.state == HTTP_POST_SEND)
-           {
-             cupsdSendError(con, HTTP_BAD_REQUEST);
-             return (cupsdCloseClient(con));
-           }
+ /*
+  * Verify that we have a certificate...
+  */
 
-           break;
-          }
-         else
-           con->bytes += ippLength(con->request);
-       }
+  if (access(ServerKey, 0) || access(ServerCertificate, 0))
+  {
+   /*
+    * Nope, make a self-signed certificate...
+    */
 
-        if (con->file < 0 && con->http.state != HTTP_POST_SEND)
-       {
-         /*
-         * Create a file as needed for the request data...
-         */
+    if (!make_certificate(con))
+      return (0);
+  }
 
-          cupsdSetStringf(&con->filename, "%s/%08x", RequestRoot, request_id ++);
-         con->file = open(con->filename, O_WRONLY | O_CREAT | O_TRUNC, 0640);
+ /*
+  * Create the SSL object and perform the SSL handshake...
+  */
 
-          cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %d REQUEST %s=%d", con->http.fd,
-                         con->filename, con->file);
+  conn = (http_tls_t *)malloc(sizeof(http_tls_t));
 
-         if (con->file < 0)
-         {
-           if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
-             return (cupsdCloseClient(con));
-         }
+  if (conn == NULL)
+    return (0);
 
-         fchmod(con->file, 0640);
-         fchown(con->file, RunUser, Group);
-          fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
-       }
+  credentials = (gnutls_certificate_server_credentials *)
+                    malloc(sizeof(gnutls_certificate_server_credentials));
+  if (credentials == NULL)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "encrypt_client: Unable to encrypt connection from %s!",
+                    con->http.hostname);
+    cupsdLogMessage(CUPSD_LOG_ERROR, "encrypt_client: %s", strerror(errno));
 
-       if (con->http.state != HTTP_POST_SEND)
-       {
-          if ((bytes = httpRead2(HTTP(con), line, sizeof(line))) < 0)
-           return (cupsdCloseClient(con));
-         else if (bytes > 0)
-         {
-           con->bytes += bytes;
+    free(conn);
+    return (0);
+  }
 
-            cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                           "cupsdReadClient: %d writing %d bytes to %d",
-                           con->http.fd, bytes, con->file);
+  gnutls_certificate_allocate_credentials(credentials);
+  gnutls_certificate_set_x509_key_file(*credentials, ServerCertificate,
+                                      ServerKey, GNUTLS_X509_FMT_PEM);
 
-            if (write(con->file, line, bytes) < bytes)
-           {
-              cupsdLogMessage(CUPSD_LOG_ERROR,
-                             "cupsdReadClient: Unable to write %d bytes to %s: %s",
-                             bytes, con->filename, strerror(errno));
+  gnutls_init(&(conn->session), GNUTLS_SERVER);
+  gnutls_set_default_priority(conn->session);
+  gnutls_credentials_set(conn->session, GNUTLS_CRD_CERTIFICATE, *credentials);
+  gnutls_transport_set_ptr(conn->session, (gnutls_transport_ptr)HTTP(con));
+  gnutls_transport_set_pull_function(conn->session, _httpReadGNUTLS);
+  gnutls_transport_set_push_function(conn->session, _httpWriteGNUTLS);
 
-             cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                             "cupsdReadClient: Closing file %d...",
-                             con->file);
+  error = gnutls_handshake(conn->session);
 
-             close(con->file);
-             con->file = -1;
-             unlink(con->filename);
-             cupsdClearString(&con->filename);
+  if (error != GNUTLS_E_SUCCESS)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "encrypt_client: Unable to encrypt connection from %s!",
+                    con->http.hostname);
+    cupsdLogMessage(CUPSD_LOG_ERROR, "encrypt_client: %s",
+                    gnutls_strerror(error));
 
-              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
-               return (cupsdCloseClient(con));
-           }
-         }
-         else if (con->http.state == HTTP_POST_RECV)
-            return (1); /* ??? */
-         else if (con->http.state != HTTP_POST_SEND)
-           return (cupsdCloseClient(con));
-       }
+    gnutls_deinit(conn->session);
+    gnutls_certificate_free_credentials(*credentials);
+    free(conn);
+    free(credentials);
+    return (0);
+  }
 
-       if (con->http.state == HTTP_POST_SEND)
-       {
-         if (con->file >= 0)
-         {
-           fstat(con->file, &filestats);
+  cupsdLogMessage(CUPSD_LOG_DEBUG,
+                  "encrypt_client: %d Connection from %s now encrypted.",
+                  con->http.fd, con->http.hostname);
 
-            cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                           "cupsdReadClient: %d Closing data file %d, "
-                           "size=" CUPS_LLFMT ".",
-                            con->http.fd, con->file,
-                           CUPS_LLCAST filestats.st_size);
+  conn->credentials = credentials;
+  con->http.tls = conn;
+  return (1);
 
-           close(con->file);
-           con->file = -1;
+#  elif defined(HAVE_CDSASSL)
+  OSStatus     error;                  /* Error code */
+  http_tls_t   *conn;                  /* CDSA connection information */
 
-            if (filestats.st_size > MaxRequestSize &&
-               MaxRequestSize > 0)
-           {
-            /*
-             * Request is too big; remove it and send an error...
-             */
 
-              cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                             "cupsdReadClient: %d Removing temp file %s",
-                             con->http.fd, con->filename);
-             unlink(con->filename);
-             cupsdClearString(&con->filename);
+  if ((conn = (http_tls_t *)malloc(sizeof(http_tls_t))) == NULL)
+    return (0);
 
-             if (con->request)
-             {
-              /*
-               * Delete any IPP request data...
-               */
+  error            = 0;
+  conn->session    = NULL;
+  conn->certsArray = get_cdsa_certificate(con);
 
-               ippDelete(con->request);
-               con->request = NULL;
-              }
+  if (!conn->certsArray)
+  {
+   /*
+    * No keychain (yet), make a self-signed certificate...
+    */
 
-              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE))
-               return (cupsdCloseClient(con));
-           }
+    if (make_certificate(con))
+      conn->certsArray = get_cdsa_certificate(con);
+  }
 
-           if (con->command)
-           {
-             if (!cupsdSendCommand(con, con->command, con->options, 0))
-             {
-               if (!cupsdSendError(con, HTTP_NOT_FOUND))
-                 return (cupsdCloseClient(con));
-              }
-             else
-               cupsdLogRequest(con, HTTP_OK);
-            }
-         }
+  if (!conn->certsArray)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                   "encrypt_client: Could not find signing key in keychain "
+                   "\"%s\"", ServerCertificate);
+    error = errSSLBadCert; /* errSSLBadConfiguration is a better choice, but not available on 10.2.x */
+  }
 
-          if (con->request)
-           return (cupsdProcessIPPRequest(con));
-       }
-        break;
+  if (!error)
+    error = SSLNewContext(true, &conn->session);
 
-    default :
-        break; /* Anti-compiler-warning-code */
-  }
+  if (!error)
+    error = SSLSetIOFuncs(conn->session, _httpReadCDSA, _httpWriteCDSA);
 
-  if (!con->http.keep_alive && con->http.state == HTTP_WAITING)
-    return (cupsdCloseClient(con));
-  else
-    return (1);
-}
+  if (!error)
+    error = SSLSetProtocolVersionEnabled(conn->session, kSSLProtocol2, false);
 
+  if (!error)
+    error = SSLSetConnection(conn->session, HTTP(con));
 
-/*
- * 'cupsdSendCommand()' - Send output from a command via HTTP.
- */
+  if (!error)
+    error = SSLSetAllowsExpiredCerts(conn->session, true);
 
-int                                    /* O - 1 on success, 0 on failure */
-cupsdSendCommand(
-    cupsd_client_t *con,               /* I - Client connection */
-    char           *command,           /* I - Command to run */
-    char           *options,           /* I - Command-line options */
-    int            root)               /* I - Run as root? */
-{
-  int  fd;                             /* Standard input file descriptor */
+  if (!error)
+    error = SSLSetAllowsAnyRoot(conn->session, true);
 
+  if (!error)
+    error = SSLSetCertificate(conn->session, conn->certsArray);
 
-  if (con->filename)
-    fd = open(con->filename, O_RDONLY);
-  else
-    fd = open("/dev/null", O_RDONLY);
+  if (!error)
+  {
+   /*
+    * Perform SSL/TLS handshake
+    */
 
-  if (fd < 0)
+    while ((error = SSLHandshake(conn->session)) == errSSLWouldBlock)
+      usleep(1000);
+  }
+
+  if (error)
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s",
-                    con->http.fd, con->filename ? con->filename : "/dev/null",
-                   strerror(errno));
-    return (0);
-  }
+                    "encrypt_client: Unable to encrypt connection from %s!",
+                    con->http.hostname);
 
-  fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+    cupsdLogMessage(CUPSD_LOG_ERROR, "encrypt_client: %s (%d)",
+                    cssmErrorString(error), (int)error);
 
-  con->pipe_pid = pipe_command(con, fd, &(con->file), command, options, root);
+    con->http.error  = error;
+    con->http.status = HTTP_ERROR;
 
-  close(fd);
+    if (conn->session)
+      SSLDisposeContext(conn->session);
 
-  cupsdLogMessage(CUPSD_LOG_INFO, "Started \"%s\" (pid=%d)", command,
-                  con->pipe_pid);
+    if (conn->certsArray)
+      CFRelease(conn->certsArray);
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSendCommand: %d file=%d",
-                  con->http.fd, con->file);
+    free(conn);
 
-  if (con->pipe_pid == 0)
     return (0);
+  }
 
-  fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdSendCommand: Adding fd %d to InputSet...", con->file);
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdSendCommand: Adding fd %d to OutputSet...",
-                  con->http.fd);
-
-  FD_SET(con->file, InputSet);
-  FD_SET(con->http.fd, OutputSet);
-
-  con->sent_header = 0;
-  con->file_ready  = 0;
-  con->got_fields  = 0;
-  con->field_col   = 0;
+  cupsdLogMessage(CUPSD_LOG_DEBUG,
+                  "encrypt_client: %d Connection from %s now encrypted.",
+                  con->http.fd, con->http.hostname);
 
+  con->http.tls = conn;
   return (1);
+
+#  endif /* HAVE_LIBSSL */
 }
+#endif /* HAVE_SSL */
 
 
+#ifdef HAVE_CDSASSL
 /*
- * 'cupsdSendError()' - Send an error message via HTTP.
+ * 'get_cdsa_certificate()' - Get a SSL/TLS certificate from the System keychain.
  */
 
-int                                    /* O - 1 if successful, 0 otherwise */
-cupsdSendError(cupsd_client_t *con,    /* I - Connection */
-               http_status_t  code)    /* I - Error code */
+static CFArrayRef                              /* O - Array of certificates */
+get_cdsa_certificate(cupsd_client_t *con)      /* I - Client connection */
 {
- /*
-  * Put the request in the access_log file...
-  */
+  OSStatus             err;            /* Error info */
+  SecKeychainRef       keychain;       /* Keychain reference */
+  SecIdentitySearchRef search;         /* Search reference */
+  SecIdentityRef       identity;       /* Identity */
+  CFArrayRef           certificates = NULL;
+                                       /* Certificate array */
 
-  cupsdLogRequest(con, code);
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSendError: %d code=%d (%s)",
-                  con->http.fd, code, httpStatus(code));
+  if ((err = SecKeychainOpen(ServerCertificate, &keychain)))
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot open keychain \"%s\", %s",
+                   ServerCertificate, cssmErrorString(err));
+    return (NULL);
+  }
 
+#  if HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY
  /*
-  * To work around bugs in some proxies, don't use Keep-Alive for some
-  * error messages...
+  * Use a policy to search for valid certificates who's common name matches the
+  * servername...
   */
 
-  if (code >= HTTP_BAD_REQUEST)
-    con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+  SecPolicySearchRef   policy_search;  /* Policy search ref */
+  SecPolicyRef         policy;         /* Policy ref */
+  CSSM_DATA            options;        /* Policy options */
+  CSSM_APPLE_TP_SSL_OPTIONS
+                       ssl_options;    /* SSL Option for hostname */
 
- /*
-  * Send an error message back to the client.  If the error code is a
-  * 400 or 500 series, make sure the message contains some text, too!
-  */
 
-  if (!cupsdSendHeader(con, code, NULL))
-    return (0);
+  if ((err = SecPolicySearchCreate(CSSM_CERT_X_509v3, &CSSMOID_APPLE_TP_SSL, 
+                             NULL, &policy_search)))
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create a policy search reference");
+    CFRelease(keychain);
+    return (NULL);
+  }
 
-#ifdef HAVE_SSL
-  if (code == HTTP_UPGRADE_REQUIRED)
-    if (httpPrintf(HTTP(con), "Connection: Upgrade\r\n") < 0)
-      return (0);
+  if ((err = SecPolicySearchCopyNext(policy_search, &policy)))
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR, 
+                   "Cannot find a policy to use for searching");
+    CFRelease(keychain);
+    CFRelease(policy_search);
+    return (NULL);
+  }
 
-  if (httpPrintf(HTTP(con), "Upgrade: TLS/1.0,HTTP/1.1\r\n") < 0)
-    return (0);
-#endif /* HAVE_SSL */
+  memset(&ssl_options, 0, sizeof(ssl_options));
+  ssl_options.Version = CSSM_APPLE_TP_SSL_OPTS_VERSION;
+  ssl_options.ServerName = con->servername;
+  ssl_options.ServerNameLen = strlen(con->servername);
+
+  options.Data = (uint8 *)&ssl_options;
+  options.Length = sizeof(ssl_options);
 
-  if ((con->http.version >= HTTP_1_1 && !con->http.keep_alive) ||
-      (code >= HTTP_BAD_REQUEST && code != HTTP_UPGRADE_REQUIRED))
+  if ((err = SecPolicySetValue(policy, &options)))
   {
-    if (httpPrintf(HTTP(con), "Connection: close\r\n") < 0)
-      return (0);
+    cupsdLogMessage(CUPSD_LOG_ERROR, 
+                   "Cannot set policy value to use for searching");
+    CFRelease(keychain);
+    CFRelease(policy_search);
+    return (NULL);
   }
 
-  if (code >= HTTP_BAD_REQUEST)
-  {
-   /*
-    * Send a human-readable error message.
-    */
+  err = SecIdentitySearchCreateWithPolicy(policy, NULL, CSSM_KEYUSE_SIGN,
+                                         keychain, FALSE, &search);
+#  else
+ /*
+  * Assume there is exactly one SecIdentity in the keychain...
+  */
 
-    char       message[1024];          /* Message for user */
-    const char *text;                  /* Status-specific text */
+  err = SecIdentitySearchCreate(keychain, CSSM_KEYUSE_SIGN, &search);
+#  endif /* HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */
 
-    if (code == HTTP_UNAUTHORIZED)
-      text = _cupsLangString(con->language,
-                             _("Enter your username and password or the "
-                              "root username and password to access this "
-                              "page."));
-    else if (code == HTTP_UPGRADE_REQUIRED)
-      text = _cupsLangString(con->language,
-                             _("You must use a https: URL to access this "
-                              "page."));
+  if (err)
+    cupsdLogMessage(CUPSD_LOG_DEBUG,
+                   "Cannot create keychain search reference: %s", 
+                   cssmErrorString(err));
+  else
+  {
+    if ((err = SecIdentitySearchCopyNext(search, &identity)))
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                       "Cannot find signing key in keychain \"%s\", error %d",
+                       ServerCertificate, (int)err);
+    }
     else
-      text = "";
+    {
+      if (CFGetTypeID(identity) != SecIdentityGetTypeID())
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "SecIdentitySearchCopyNext CFTypeID failure!");
+      else
+      {
+      if ((certificates = CFArrayCreate(NULL, (const void **)&identity, 
+                                     1, &kCFTypeArrayCallBacks)) == NULL)
+       cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create certificate array");
+      }
 
-    snprintf(message, sizeof(message),
-             "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" "
-            "\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n"
-            "<HTML>\n"
-            "<HEAD>\n"
-             "\t<META HTTP-EQUIV=\"Content-Type\" "
-            "CONTENT=\"text/html; charset=utf-8\">\n"
-            "\t<TITLE>%d %s</TITLE>\n"
-            "\t<LINK REL=\"STYLESHEET\" TYPE=\"text/css\" "
-            "HREF=\"/cups.css\">\n"
-            "</HEAD>\n"
-             "<BODY>\n"
-            "<H1>%d %s</H1>\n"
-            "<P>%s</P>\n"
-            "</BODY>\n"
-            "</HTML>\n",
-            code, httpStatus(code), code, httpStatus(code), text);
+      CFRelease(identity);
+    }
 
-    if (httpPrintf(HTTP(con), "Content-Type: text/html; charset=utf-8\r\n") < 0)
-      return (0);
-    if (httpPrintf(HTTP(con), "Content-Length: %d\r\n",
-                   (int)strlen(message)) < 0)
-      return (0);
-    if (httpPrintf(HTTP(con), "\r\n") < 0)
-      return (0);
-    if (httpPrintf(HTTP(con), "%s", message) < 0)
-      return (0);
+    CFRelease(search);
   }
-  else if (httpPrintf(HTTP(con), "\r\n") < 0)
-    return (0);
 
-  con->http.state = HTTP_WAITING;
+#  if HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY
+  CFRelease(policy);
+  CFRelease(policy_search);
+#  endif /* HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */
 
-  return (1);
+  return (certificates);
 }
+#endif /* HAVE_CDSASSL */
 
 
 /*
- * 'cupsdSendFile()' - Send a file via HTTP.
+ * 'get_file()' - Get a filename and state info.
  */
 
-int                                    /* O - 0 on failure, 1 on success */
-cupsdSendFile(cupsd_client_t *con,     /* I - Client connection */
-              http_status_t  code,     /* I - HTTP status */
-             char           *filename, /* I - Filename */
-             char           *type,     /* I - File type */
-             struct stat    *filestats)/* O - File information */
+static char *                          /* O  - Real filename */
+get_file(cupsd_client_t *con,          /* I  - Client connection */
+         struct stat    *filestats,    /* O  - File information */
+         char           *filename,     /* IO - Filename buffer */
+         int            len)           /* I  - Buffer length */
 {
-  con->file = open(filename, O_RDONLY);
+  int          status;                 /* Status of filesystem calls */
+  char         *ptr;                   /* Pointer info filename */
+  int          plen;                   /* Remaining length after pointer */
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSendFile: %d file=%d", con->http.fd,
-                  con->file);
 
-  if (con->file < 0)
-    return (0);
+ /*
+  * Figure out the real filename...
+  */
 
-  fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
+  if (!strncmp(con->uri, "/ppd/", 5))
+    snprintf(filename, len, "%s%s", ServerRoot, con->uri);
+  else if (!strncmp(con->uri, "/rss/", 5) && !strchr(con->uri + 5, '/'))
+    snprintf(filename, len, "%s/rss/%s", CacheDir, con->uri + 5);
+  else if (!strncmp(con->uri, "/admin/conf/", 12))
+    snprintf(filename, len, "%s%s", ServerRoot, con->uri + 11);
+  else if (!strncmp(con->uri, "/admin/log/", 11))
+  {
+    if (!strcmp(con->uri + 11, "access_log") && AccessLog[0] == '/')
+      strlcpy(filename, AccessLog, len);
+    else if (!strcmp(con->uri + 11, "error_log") && ErrorLog[0] == '/')
+      strlcpy(filename, ErrorLog, len);
+    else if (!strcmp(con->uri + 11, "page_log") && PageLog[0] == '/')
+      strlcpy(filename, PageLog, len);
+    else
+      return (NULL);
+  }
+  else if (con->language)
+    snprintf(filename, len, "%s/%s%s", DocumentRoot, con->language->language,
+             con->uri);
+  else
+    snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
 
-  con->pipe_pid = 0;
+  if ((ptr = strchr(filename, '?')) != NULL)
+    *ptr = '\0';
 
-  if (!cupsdSendHeader(con, code, type))
-    return (0);
+ /*
+  * Grab the status for this language; if there isn't a language-specific file
+  * then fallback to the default one...
+  */
 
-  if (httpPrintf(HTTP(con), "Last-Modified: %s\r\n",
-                 httpGetDateString(filestats->st_mtime)) < 0)
-    return (0);
-  if (httpPrintf(HTTP(con), "Content-Length: " CUPS_LLFMT "\r\n",
-                 CUPS_LLCAST filestats->st_size) < 0)
-    return (0);
-  if (httpPrintf(HTTP(con), "\r\n") < 0)
-    return (0);
+  if ((status = stat(filename, filestats)) != 0 && con->language &&
+      strncmp(con->uri, "/ppd/", 5) &&
+      strncmp(con->uri, "/admin/conf/", 12) &&
+      strncmp(con->uri, "/admin/log/", 11))
+  {
+   /*
+    * Drop the country code...
+    */
 
-  con->http.data_encoding  = HTTP_ENCODE_LENGTH;
-  con->http.data_remaining = filestats->st_size;
+    char       ll[3];                  /* Short language name */
 
-  if (con->http.data_remaining <= INT_MAX)
-    con->http._data_remaining = con->http.data_remaining;
-  else
-    con->http._data_remaining = INT_MAX;
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdSendFile: Adding fd %d to OutputSet...", con->http.fd);
+    strlcpy(ll, con->language->language, sizeof(ll));
+    snprintf(filename, len, "%s/%s%s", DocumentRoot, ll, con->uri);
 
-  FD_SET(con->http.fd, OutputSet);
+    if ((ptr = strchr(filename, '?')) != NULL)
+      *ptr = '\0';
 
-  return (1);
-}
+    if ((status = stat(filename, filestats)) != 0)
+    {
+     /*
+      * Drop the language prefix and try the root directory...
+      */
 
+      snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
 
-/*
- * 'cupsdSendHeader()' - Send an HTTP request.
- */
+      if ((ptr = strchr(filename, '?')) != NULL)
+       *ptr = '\0';
 
-int                                    /* O - 1 on success, 0 on failure */
-cupsdSendHeader(cupsd_client_t *con,   /* I - Client to send to */
-                http_status_t  code,   /* I - HTTP status code */
-               char           *type)   /* I - MIME type of document */
-{
-  if (httpPrintf(HTTP(con), "HTTP/%d.%d %d %s\r\n", con->http.version / 100,
-                 con->http.version % 100, code, httpStatus(code)) < 0)
-    return (0);
-  if (httpPrintf(HTTP(con), "Date: %s\r\n", httpGetDateString(time(NULL))) < 0)
-    return (0);
-  if (ServerHeader)
-    if (httpPrintf(HTTP(con), "Server: %s\r\n", ServerHeader) < 0)
-      return (0);
-  if (con->http.keep_alive && con->http.version >= HTTP_1_0)
-  {
-    if (httpPrintf(HTTP(con), "Connection: Keep-Alive\r\n") < 0)
-      return (0);
-    if (httpPrintf(HTTP(con), "Keep-Alive: timeout=%d\r\n",
-                   KeepAliveTimeout) < 0)
-      return (0);
+      status = stat(filename, filestats);
+    }
   }
-  if (code == HTTP_METHOD_NOT_ALLOWED)
-    if (httpPrintf(HTTP(con), "Allow: GET, HEAD, OPTIONS, POST\r\n") < 0)
-      return (0);
 
-  if (code == HTTP_UNAUTHORIZED)
+ /*
+  * If we're found a directory, get the index.html file instead...
+  */
+
+  if (!status && S_ISDIR(filestats->st_mode))
   {
-    int        auth_type;                      /* Authentication type */
+    if (filename[strlen(filename) - 1] != '/')
+      strlcat(filename, "/", len);
+
+    ptr  = filename + strlen(filename);
+    plen = len - (ptr - filename);
 
+    strlcpy(ptr, "index.html", plen);
+    status = stat(filename, filestats);
 
-    if (!con->best || con->best->type == AUTH_NONE)
-      auth_type = DefaultAuthType;
-    else
-      auth_type = con->best->type;
-      
-    if (auth_type != AUTH_DIGEST)
+#ifdef HAVE_JAVA
+    if (status)
     {
-      if (httpPrintf(HTTP(con),
-                     "WWW-Authenticate: Basic realm=\"CUPS\"\r\n") < 0)
-       return (0);
+      strlcpy(ptr, "index.class", plen);
+      status = stat(filename, filestats);
     }
-    else
+#endif /* HAVE_JAVA */
+
+#ifdef HAVE_PERL
+    if (status)
     {
-      if (httpPrintf(HTTP(con),
-                     "WWW-Authenticate: Digest realm=\"CUPS\", nonce=\"%s\"\r\n",
-                    con->http.hostname) < 0)
-       return (0);
+      strlcpy(ptr, "index.pl", plen);
+      status = stat(filename, filestats);
     }
-  }
+#endif /* HAVE_PERL */
 
-  if (con->language != NULL)
-  {
-    if (httpPrintf(HTTP(con), "Content-Language: %s\r\n",
-                   con->language->language) < 0)
-      return (0);
-  }
+#ifdef HAVE_PHP
+    if (status)
+    {
+      strlcpy(ptr, "index.php", plen);
+      status = stat(filename, filestats);
+    }
+#endif /* HAVE_PHP */
 
-  if (type != NULL)
-  {
-    if (!strcmp(type, "text/html"))
+#ifdef HAVE_PYTHON
+    if (status)
     {
-      if (httpPrintf(HTTP(con),
-                     "Content-Type: text/html; charset=utf-8\r\n") < 0)
-        return (0);
+      strlcpy(ptr, "index.pyc", plen);
+      status = stat(filename, filestats);
     }
-    else if (httpPrintf(HTTP(con), "Content-Type: %s\r\n", type) < 0)
-      return (0);
+
+    if (status)
+    {
+      strlcpy(ptr, "index.py", plen);
+      status = stat(filename, filestats);
+    }
+#endif /* HAVE_PYTHON */
   }
 
-  return (1);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_file: %d filename=%s size=%d",
+                  con->http.fd, filename,
+                 status ? -1 : (int)filestats->st_size);
+
+  if (!status)
+    con->http.data_remaining = (int)filestats->st_size;
+
+  if (status)
+    return (NULL);
+  else
+    return (filename);
 }
 
 
 /*
- * 'cupsdUpdateCGI()' - Read status messages from CGI scripts and programs.
+ * 'install_conf_file()' - Install a configuration file.
  */
 
-void
-cupsdUpdateCGI(void)
+static http_status_t                   /* O - Status */
+install_conf_file(cupsd_client_t *con) /* I - Connection */
 {
-  char         *ptr,                   /* Pointer to end of line in buffer */
-               message[1024];          /* Pointer to message text */
-  int          loglevel;               /* Log level for message */
+  cups_file_t  *in,                    /* Input file */
+               *out;                   /* Output file */
+  char         buffer[1024];           /* Copy buffer */
+  int          bytes;                  /* Number of bytes */
+  char         conffile[1024],         /* Configuration filename */
+               newfile[1024],          /* New config filename */
+               oldfile[1024];          /* Old config filename */
+  struct stat  confinfo;               /* Config file info */
 
 
-  while ((ptr = cupsdStatBufUpdate(CGIStatusBuffer, &loglevel,
-                                   message, sizeof(message))) != NULL)
-    if (!strchr(CGIStatusBuffer->buffer, '\n'))
-      break;
+ /*
+  * First construct the filenames...
+  */
+
+  snprintf(conffile, sizeof(conffile), "%s%s", ServerRoot, con->uri + 11);
+  snprintf(newfile, sizeof(newfile), "%s%s.N", ServerRoot, con->uri + 11);
+  snprintf(oldfile, sizeof(oldfile), "%s%s.O", ServerRoot, con->uri + 11);
+
+  cupsdLogMessage(CUPSD_LOG_INFO, "Installing config file \"%s\"...", conffile);
+
+ /*
+  * Get the owner, group, and permissions of the configuration file.
+  * If it doesn't exist, assign it to the User and Group in the
+  * cupsd.conf file with mode 0640 permissions.
+  */
 
-  if (ptr == NULL && errno)
+  if (stat(conffile, &confinfo))
   {
-   /*
-    * Fatal error on pipe - should never happen!
-    */
+    confinfo.st_uid  = User;
+    confinfo.st_gid  = Group;
+    confinfo.st_mode = ConfigFilePerm;
+  }
 
-    cupsdLogMessage(CUPSD_LOG_CRIT,
-                    "cupsdUpdateCGI: error reading from CGI error pipe - %s",
-                    strerror(errno));
+ /*
+  * Open the request file and new config file...
+  */
+
+  if ((in = cupsFileOpen(con->filename, "rb")) == NULL)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open request file \"%s\" - %s",
+                    con->filename, strerror(errno));
+    return (HTTP_SERVER_ERROR);
+  }
+
+  if ((out = cupsFileOpen(newfile, "wb")) == NULL)
+  {
+    cupsFileClose(in);
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open config file \"%s\" - %s",
+                    newfile, strerror(errno));
+    return (HTTP_SERVER_ERROR);
   }
-}
 
+  fchmod(cupsFileNumber(out), confinfo.st_mode);
+  fchown(cupsFileNumber(out), confinfo.st_uid, confinfo.st_gid);
 
-/*
* 'cupsdWriteClient()' - Write data to a client as needed.
- */
+ /*
 * Copy from the request to the new config file...
 */
 
-int                                    /* O - 1 if success, 0 if fail */
-cupsdWriteClient(cupsd_client_t *con)  /* I - Client connection */
-{
-  int          bytes;                  /* Number of bytes written */
-  char         buf[16385];             /* Data buffer */
-  char         *bufptr;                /* Pointer into buffer */
-  ipp_state_t  ipp_state;              /* IPP state value */
+  while ((bytes = cupsFileRead(in, buffer, sizeof(buffer))) > 0)
+    if (cupsFileWrite(out, buffer, bytes) < bytes)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to copy to config file \"%s\" - %s",
+                     newfile, strerror(errno));
 
+      cupsFileClose(in);
+      cupsFileClose(out);
+      unlink(newfile);
 
-#ifdef DEBUG
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdWriteClient(con=%p) %d response=%p, file=%d "
-                 "pipe_pid=%d state=%d",
-                  con, con->http.fd, con->response, con->file, con->pipe_pid,
-                 con->http.state);
-#endif /* DEBUG */
+      return (HTTP_SERVER_ERROR);
+    }
 
-  if (con->http.state != HTTP_GET_SEND &&
-      con->http.state != HTTP_POST_SEND)
-    return (1);
+ /*
+  * Close the files...
+  */
 
-  if (con->response != NULL)
+  cupsFileClose(in);
+  if (cupsFileClose(out))
   {
-    ipp_state = ippWrite(&(con->http), con->response);
-    bytes     = ipp_state != IPP_ERROR && ipp_state != IPP_DATA;
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "Error file closing config file \"%s\" - %s",
+                    newfile, strerror(errno));
+
+    unlink(newfile);
+
+    return (HTTP_SERVER_ERROR);
   }
-  else if ((bytes = read(con->file, buf, sizeof(buf) - 1)) > 0)
-  {
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdWriteClient: Read %d bytes from file %d...",
-                    bytes, con->file);
 
-    if (con->pipe_pid && !con->got_fields)
+ /*
+  * Remove the request file...
+  */
+
+  unlink(con->filename);
+  cupsdClearString(&con->filename);
+
+ /*
+  * Unlink the old backup, rename the current config file to the backup
+  * filename, and rename the new config file to the config file name...
+  */
+
+  if (unlink(oldfile))
+    if (errno != ENOENT)
     {
-     /*
-      * Inspect the data for Content-Type and other fields.
-      */
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to remove backup config file \"%s\" - %s",
+                     oldfile, strerror(errno));
 
-      buf[bytes] = '\0';
+      unlink(newfile);
 
-      for (bufptr = buf; !con->got_fields && *bufptr; bufptr ++)
-        if (*bufptr == '\n')
-       {
-        /*
-         * Send line to client...
-         */
+      return (HTTP_SERVER_ERROR);
+    }
 
-         if (bufptr > buf && bufptr[-1] == '\r')
-           bufptr[-1] = '\0';
-         *bufptr++ = '\0';
+  if (rename(conffile, oldfile))
+    if (errno != ENOENT)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to rename old config file \"%s\" - %s",
+                     conffile, strerror(errno));
 
-          cupsdLogMessage(CUPSD_LOG_DEBUG2, "Script header: %s", buf);
+      unlink(newfile);
 
-          if (!con->sent_header)
-         {
-          /*
-           * Handle redirection and CGI status codes...
-           */
+      return (HTTP_SERVER_ERROR);
+    }
 
-            if (!strncasecmp(buf, "Location:", 9))
-             cupsdSendHeader(con, HTTP_SEE_OTHER, NULL);
-           else if (!strncasecmp(buf, "Status:", 7))
-             cupsdSendHeader(con, atoi(buf + 7), NULL);
-           else
-             cupsdSendHeader(con, HTTP_OK, NULL);
+  if (rename(newfile, conffile))
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "Unable to rename new config file \"%s\" - %s",
+                    newfile, strerror(errno));
 
-           if (con->http.version == HTTP_1_1)
-           {
-             con->http.data_encoding = HTTP_ENCODE_CHUNKED;
+    rename(oldfile, conffile);
+    unlink(newfile);
 
-             if (httpPrintf(HTTP(con), "Transfer-Encoding: chunked\r\n") < 0)
-               return (0);
-           }
+    return (HTTP_SERVER_ERROR);
+  }
 
-           con->sent_header = 1;
-         }
+ /*
+  * If the cupsd.conf file was updated, set the NeedReload flag...
+  */
 
-         if (strncasecmp(buf, "Status:", 7))
-           httpPrintf(HTTP(con), "%s\r\n", buf);
+  if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+    NeedReload = RELOAD_CUPSD;
+  else
+    NeedReload = RELOAD_ALL;
 
-         cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdWriteClient: %d %s",
-                         con->http.fd, buf);
+  ReloadTime = time(NULL);
 
        /*
-         * Update buffer...
-         */
+ /*
+  * Return that the file was created successfully...
+  */
 
-         bytes -= (bufptr - buf);
-         memmove(buf, bufptr, bytes + 1);
-         bufptr = buf - 1;
+  return (HTTP_CREATED);
+}
 
-         /*
-         * See if the line was empty...
-         */
 
-         if (con->field_col == 0)
-           con->got_fields = 1;
-         else
-           con->field_col = 0;
-       }
-       else if (*bufptr != '\r')
-         con->field_col ++;
+/*
+ * 'is_cgi()' - Is the resource a CGI script/program?
+ */
 
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdWriteClient: %d bytes=%d, got_fields=%d",
-                      con->http.fd, bytes, con->got_fields);
+static int                             /* O - 1 = CGI, 0 = file */
+is_cgi(cupsd_client_t *con,            /* I - Client connection */
+       const char     *filename,       /* I - Real filename */
+       struct stat    *filestats,      /* I - File information */
+       mime_type_t    *type)           /* I - MIME type */
+{
+  const char   *options;               /* Options on URL */
 
-      if (bytes > 0 && !con->got_fields)
-      {
-       /*
-        * Remaining text needs to go out...
-       */
 
-        httpPrintf(HTTP(con), "%s", buf);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "is_cgi(con=%p, filename=\"%s\", filestats=%p, type=%s/%s)\n",
+                 con, filename, filestats, type ? type->super : "unknown",
+                 type ? type->type : "unknown");
 
-        con->http.activity = time(NULL);
-        return (1);
-      }
-      else if (bytes == 0)
-      {
-        con->http.activity = time(NULL);
-        return (1);
-      }
-    }
+ /*
+  * Get the options, if any...
+  */
 
-    if (httpWrite2(HTTP(con), buf, bytes) < 0)
-    {
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdWriteClient: %d Write of %d bytes failed!",
-                      con->http.fd, bytes);
+  if ((options = strchr(con->uri, '?')) != NULL)
+  {
+    options ++;
 
-      cupsdCloseClient(con);
-      return (0);
-    }
+    if (strchr(options, '='))
+      cupsdSetStringf(&(con->query_string), "QUERY_STRING=%s", options);
+  }
 
-    con->bytes += bytes;
+ /*
+  * Check for known types...
+  */
 
-    if (con->http.state == HTTP_WAITING)
-      bytes = 0;
+  if (!type || strcasecmp(type->super, "application"))
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG2, "is_cgi: Returning 0...");
+    return (0);
   }
 
-  if (bytes <= 0)
+  if (!strcasecmp(type->type, "x-httpd-cgi") &&
+      (filestats->st_mode & 0111))
   {
-    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdWriteClient: %d bytes < 0",
-                    con->http.fd);
-
-    cupsdLogRequest(con, HTTP_OK);
+   /*
+    * "application/x-httpd-cgi" is a CGI script.
+    */
 
-    httpFlushWrite(HTTP(con));
+    cupsdSetString(&con->command, filename);
 
-    if (con->http.data_encoding == HTTP_ENCODE_CHUNKED)
-    {
-      if (httpPrintf(HTTP(con), "0\r\n\r\n") < 0)
-      {
-        cupsdCloseClient(con);
-       return (0);
-      }
-    }
+    filename = strrchr(filename, '/') + 1; /* Filename always absolute */
 
-    con->http.state = HTTP_WAITING;
+    cupsdSetString(&con->options, options);
 
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdWriteClient: Removing fd %d from OutputSet...",
-                    con->http.fd);
+                    "is_cgi: Returning 1 with command=\"%s\" and options=\"%s\"",
+                    con->command, con->options);
 
-    FD_CLR(con->http.fd, OutputSet);
+    return (1);
+  }
+#ifdef HAVE_JAVA
+  else if (!strcasecmp(type->type, "x-httpd-java"))
+  {
+   /*
+    * "application/x-httpd-java" is a Java servlet.
+    */
 
-    if (con->file >= 0)
-    {
-      if (FD_ISSET(con->file, InputSet))
-      {
-       cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                       "cupsdWriteClient: Removing fd %d from InputSet...",
-                        con->file);
-       FD_CLR(con->file, InputSet);
-      }
+    cupsdSetString(&con->command, CUPS_JAVA);
 
-      if (con->pipe_pid)
-       cupsdEndProcess(con->pipe_pid, 0);
+    if (options)
+      cupsdSetStringf(&con->options, "%s %s", filename, options);
+    else
+      cupsdSetString(&con->options, filename);
 
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdWriteClient: %d Closing data file %d.",
-                      con->http.fd, con->file);
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                    "is_cgi: Returning 1 with command=\"%s\" and options=\"%s\"",
+                    con->command, con->options);
 
-      close(con->file);
-      con->file     = -1;
-      con->pipe_pid = 0;
-    }
+    return (1);
+  }
+#endif /* HAVE_JAVA */
+#ifdef HAVE_PERL
+  else if (!strcasecmp(type->type, "x-httpd-perl"))
+  {
+   /*
+    * "application/x-httpd-perl" is a Perl page.
+    */
 
-    if (con->filename)
-    {
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdWriteClient: %d Removing temp file %s",
-                      con->http.fd, con->filename);
-      unlink(con->filename);
-      cupsdClearString(&con->filename);
-    }
+    cupsdSetString(&con->command, CUPS_PERL);
 
-    if (con->request != NULL)
-    {
-      ippDelete(con->request);
-      con->request = NULL;
-    }
+    if (options)
+      cupsdSetStringf(&con->options, "%s %s", filename, options);
+    else
+      cupsdSetString(&con->options, filename);
 
-    if (con->response != NULL)
-    {
-      ippDelete(con->response);
-      con->response = NULL;
-    }
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                    "is_cgi: Returning 1 with command=\"%s\" and options=\"%s\"",
+                    con->command, con->options);
 
-    cupsdClearString(&con->command);
-    cupsdClearString(&con->options);
+    return (1);
+  }
+#endif /* HAVE_PERL */
+#ifdef HAVE_PHP
+  else if (!strcasecmp(type->type, "x-httpd-php"))
+  {
+   /*
+    * "application/x-httpd-php" is a PHP page.
+    */
 
-    if (!con->http.keep_alive)
-    {
-      cupsdCloseClient(con);
-      return (0);
-    }
+    cupsdSetString(&con->command, CUPS_PHP);
+
+    if (options)
+      cupsdSetStringf(&con->options, "%s %s", filename, options);
+    else
+      cupsdSetString(&con->options, filename);
+
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                    "is_cgi: Returning 1 with command=\"%s\" and options=\"%s\"",
+                    con->command, con->options);
+
+    return (1);
   }
-  else
+#endif /* HAVE_PHP */
+#ifdef HAVE_PYTHON
+  else if (!strcasecmp(type->type, "x-httpd-python"))
   {
-    con->file_ready = 0;
+   /*
+    * "application/x-httpd-python" is a Python page.
+    */
+
+    cupsdSetString(&con->command, CUPS_PYTHON);
+
+    if (options)
+      cupsdSetStringf(&con->options, "%s %s", filename, options);
+    else
+      cupsdSetString(&con->options, filename);
+
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                    "is_cgi: Returning 1 with command=\"%s\" and options=\"%s\"",
+                    con->command, con->options);
 
-    if (con->pipe_pid && !FD_ISSET(con->file, InputSet))
-    {
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdWriteClient: Adding fd %d to InputSet...",
-                     con->file);
-      FD_SET(con->file, InputSet);
-    }
+    return (1);
   }
+#endif /* HAVE_PYTHON */
 
-  con->http.activity = time(NULL);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "is_cgi: Returning 0...");
 
-  return (1);
+  return (0);
 }
 
 
 /*
- * 'check_if_modified()' - Decode an "If-Modified-Since" line.
+ * 'is_path_absolute()' - Is a path absolute and free of relative elements (i.e. "..").
  */
 
-static int                             /* O - 1 if modified since */
-check_if_modified(
-    cupsd_client_t *con,               /* I - Client connection */
-    struct stat    *filestats)         /* I - File information */
+static int                             /* O - 0 if relative, 1 if absolute */
+is_path_absolute(const char *path)     /* I - Input path */
 {
-  char         *ptr;                   /* Pointer into field */
-  time_t       date;                   /* Time/date value */
-  off_t                size;                   /* Size/length value */
-
-
-  size = 0;
-  date = 0;
-  ptr  = con->http.fields[HTTP_FIELD_IF_MODIFIED_SINCE];
+ /*
+  * Check for a leading slash...
+  */
 
-  if (*ptr == '\0')
-    return (1);
+  if (path[0] != '/')
+    return (0);
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "check_if_modified: %d If-Modified-Since=\"%s\"",
-                  con->http.fd, ptr);
+ /*
+  * Check for "/.." in the path...
+  */
 
-  while (*ptr != '\0')
+  while ((path = strstr(path, "/..")) != NULL)
   {
-    while (isspace(*ptr) || *ptr == ';')
-      ptr ++;
-
-    if (strncasecmp(ptr, "length=", 7) == 0)
-    {
-      ptr += 7;
-      size = strtoll(ptr, NULL, 10);
+    if (!path[3] || path[3] == '/')
+      return (0);
 
-      while (isdigit(*ptr))
-        ptr ++;
-    }
-    else if (isalpha(*ptr))
-    {
-      date = httpGetDateTime(ptr);
-      while (*ptr != '\0' && *ptr != ';')
-        ptr ++;
-    }
+    path ++;
   }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "check_if_modified: %d sizes=" CUPS_LLFMT ","
-                 CUPS_LLFMT " dates=%d,%d",
-                  con->http.fd, CUPS_LLCAST size,
-                 CUPS_LLCAST filestats->st_size, (int)date,
-                 (int)filestats->st_mtime);
+ /*
+  * If we haven't found any relative paths, return 1 indicating an
+  * absolute path...
+  */
 
-  return ((size != filestats->st_size && size != 0) ||
-          (date < filestats->st_mtime && date != 0) ||
-         (size == 0 && date == 0));
+  return (1);
 }
 
 
-#ifdef HAVE_CDSASSL
+#ifdef HAVE_SSL
 /*
- * 'get_cdsa_server_certs()' - Convert a keychain name into the CFArrayRef
- *                            required by SSLSetCertificate.
- *
- * For now we assumes that there is exactly one SecIdentity in the
- * keychain - i.e. there is exactly one matching cert/private key pair.
- * In the future we will search a keychain for a SecIdentity matching a
- * specific criteria.  We also skip the operation of adding additional
- * non-signing certs from the keychain to the CFArrayRef.
- *
- * To create a self-signed certificate for testing use the certtool.
- * Executing the following as root will do it:
- *
- *     certtool c c v k=CUPS
+ * 'make_certificate()' - Make a self-signed SSL/TLS certificate.
  */
 
-static CFArrayRef                      /* O - Array of certificates */
-get_cdsa_server_certs(void)
+static int                             /* O - 1 on success, 0 on failure */
+make_certificate(cupsd_client_t *con)  /* I - Client connection */
 {
-  OSStatus             err;            /* Error info */
-  SecKeychainRef       kcRef;          /* Keychain reference */
-  SecIdentitySearchRef srchRef;        /* Search reference */
-  SecIdentityRef       identity;       /* Identity */
-  CFArrayRef           ca;             /* Certificate array */
+#if defined(HAVE_LIBSSL) && defined(HAVE_WAITPID)
+  int          pid,                    /* Process ID of command */
+               status;                 /* Status of command */
+  char         command[1024],          /* Command */
+               *argv[12],              /* Command-line arguments */
+               *envp[MAX_ENV + 1],     /* Environment variables */
+               home[1024],             /* HOME environment variable */
+               infofile[1024],         /* Type-in information for cert */
+               seedfile[1024];         /* Random number seed file */
+  int          envc,                   /* Number of environment variables */
+               bytes;                  /* Bytes written */
+  cups_file_t  *fp;                    /* Seed/info file */
+  int          infofd;                 /* Info file descriptor */
 
 
-  kcRef    = NULL;
-  srchRef  = NULL;
-  identity = NULL;
-  ca      = NULL;
-  err      = SecKeychainOpen(ServerCertificate, &kcRef);
+ /*
+  * Run the "openssl" command to seed the random number generator and
+  * generate a self-signed certificate that is good for 10 years:
+  *
+  *     openssl rand -rand seedfile 1
+  *
+  *     openssl req -new -x509 -keyout ServerKey \
+  *             -out ServerCertificate -days 3650 -nodes
+  *
+  * The seeding step is crucial in ensuring that the openssl command
+  * does not block on systems without sufficient entropy...
+  */
 
-  if (err)
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot open keychain \"%s\", error %d.",
-                   ServerCertificate, (int)err);
-  else
+  if (!cupsFileFind("openssl", getenv("PATH"), 1, command, sizeof(command)))
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "No SSL certificate and openssl command not found!");
+    return (0);
+  }
+
+  if (access("/dev/urandom", 0))
   {
    /*
-    * Search for "any" identity matching specified key use; 
-    * in this app, we expect there to be exactly one. 
+    * If the system doesn't provide /dev/urandom, then any random source
+    * will probably be blocking-style, so generate some random data to
+    * use as a seed for the certificate.  Note that we have already
+    * seeded the random number generator in cupsdInitCerts()...
     */
 
-    err = SecIdentitySearchCreate(kcRef, CSSM_KEYUSE_SIGN, &srchRef);
-
-    if (err)
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                     "Cannot find signing key in keychain \"%s\", error %d",
-                     ServerCertificate, (int)err);
-    else
-    {
-      err = SecIdentitySearchCopyNext(srchRef, &identity);
-
-      if (err)
-       cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                       "Cannot find signing key in keychain \"%s\", error %d",
-                       ServerCertificate, (int)err);
-      else
-      {
-       if (CFGetTypeID(identity) != SecIdentityGetTypeID())
-         cupsdLogMessage(CUPSD_LOG_ERROR,
-                         "SecIdentitySearchCopyNext CFTypeID failure!");
-       else
-       {
-        /* 
-         * Found one. Place it in a CFArray. 
-         * TBD: snag other (non-identity) certs from keychain and add them
-         * to array as well.
-         */
-
-         ca = CFArrayCreate(NULL, (const void **)&identity, 1, NULL);
+    cupsdLogMessage(CUPSD_LOG_INFO,
+                    "Seeding the random number generator...");
 
-         if (ca == nil)
-           cupsdLogMessage(CUPSD_LOG_ERROR, "CFArrayCreate error");
-       }
+    snprintf(home, sizeof(home), "HOME=%s", TempDir);
 
-       /*CFRelease(identity);*/
-      }
+   /*
+    * Write the seed file...
+    */
 
-      /*CFRelease(srchRef);*/
+    if ((fp = cupsTempFile2(seedfile, sizeof(seedfile))) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create seed file %s - %s",
+                      seedfile, strerror(errno));
+      return (0);
     }
 
-    /*CFRelease(kcRef);*/
-  }
-
-  return (ca);
-}
-#endif /* HAVE_CDSASSL */
+    for (bytes = 0; bytes < 262144; bytes ++)
+      cupsFilePutChar(fp, random());
 
+    cupsFileClose(fp);
 
-/*
- * 'get_file()' - Get a filename and state info.
- */
-
-static char *                          /* O  - Real filename */
-get_file(cupsd_client_t *con,          /* I  - Client connection */
-         struct stat    *filestats,    /* O  - File information */
-         char           *filename,     /* IO - Filename buffer */
-         int            len)           /* I  - Buffer length */
-{
-  int          status;                 /* Status of filesystem calls */
-  char         *ptr;                   /* Pointer info filename */
-  int          plen;                   /* Remaining length after pointer */
+   /*
+    * Run the openssl command to seed its random number generator...
+    */
 
+    argv[0] = "openssl";
+    argv[1] = "rand";
+    argv[2] = "-rand";
+    argv[3] = seedfile;
+    argv[4] = "1";
+    argv[5] = NULL;
 
- /*
-  * Need to add DocumentRoot global...
-  */
+    envc = cupsdLoadEnv(envp, MAX_ENV);
+    envp[envc++] = home;
+    envp[envc]   = NULL;
 
-  if (!strncmp(con->uri, "/ppd/", 5))
-    snprintf(filename, len, "%s%s", ServerRoot, con->uri);
-  else if (!strncmp(con->uri, "/admin/conf/", 12))
-    snprintf(filename, len, "%s%s", ServerRoot, con->uri + 11);
-  else if (!strncmp(con->uri, "/admin/log/", 11))
-  {
-    if (!strcmp(con->uri + 11, "access_log") && AccessLog[0] == '/')
-      strlcpy(filename, AccessLog, len);
-    else if (!strcmp(con->uri + 11, "error_log") && ErrorLog[0] == '/')
-      strlcpy(filename, ErrorLog, len);
-    else if (!strcmp(con->uri + 11, "page_log") && PageLog[0] == '/')
-      strlcpy(filename, PageLog, len);
-    else
-      return (NULL);
-  }
-  else if (con->language != NULL)
-    snprintf(filename, len, "%s/%s%s", DocumentRoot, con->language->language,
-            con->uri);
-  else
-    snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
+    if (!cupsdStartProcess(command, argv, envp, -1, -1, -1, -1, -1, 1, &pid))
+    {
+      unlink(seedfile);
+      return (0);
+    }
 
-  if ((ptr = strchr(filename, '?')) != NULL)
-    *ptr = '\0';
+    while (waitpid(pid, &status, 0) < 0)
+      if (errno != EINTR)
+      {
+       status = 1;
+       break;
+      }
 
- /*
-  * Grab the status for this language; if there isn't a language-specific file
-  * then fallback to the default one...
-  */
+    cupsdFinishProcess(pid, command, sizeof(command));
 
-  if ((status = stat(filename, filestats)) != 0 && con->language != NULL)
-  {
    /*
-    * Drop the language prefix and try the current directory...
+    * Remove the seed file, as it is no longer needed...
     */
 
-    if (strncmp(con->uri, "/ppd/", 5) &&
-        strncmp(con->uri, "/admin/conf/", 12) &&
-        strncmp(con->uri, "/admin/log/", 11))
-    {
-      snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
+    unlink(seedfile);
 
-      if ((ptr = strchr(filename, '?')) != NULL)
-       *ptr = '\0';
+    if (status)
+    {
+      if (WIFEXITED(status))
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "Unable to seed random number generator - "
+                       "the openssl command stopped with status %d!",
+                       WEXITSTATUS(status));
+      else
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "Unable to seed random number generator - "
+                       "the openssl command crashed on signal %d!",
+                       WTERMSIG(status));
 
-      status = stat(filename, filestats);
+      return (0);
     }
   }
 
  /*
-  * If we're found a directory, get the index.html file instead...
+  * Create a file with the certificate information fields...
+  *
+  * Note: This assumes that the default questions are asked by the openssl
+  * command...
   */
 
-  if (!status && S_ISDIR(filestats->st_mode))
+  if ((fp = cupsTempFile2(infofile, sizeof(infofile))) == NULL)
   {
-    if (filename[strlen(filename) - 1] != '/')
-      strlcat(filename, "/", len);
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "Unable to create certificate information file %s - %s",
+                    infofile, strerror(errno));
+    return (0);
+  }
 
-    ptr  = filename + strlen(filename);
-    plen = len - (ptr - filename);
+  cupsFilePrintf(fp, ".\n.\n.\n%s\n.\n%s\n%s\n",
+                 ServerName, ServerName, ServerAdmin);
+  cupsFileClose(fp);
 
-    strlcpy(ptr, "index.html", plen);
-    status = stat(filename, filestats);
+  cupsdLogMessage(CUPSD_LOG_INFO,
+                  "Generating SSL server key and certificate...");
 
-#ifdef HAVE_JAVA
-    if (status)
-    {
-      strlcpy(ptr, "index.class", plen);
-      status = stat(filename, filestats);
-    }
-#endif /* HAVE_JAVA */
+  argv[0]  = "openssl";
+  argv[1]  = "req";
+  argv[2]  = "-new";
+  argv[3]  = "-x509";
+  argv[4]  = "-keyout";
+  argv[5]  = ServerKey;
+  argv[6]  = "-out";
+  argv[7]  = ServerCertificate;
+  argv[8]  = "-days";
+  argv[9]  = "3650";
+  argv[10] = "-nodes";
+  argv[11] = NULL;
 
-#ifdef HAVE_PERL
-    if (status)
-    {
-      strlcpy(ptr, "index.pl", plen);
-      status = stat(filename, filestats);
-    }
-#endif /* HAVE_PERL */
+  cupsdLoadEnv(envp, MAX_ENV);
 
-#ifdef HAVE_PHP
-    if (status)
-    {
-      strlcpy(ptr, "index.php", plen);
-      status = stat(filename, filestats);
-    }
-#endif /* HAVE_PHP */
+  infofd = open(infofile, O_RDONLY);
 
-#ifdef HAVE_PYTHON
-    if (status)
-    {
-      strlcpy(ptr, "index.pyc", plen);
-      status = stat(filename, filestats);
-    }
+  if (!cupsdStartProcess(command, argv, envp, infofd, -1, -1, -1, -1, 1, &pid))
+  {
+    close(infofd);
+    unlink(infofile);
+    return (0);
+  }
 
-    if (status)
+  close(infofd);
+  unlink(infofile);
+
+  while (waitpid(pid, &status, 0) < 0)
+    if (errno != EINTR)
     {
-      strlcpy(ptr, "index.py", plen);
-      status = stat(filename, filestats);
+      status = 1;
+      break;
     }
-#endif /* HAVE_PYTHON */
-  }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_file: %d filename=%s size=%d",
-                  con->http.fd, filename,
-                 status ? -1 : (int)filestats->st_size);
-
-  if (!status)
-    con->http.data_remaining = (int)filestats->st_size;
+  cupsdFinishProcess(pid, command, sizeof(command));
 
   if (status)
-    return (NULL);
+  {
+    if (WIFEXITED(status))
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to create SSL server key and certificate - "
+                     "the openssl command stopped with status %d!",
+                     WEXITSTATUS(status));
+    else
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to create SSL server key and certificate - "
+                     "the openssl command crashed on signal %d!",
+                     WTERMSIG(status));
+  }
   else
-    return (filename);
-}
-
+  {
+    cupsdLogMessage(CUPSD_LOG_INFO, "Created SSL server key file \"%s\"...",
+                   ServerKey);
+    cupsdLogMessage(CUPSD_LOG_INFO,
+                    "Created SSL server certificate file \"%s\"...",
+                   ServerCertificate);
+  }
 
-/*
- * 'install_conf_file()' - Install a configuration file.
- */
+  return (!status);
 
-static http_status_t                   /* O - Status */
-install_conf_file(cupsd_client_t *con) /* I - Connection */
-{
-  cups_file_t  *in,                    /* Input file */
-               *out;                   /* Output file */
-  char         buffer[1024];           /* Copy buffer */
-  int          bytes;                  /* Number of bytes */
-  char         conffile[1024],         /* Configuration filename */
-               newfile[1024],          /* New config filename */
-               oldfile[1024];          /* Old config filename */
-  struct stat  confinfo;               /* Config file info */
+#elif defined(HAVE_GNUTLS)
+  gnutls_x509_crt      crt;            /* Self-signed certificate */
+  gnutls_x509_privkey  key;            /* Encryption key */
+  cups_lang_t          *language;      /* Default language info */
+  cups_file_t          *fp;            /* Key/cert file */
+  unsigned char                buffer[8192];   /* Buffer for x509 data */
+  size_t               bytes;          /* Number of bytes of data */
+  unsigned char                serial[4];      /* Serial number buffer */
+  time_t               curtime;        /* Current time */
+  int                  result;         /* Result of GNU TLS calls */
 
 
  /*
-  * First construct the filenames...
+  * Create the encryption key...
   */
 
-  snprintf(conffile, sizeof(conffile), "%s%s", ServerRoot, con->uri + 11);
-  snprintf(newfile, sizeof(newfile), "%s%s.N", ServerRoot, con->uri + 11);
-  snprintf(oldfile, sizeof(oldfile), "%s%s.O", ServerRoot, con->uri + 11);
+  cupsdLogMessage(CUPSD_LOG_INFO, "Generating SSL server key...");
 
-  cupsdLogMessage(CUPSD_LOG_INFO, "Installing config file \"%s\"...", conffile);
+  gnutls_x509_privkey_init(&key);
+  gnutls_x509_privkey_generate(key, GNUTLS_PK_RSA, 2048, 0);
 
  /*
-  * Get the owner, group, and permissions of the configuration file.
-  * If it doesn't exist, assign it to the User and Group in the
-  * cupsd.conf file with mode 0640 permissions.
+  * Save it...
   */
 
-  if (stat(conffile, &confinfo))
-  {
-    confinfo.st_uid  = User;
-    confinfo.st_gid  = Group;
-    confinfo.st_mode = ConfigFilePerm;
-  }
-
- /*
-  * Open the request file and new config file...
-  */
+  bytes = sizeof(buffer);
 
-  if ((in = cupsFileOpen(con->filename, "rb")) == NULL)
+  if ((result = gnutls_x509_privkey_export(key, GNUTLS_X509_FMT_PEM,
+                                           buffer, &bytes)) < 0)
   {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open request file \"%s\" - %s",
-                    con->filename, strerror(errno));
-    return (HTTP_SERVER_ERROR);
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to export SSL server key - %s",
+                    gnutls_strerror(result));
+    gnutls_x509_privkey_deinit(key);
+    return (0);
   }
+  else if ((fp = cupsFileOpen(ServerKey, "w")) != NULL)
+  {
+    cupsFileWrite(fp, (char *)buffer, bytes);
+    cupsFileClose(fp);
 
-  if ((out = cupsFileOpen(newfile, "wb")) == NULL)
+    cupsdLogMessage(CUPSD_LOG_INFO, "Created SSL server key file \"%s\"...",
+                   ServerKey);
+  }
+  else
   {
-    cupsFileClose(in);
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open config file \"%s\" - %s",
-                    newfile, strerror(errno));
-    return (HTTP_SERVER_ERROR);
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "Unable to create SSL server key file \"%s\" - %s",
+                   ServerKey, strerror(errno));
+    gnutls_x509_privkey_deinit(key);
+    return (0);
   }
 
-  fchmod(cupsFileNumber(out), confinfo.st_mode);
-  fchown(cupsFileNumber(out), confinfo.st_uid, confinfo.st_gid);
-
  /*
-  * Copy from the request to the new config file...
+  * Create the self-signed certificate...
   */
 
-  while ((bytes = cupsFileRead(in, buffer, sizeof(buffer))) > 0)
-    if (cupsFileWrite(out, buffer, bytes) < bytes)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unable to copy to config file \"%s\" - %s",
-                     newfile, strerror(errno));
+  cupsdLogMessage(CUPSD_LOG_INFO, "Generating self-signed SSL certificate...");
 
-      cupsFileClose(in);
-      cupsFileClose(out);
-      unlink(newfile);
+  language  = cupsLangDefault();
+  curtime   = time(NULL);
+  serial[0] = curtime >> 24;
+  serial[1] = curtime >> 16;
+  serial[2] = curtime >> 8;
+  serial[3] = curtime;
 
-      return (HTTP_SERVER_ERROR);
-    }
+  gnutls_x509_crt_init(&crt);
+  if (strlen(language->language) == 5)
+    gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_COUNTRY_NAME, 0,
+                                  language->language + 3, 2);
+  else
+    gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_COUNTRY_NAME, 0,
+                                  "US", 2);
+  gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_COMMON_NAME, 0,
+                                ServerName, strlen(ServerName));
+  gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_ORGANIZATION_NAME, 0,
+                                ServerName, strlen(ServerName));
+  gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_ORGANIZATIONAL_UNIT_NAME,
+                                0, "Unknown", 7);
+  gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_STATE_OR_PROVINCE_NAME, 0,
+                                "Unknown", 7);
+  gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_LOCALITY_NAME, 0,
+                                "Unknown", 7);
+  gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_PKCS9_EMAIL, 0,
+                                ServerAdmin, strlen(ServerAdmin));
+  gnutls_x509_crt_set_key(crt, key);
+  gnutls_x509_crt_set_serial(crt, serial, sizeof(serial));
+  gnutls_x509_crt_set_activation_time(crt, curtime);
+  gnutls_x509_crt_set_expiration_time(crt, curtime + 10 * 365 * 86400);
+  gnutls_x509_crt_set_ca_status(crt, 0);
+  gnutls_x509_crt_set_subject_alternative_name(crt, GNUTLS_SAN_DNSNAME,
+                                               ServerName);
+  gnutls_x509_crt_set_key_purpose_oid(crt, GNUTLS_KP_TLS_WWW_SERVER, 0);
+  gnutls_x509_crt_set_key_usage(crt, GNUTLS_KEY_KEY_ENCIPHERMENT);
+  gnutls_x509_crt_set_version(crt, 3);
+
+  bytes = sizeof(buffer);
+  if (gnutls_x509_crt_get_key_id(crt, 0, buffer, &bytes) >= 0)
+    gnutls_x509_crt_set_subject_key_id(crt, buffer, bytes);
+
+  gnutls_x509_crt_sign(crt, crt, key);
 
  /*
-  * Close the files...
+  * Save it...
   */
 
-  cupsFileClose(in);
-  if (cupsFileClose(out))
-  {
+  bytes = sizeof(buffer);
+  if ((result = gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM,
+                                       buffer, &bytes)) < 0)
     cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "Error file closing config file \"%s\" - %s",
-                    newfile, strerror(errno));
-
-    unlink(newfile);
+                    "Unable to export SSL server certificate - %s",
+                   gnutls_strerror(result));
+  else if ((fp = cupsFileOpen(ServerCertificate, "w")) != NULL)
+  {
+    cupsFileWrite(fp, (char *)buffer, bytes);
+    cupsFileClose(fp);
 
-    return (HTTP_SERVER_ERROR);
+    cupsdLogMessage(CUPSD_LOG_INFO,
+                    "Created SSL server certificate file \"%s\"...",
+                   ServerCertificate);
   }
+  else
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "Unable to create SSL server certificate file \"%s\" - %s",
+                   ServerCertificate, strerror(errno));
 
  /*
-  * Remove the request file...
-  */
-
-  unlink(con->filename);
-  cupsdClearString(&con->filename);
-
- /*
-  * Unlink the old backup, rename the current config file to the backup
-  * filename, and rename the new config file to the config file name...
+  * Cleanup...
   */
 
-  if (unlink(oldfile))
-    if (errno != ENOENT)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unable to remove backup config file \"%s\" - %s",
-                     oldfile, strerror(errno));
-
-      unlink(newfile);
+  gnutls_x509_crt_deinit(crt);
+  gnutls_x509_privkey_deinit(key);
 
-      return (HTTP_SERVER_ERROR);
-    }
+  return (1);
 
-  if (rename(conffile, oldfile))
-    if (errno != ENOENT)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unable to rename old config file \"%s\" - %s",
-                     conffile, strerror(errno));
+#elif defined(HAVE_CDSASSL) && defined(HAVE_WAITPID)
+  int          pid,                    /* Process ID of command */
+               status;                 /* Status of command */
+  char         command[1024],          /* Command */
+               *argv[4],               /* Command-line arguments */
+               *envp[MAX_ENV + 1],     /* Environment variables */
+               keychain[1024],         /* Keychain argument */
+               infofile[1024];         /* Type-in information for cert */
+  cups_file_t  *fp;                    /* Seed/info file */
+  int          infofd;                 /* Info file descriptor */
 
-      unlink(newfile);
 
-      return (HTTP_SERVER_ERROR);
-    }
+ /*
+  * Run the "certtool" command to generate a self-signed certificate...
+  */
 
-  if (rename(newfile, conffile))
+  if (!cupsFileFind("certtool", getenv("PATH"), 1, command, sizeof(command)))
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "Unable to rename new config file \"%s\" - %s",
-                    newfile, strerror(errno));
-
-    rename(oldfile, conffile);
-    unlink(newfile);
-
-    return (HTTP_SERVER_ERROR);
+                    "No SSL certificate and certtool command not found!");
+    return (0);
   }
 
  /*
-  * If the cupsd.conf file was updated, set the NeedReload flag...
+  * Create a file with the certificate information fields...
+  *
+  * Note: This assumes that the default questions are asked by the certtool
+  * command...
   */
 
-  if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
-    NeedReload = RELOAD_CUPSD;
-  else
-    NeedReload = RELOAD_ALL;
+  if ((fp = cupsTempFile2(infofile, sizeof(infofile))) == NULL)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "Unable to create certificate information file %s - %s",
+                    infofile, strerror(errno));
+    return (0);
+  }
 
-  ReloadTime = time(NULL);
+  cupsFilePrintf(fp, "%s\nr\n\ny\nb\ns\ny\n%s\n\n\n\n\n%s\ny\n", 
+                con->servername, con->servername, ServerAdmin);
+  cupsFileClose(fp);
 
- /*
-  * Return that the file was created successfully...
-  */
+  cupsdLogMessage(CUPSD_LOG_INFO,
+                  "Generating SSL server key and certificate...");
 
-  return (HTTP_CREATED);
-}
+  snprintf(keychain, sizeof(keychain), "k=%s", ServerCertificate);
 
+  argv[0] = "certtool";
+  argv[1] = "c";
+  argv[2] = keychain;
+  argv[3] = NULL;
 
-/*
- * 'is_path_absolute()' - Is a path absolute and free of relative elements (i.e. "..").
- */
+  cupsdLoadEnv(envp, MAX_ENV);
 
-static int                             /* O - 0 if relative, 1 if absolute */
-is_path_absolute(const char *path)     /* I - Input path */
-{
- /*
-  * Check for a leading slash...
-  */
+  infofd = open(infofile, O_RDONLY);
 
-  if (path[0] != '/')
+  if (!cupsdStartProcess(command, argv, envp, infofd, -1, -1, -1, -1, 1, &pid))
+  {
+    close(infofd);
+    unlink(infofile);
     return (0);
+  }
 
- /*
-  * Check for "/.." in the path...
-  */
+  close(infofd);
+  unlink(infofile);
 
-  while ((path = strstr(path, "/..")) != NULL)
-  {
-    if (!path[3] || path[3] == '/')
-      return (0);
+  while (waitpid(pid, &status, 0) < 0)
+    if (errno != EINTR)
+    {
+      status = 1;
+      break;
+    }
 
-    path ++;
+  cupsdFinishProcess(pid, command, sizeof(command));
+
+  if (status)
+  {
+    if (WIFEXITED(status))
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to create SSL server key and certificate - "
+                     "the certtool command stopped with status %d!",
+                     WEXITSTATUS(status));
+    else
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to create SSL server key and certificate - "
+                     "the certtool command crashed on signal %d!",
+                     WTERMSIG(status));
+  }
+  else
+  {
+    cupsdLogMessage(CUPSD_LOG_INFO,
+                    "Created SSL server certificate file \"%s\"...",
+                   ServerCertificate);
   }
 
- /*
-  * If we haven't found any relative paths, return 1 indicating an
-  * absolute path...
-  */
+  return (!status);
 
-  return (1);
+#else
+  return (0);
+#endif /* HAVE_LIBSSL && HAVE_WAITPID */
 }
+#endif /* HAVE_SSL */
 
 
 /*
@@ -3215,20 +4170,22 @@ pipe_command(cupsd_client_t *con,       /* I - Client connection */
 {
   int          i;                      /* Looping var */
   int          pid;                    /* Process ID */
-  char         *commptr;               /* Command string pointer */
+  char         *commptr,               /* Command string pointer */
+               commch;                 /* Command string character */
   char         *uriptr;                /* URI string pointer */
   int          fds[2];                 /* Pipe FDs */
   int          argc;                   /* Number of arguments */
   int          envc;                   /* Number of environment variables */
   char         argbuf[10240],          /* Argument buffer */
                *argv[100],             /* Argument strings */
-               *envp[MAX_ENV + 16];    /* Environment variables */
+               *envp[MAX_ENV + 18];    /* Environment variables */
   char         content_length[1024],   /* CONTENT_LENGTH environment variable */
                content_type[1024],     /* CONTENT_TYPE environment variable */
                http_cookie[32768],     /* HTTP_COOKIE environment variable */
+               http_referer[1024],     /* HTTP_REFERER environment variable */
                http_user_agent[1024],  /* HTTP_USER_AGENT environment variable */
                lang[1024],             /* LANG environment variable */
-               *query_string,          /* QUERY_STRING env variable */
+               path_info[1024],        /* PATH_INFO environment variable */
                remote_addr[1024],      /* REMOTE_ADDR environment variable */
                remote_host[1024],      /* REMOTE_HOST environment variable */
                remote_user[1024],      /* REMOTE_USER environment variable */
@@ -3240,10 +4197,12 @@ pipe_command(cupsd_client_t *con,       /* I - Client connection */
  /*
   * Parse a copy of the options string, which is of the form:
   *
-  *     name argument+argument+argument
-  *     name?argument+argument+argument
-  *     name param=value&param=value
-  *     name?param=value&param=value
+  *     argument+argument+argument
+  *     ?argument+argument+argument
+  *     param=value&param=value
+  *     ?param=value&param=value
+  *     /name?argument+argument+argument
+  *     /name?param=value&param=value
   *
   * If the string contains an "=" character after the initial name,
   * then we treat it as a HTTP GET form request and make a copy of
@@ -3255,89 +4214,103 @@ pipe_command(cupsd_client_t *con,      /* I - Client connection */
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "pipe_command: command=\"%s\", options=\"%s\"",
-                  command, options);
+                  command, options ? options : "(null)");
 
-  strlcpy(argbuf, options, sizeof(argbuf));
+  argv[0] = command;
 
-  argv[0]      = argbuf;
-  query_string = NULL;
+  if (options)
+    strlcpy(argbuf, options, sizeof(argbuf));
+  else
+    argbuf[0] = '\0';
 
-  for (commptr = argbuf, argc = 1; *commptr != '\0' && argc < 99; commptr ++)
+  if (argbuf[0] == '/')
   {
    /*
-    * Break arguments whenever we see a + or space...
+    * Found some trailing path information, set PATH_INFO...
     */
 
-    if (*commptr == ' ' || *commptr == '+' || (*commptr == '?' && argc == 1))
-    {
-     /*
-      * Terminate the current string and skip trailing whitespace...
-      */
+    if ((commptr = strchr(argbuf, '?')) == NULL)
+      commptr = argbuf + strlen(argbuf);
 
-      *commptr++ = '\0';
+    commch   = *commptr;
+    *commptr = '\0';
+    snprintf(path_info, sizeof(path_info), "PATH_INFO=%s", argbuf);
+    *commptr = commch;
+  }
+  else
+  {
+    commptr      = argbuf;
+    path_info[0] = '\0';
+  }
 
-      while (*commptr == ' ')
-        commptr ++;
+  cupsdLogMessage(CUPSD_LOG_INFO, "commptr=\"%s\"", commptr);
 
-     /*
-      * If we don't have a blank string, save it as another argument...
-      */
+  if (*commptr == '?' && con->operation == HTTP_GET && !con->query_string)
+  {
+    commptr ++;
+    cupsdSetStringf(&(con->query_string), "QUERY_STRING=%s", commptr);
+  }
 
-      if (*commptr)
-      {
-        argv[argc] = commptr;
-       argc ++;
-      }
-      else
-        break;
+  argc = 1;
+
+  if (*commptr)
+  {
+    argv[argc ++] = commptr;
 
+    for (; *commptr && argc < 99; commptr ++)
+    {
      /*
-      * If we see an "=" in the remaining string, make a copy of it since
-      * it will be query data...
+      * Break arguments whenever we see a + or space...
       */
 
-      if (argc == 2 && strchr(commptr, '=') && con->operation == HTTP_GET)
-       cupsdSetStringf(&query_string, "QUERY_STRING=%s", commptr);
+      if (*commptr == ' ' || *commptr == '+')
+      {
+       while (*commptr == ' ' || *commptr == '+')
+         *commptr++ = '\0';
 
-     /*
-      * Don't skip the first non-blank character...
-      */
+       /*
+       * If we don't have a blank string, save it as another argument...
+       */
 
-      commptr --;
-    }
-    else if (*commptr == '%' && isxdigit(commptr[1] & 255) &&
-             isxdigit(commptr[2] & 255))
-    {
-     /*
-      * Convert the %xx notation to the individual character.
-      */
+       if (*commptr)
+       {
+         argv[argc] = commptr;
+         argc ++;
+       }
+       else
+         break;
+      }
+      else if (*commptr == '%' && isxdigit(commptr[1] & 255) &&
+               isxdigit(commptr[2] & 255))
+      {
+       /*
+       * Convert the %xx notation to the individual character.
+       */
 
-      if (commptr[1] >= '0' && commptr[1] <= '9')
-        *commptr = (commptr[1] - '0') << 4;
-      else
-        *commptr = (tolower(commptr[1]) - 'a' + 10) << 4;
+       if (commptr[1] >= '0' && commptr[1] <= '9')
+          *commptr = (commptr[1] - '0') << 4;
+       else
+          *commptr = (tolower(commptr[1]) - 'a' + 10) << 4;
 
-      if (commptr[2] >= '0' && commptr[2] <= '9')
-        *commptr |= commptr[2] - '0';
-      else
-        *commptr |= tolower(commptr[2]) - 'a' + 10;
+       if (commptr[2] >= '0' && commptr[2] <= '9')
+          *commptr |= commptr[2] - '0';
+       else
+          *commptr |= tolower(commptr[2]) - 'a' + 10;
 
-      _cups_strcpy(commptr + 1, commptr + 3);
+       _cups_strcpy(commptr + 1, commptr + 3);
 
-     /*
-      * Check for a %00 and break if that is the case...
-      */
+       /*
+       * Check for a %00 and break if that is the case...
+       */
 
-      if (!*commptr)
-        break;
+       if (!*commptr)
+          break;
+      }
     }
   }
 
   argv[argc] = NULL;
 
-  if (argv[0][0] == '\0')
-    argv[0] = strrchr(command, '/') + 1;
-
  /*
   * Setup the environment variables as needed...
   */
@@ -3373,6 +4346,9 @@ pipe_command(cupsd_client_t *con, /* I - Client connection */
   envp[envc ++] = remote_host;
   envp[envc ++] = script_name;
 
+  if (path_info[0])
+    envp[envc ++] = path_info;
+
   if (con->username[0])
   {
     snprintf(remote_user, sizeof(remote_user), "REMOTE_USER=%s", con->username);
@@ -3401,25 +4377,30 @@ pipe_command(cupsd_client_t *con,       /* I - Client connection */
     envp[envc ++] = http_user_agent;
   }
 
-  if (con->operation == HTTP_GET)
+  if (con->http.fields[HTTP_FIELD_REFERER][0])
   {
-    for (i = 0; i < argc; i ++)
-      cupsdLogMessage(CUPSD_LOG_DEBUG2, "argv[%d] = \"%s\"", i, argv[i]);
+    snprintf(http_referer, sizeof(http_referer), "HTTP_REFERER=%s",
+             con->http.fields[HTTP_FIELD_REFERER]);
+    envp[envc ++] = http_referer;
+  }
 
+  if (con->operation == HTTP_GET)
+  {
     envp[envc ++] = "REQUEST_METHOD=GET";
 
-    if (query_string)
+    if (con->query_string)
     {
      /*
       * Add GET form variables after ?...
       */
 
-      envp[envc ++] = query_string;
+      envp[envc ++] = con->query_string;
     }
   }
   else
   {
-    sprintf(content_length, "CONTENT_LENGTH=" CUPS_LLFMT, con->bytes);
+    sprintf(content_length, "CONTENT_LENGTH=" CUPS_LLFMT,
+            CUPS_LLCAST con->bytes);
     snprintf(content_type, sizeof(content_type), "CONTENT_TYPE=%s",
              con->http.fields[HTTP_FIELD_CONTENT_TYPE]);
 
@@ -3432,7 +4413,7 @@ pipe_command(cupsd_client_t *con, /* I - Client connection */
   * Tell the CGI if we are using encryption...
   */
 
-  if (con->http.encryption == HTTP_ENCRYPT_ALWAYS)
+  if (con->http.tls)
     envp[envc ++] = "HTTPS=ON";
 
  /*
@@ -3457,8 +4438,6 @@ pipe_command(cupsd_client_t *con, /* I - Client connection */
 
   if (cupsdOpenPipe(fds))
   {
-    cupsdClearString(&query_string);
-
     cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create pipes for CGI %s - %s",
                     argv[0], strerror(errno));
     return (0);
@@ -3469,7 +4448,7 @@ pipe_command(cupsd_client_t *con, /* I - Client connection */
   */
 
   if (cupsdStartProcess(command, argv, envp, infile, fds[1], CGIPipes[1],
-                       -1, root, &pid) < 0)
+                       -1, -1, root, &pid) < 0)
   {
    /*
     * Error - can't fork!
@@ -3496,12 +4475,63 @@ pipe_command(cupsd_client_t *con,       /* I - Client connection */
     close(fds[1]);
   }
 
-  cupsdClearString(&query_string);
-
   return (pid);
 }
 
 
 /*
- * End of "$Id: client.c 5083 2006-02-06 02:57:43Z mike $".
+ * 'write_file()' - Send a file via HTTP.
+ */
+
+static int                             /* O - 0 on failure, 1 on success */
+write_file(cupsd_client_t *con,                /* I - Client connection */
+           http_status_t  code,                /* I - HTTP status */
+          char           *filename,    /* I - Filename */
+          char           *type,        /* I - File type */
+          struct stat    *filestats)   /* O - File information */
+{
+  con->file = open(filename, O_RDONLY);
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG, "write_file: %d file=%d", con->http.fd,
+                  con->file);
+
+  if (con->file < 0)
+    return (0);
+
+  fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
+
+  con->pipe_pid = 0;
+
+  if (!cupsdSendHeader(con, code, type))
+    return (0);
+
+  if (httpPrintf(HTTP(con), "Last-Modified: %s\r\n",
+                 httpGetDateString(filestats->st_mtime)) < 0)
+    return (0);
+  if (httpPrintf(HTTP(con), "Content-Length: " CUPS_LLFMT "\r\n",
+                 CUPS_LLCAST filestats->st_size) < 0)
+    return (0);
+  if (httpPrintf(HTTP(con), "\r\n") < 0)
+    return (0);
+
+  if (cupsdFlushHeader(con) < 0)
+    return (0);
+
+  con->http.data_encoding  = HTTP_ENCODE_LENGTH;
+  con->http.data_remaining = filestats->st_size;
+
+  if (con->http.data_remaining <= INT_MAX)
+    con->http._data_remaining = con->http.data_remaining;
+  else
+    con->http._data_remaining = INT_MAX;
+
+  cupsdAddSelect(con->http.fd, (cupsd_selfunc_t)cupsdReadClient,
+                 (cupsd_selfunc_t)cupsdWriteClient, con);
+
+  return (1);
+}
+
+
+/*
+ * End of "$Id: client.c 6329 2007-03-12 14:48:28Z mike $".
  */