Index: cups/usersys.c
===================================================================
--- cups/usersys.c	(revision 11112)
+++ cups/usersys.c	(working copy)
@@ -365,6 +365,8 @@
       else if (!strcmp(options, "version=2.2"))
         cg->server_version = 22;
     }
+    else
+      cg->server_version = 20;
 
     if (cg->server[0] != '/' && (port = strrchr(cg->server, ':')) != NULL &&
         !strchr(port, ']') && isdigit(port[1] & 255))
Index: cups/globals.c
===================================================================
--- cups/globals.c	(revision 11112)
+++ cups/globals.c	(working copy)
@@ -215,7 +215,6 @@
   cg->any_root       = 1;
   cg->expired_certs  = 1;
   cg->expired_root   = 1;
-  cg->server_version = 20;
 
  /*
   * Then set directories as appropriate...
Index: cups/ipp.c
===================================================================
--- cups/ipp.c	(revision 11112)
+++ cups/ipp.c	(working copy)
@@ -2340,6 +2340,9 @@
     * Set default version - usually 2.0...
     */
 
+    if (cg->server_version == 0)
+      _cupsSetDefaults();
+
     temp->request.any.version[0] = cg->server_version / 10;
     temp->request.any.version[1] = cg->server_version % 10;
     temp->use                    = 1;
