diff --git a/conf/mime.convs.in b/conf/mime.convs.in index 57b459d..e042e01 100644 --- a/conf/mime.convs.in +++ b/conf/mime.convs.in @@ -44,6 +44,9 @@ application/postscript application/vnd.cups-postscript 66 pstops application/vnd.cups-raster image/pwg-raster 100 rastertopwg application/vnd.cups-raster image/urf 100 rastertopwg +# Needed for printing from iOS (AirPrint) clients +image/urf application/pdf 100 - + ######################################################################## # # Raw filter... diff --git a/conf/mime.types b/conf/mime.types index fcd6b6e..ebb0525 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -108,6 +108,9 @@ image/x-alias pix short(8,8) short(8,24) image/x-bitmap bmp string(0,BM) + !printable(2,14) image/x-icon ico +# Needed for printing from iOS (AirPrint) clients +image/urf urf string(0,UNIRAST<00>) + ######################################################################## # # Text files... diff --git a/scheduler/conf.c b/scheduler/conf.c index bb6049b..bb4f9d2 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -745,7 +745,7 @@ cupsdReadConfiguration(void) DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED; #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cupsdSetString(&DNSSDSubTypes, "_cups,_print"); + cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal"); cupsdClearString(&DNSSDHostName); #endif /* HAVE_DNSSD || HAVE_AVAHI */ diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index ddd3701..fb2a305 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -440,6 +440,12 @@ dnssdBuildTxtRecord( keyvalue[count ][0] = "pdl"; keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript"; + /* iOS 6 does not accept this printer as AirPrint printer if there is + no URF txt record or "URF=none", "DM3" is the minimum needed found + by try and error */ + keyvalue[count ][0] = "URF"; + keyvalue[count++][1] = "DM3"; + if (get_auth_info_required(p, air_str, sizeof(air_str))) { keyvalue[count ][0] = "air"; diff --git a/scheduler/printers.c b/scheduler/printers.c index 8069039..2fff84b 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p) /* I - Printer */ } else if (!_cups_strcasecmp(type->super, "image")) { - if (!_cups_strcasecmp(type->type, "jpeg")) + if (!_cups_strcasecmp(type->type, "urf")) + strlcat(pdl, "image/urf,", sizeof(pdl)); + else if (!_cups_strcasecmp(type->type, "jpeg")) strlcat(pdl, "image/jpeg,", sizeof(pdl)); else if (!_cups_strcasecmp(type->type, "png")) strlcat(pdl, "image/png,", sizeof(pdl));