~ubuntu-branches/ubuntu/saucy/cups/saucy

« back to all changes in this revision

Viewing changes to backend/socket.c

  • Committer: Package Import Robot
  • Author(s): Till Kamppeter
  • Date: 2013-08-23 14:27:01 UTC
  • mfrom: (99.1.25 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130823142701-hgvck4nascy3i2q8
Tags: 1.7.0~rc1-0ubuntu1
* New upstream release
   - Improved support for paid, PIN, and release printing
   - Expanded support for IPP Everywhere
   - Automatic support for data compression
   - Improved CUPS APIs
* debian/patches/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch,
  debian/patches/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch:
  Removed, applied upstream.
* debian/patches/drop-arch-specifics-from-doc.patch: Removed, not needed
  any more.
* debian/patches/get-ppd-file-for-statically-configured-ipp-shared-queues.patch,
  debian/patches/pidfile.patch,
  debian/patches/rootbackends-worldreadable.patch,
  debian/patches/cups-dbus-utf8.patch,
  debian/patches/airprint-support.patch,
  debian/patches/no-conffile-timestamp.patch,
  debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch,
  debian/patches/tests-ignore-warnings.patch,
  debian/patches/tests-ignore-usb-crash.patch,
  debian/patches/test-i18n-nonlinux.patch,
  debian/patches/tests-wait-on-unfinished-jobs-everytime.patch,
  debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch,
  debian/patches/tests-use-cupsfilters.patch,
  debian/patches/add-ipp-backend-of-cups-1.4.patch,
  debian/patches/confdirperms.patch,
  debian/patches/show-compile-command-lines.patch,
  debian/patches/ppdc-dynamic-linking.patch,
  debian/patches/log-debug-history-nearly-unlimited.patch:
  Refreshed with quilt.
* debian/patches/ppd-poll-with-client-conf.patch,
  debian/patches/manpage-hyphen-minus.patch,
  debian/patches/drop_unnecessary_dependencies.patch,
  debian/patches/do-not-broadcast-with-hostnames.patch,
  debian/patches/manpage-translations.patch,
  debian/patches/printer-filtering.patch: Updated manually to apply
  to the new CUPS version.
* debian/patches/ippfind-fix-port-output.patch: Fixed output of the port
  number when listing available IPP printer URIs with ippfind.
* debian/patches/tests-ignore-warnings.patch: Added error counting exception
  from usb-backend-do-not-crash-if-usb-disabled-in-bios.patch to this patch.
* debian/patches/ubuntu/ubuntu-tests-skip-number-of-errors.patch:
  Override error_log error message count test.
* debian/patches/tests-skip-ipp.patch,
  debian/patches/ubuntu/ubuntu-tests-skip-ipp.patch: Make the temporary
  test override a Ubuntu-only patch.
* debian/patches/manpage-translations.patch: Temporarily deactivated, po4a
  problem.
* debian/cups-client.install, debian/rules: Install the newly added ippfind
  utility and its man page.
* debian/libcups2-dev.install: Added pwg.h to libcups2-dev package.
* debian/control: Instead of removing the "Recommends: ghostscript-cups"
  use "cups-filters (>= 1.0.36) | ghostscript-cups (>= 9.02~)".
* debian/libcups2.symbols, debian/libcupsppdc1.symbols: Refreshed using the
  diff of the dpkg-gensymbols output during build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*
2
 
 * "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $"
 
2
 * "$Id: socket.c 10996 2013-05-29 11:51:34Z msweet $"
3
3
 *
4
4
 *   AppSocket backend for CUPS.
5
5
 *
73
73
  int           print_fd;               /* Print file */
74
74
  int           copies;                 /* Number of copies to print */
75
75
  time_t        start_time;             /* Time of first connect */
76
 
#ifdef __APPLE__
77
 
  time_t        current_time,           /* Current time */
78
 
                wait_time;              /* Time to wait before shutting down socket */
79
 
#endif /* __APPLE__ */
80
76
  int           contimeout;             /* Connection timeout */
81
77
  int           waiteof;                /* Wait for end-of-file? */
82
78
  int           port;                   /* Port number */
410
406
 
411
407
  fprintf(stderr, "DEBUG: Connected to %s:%d...\n",
412
408
          httpAddrString(&(addr->addr), addrname, sizeof(addrname)),
413
 
          _httpAddrPort(&(addr->addr)));
 
409
          httpAddrPort(&(addr->addr)));
414
410
 
415
411
 /*
416
412
  * Print everything...
438
434
      _cupsLangPrintFilter(stderr, "INFO", _("Print file sent."));
439
435
  }
440
436
 
441
 
#ifdef __APPLE__
442
 
 /*
443
 
  * Wait up to 5 seconds to get any pending back-channel data...
444
 
  */
445
 
 
446
 
  wait_time = time(NULL) + 5;
447
 
  while (wait_time >= time(&current_time))
448
 
    if (wait_bc(device_fd, wait_time - current_time) <= 0)
449
 
      break;
450
 
#endif /* __APPLE__ */
451
 
 
452
437
  if (waiteof)
453
438
  {
454
439
   /*
535
520
 
536
521
 
537
522
/*
538
 
 * End of "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $".
 
523
 * End of "$Id: socket.c 10996 2013-05-29 11:51:34Z msweet $".
539
524
 */