Commit 58bcd7e0 authored by Didier Raboud's avatar Didier Raboud

Merge branch 'debian/master' into debian/experimental

parents eb59f0d8 b8dab4e2
Description: cupsd-logs is in section 5, not 8
Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Upstream-Bug: https://cups.org/str.php?L4674
Last-Update: 2015-07-15
--- a/man/Makefile
+++ b/man/Makefile
@@ -43,6 +43,7 @@
cups-files.conf.$(MAN5EXT) \
cups-snmp.conf.$(MAN5EXT) \
cupsd.conf.$(MAN5EXT) \
+ cupsd-logs.$(MAN5EXT) \
ipptoolfile.$(MAN5EXT) \
mailto.conf.$(MAN5EXT) \
mime.convs.$(MAN5EXT) \
@@ -61,7 +62,6 @@
cups-snmp.$(MAN8EXT) \
cupsd.$(MAN8EXT) \
cupsd-helper.$(MAN8EXT) \
- cupsd-logs.$(MAN8EXT) \
cupsenable.$(MAN8EXT) \
lpadmin.$(MAN8EXT) \
lpinfo.$(MAN8EXT) \
......@@ -56,7 +56,7 @@ Last-Update: 2015-07-15
#
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
@@ -0,0 +1,248 @@
+#
+# "$Id: $"
+#
......
# patches accepted and committed upstream
str4538-fix-redirection-from-cgi-scripts.patch
str4646-fix-the-activejobs-loop-in-cupsdcheckjobs.patch
# patches sent upstream
pwg-raster-attributes.patch
......@@ -8,7 +6,6 @@ manpage-hyphen-minus.patch
rootbackends-worldreadable.patch
fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
libsystemd.patch
cupsd-logs-manpage-in-section-5.patch
str4679-fix-local-domainsocket-access-checking.patch
# patches which should go upstream
......
Description: Fix redirection from CGI scripts
Author: Mike Sweet <msweet@apple.com>
Origin: upstream
Bug: https://cups.org/str.php?L4538
Last-Update: 2015-06-24
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2159,6 +2159,9 @@
http_status_t code, /* I - Error code */
int auth_type)/* I - Authentication type */
{
+ char location[HTTP_MAX_VALUE]; /* Location field */
+
+
cupsdLogClient(con, CUPSD_LOG_DEBUG2, "cupsdSendError code=%d, auth_type=%d",
code, auth_type);
@@ -2191,8 +2194,12 @@
* never disable it in that case.
*/
+ strlcpy(location, httpGetField(con->http, HTTP_FIELD_LOCATION), sizeof(location));
+
httpClearFields(con->http);
+ httpSetField(con->http, HTTP_FIELD_LOCATION, location);
+
if (code >= HTTP_STATUS_BAD_REQUEST && con->type != CUPSD_AUTH_NEGOTIATE)
httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF);
Description: Fix the ActiveJobs loop in cupsdCheckJobs()
When looping over the active jobs, if a pending job is started it will
have looped through the ActiveJobs array, meaning further pending
active jobs will be skipped for another 10 seconds (the senddoc
delay).
Author: Tim Waugh <twaugh@redhat.com>
Origin: upstream
Bug: https://cups.org/str.php?L4646
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -392,7 +392,9 @@
* Start the job...
*/
+ cupsArraySave(ActiveJobs);
start_job(job, printer);
+ cupsArrayRestore(ActiveJobs);
}
}
}
......@@ -8,7 +8,7 @@ Bug-Debian: https://bugs.debian.org/792730
Last-Update: 2015-07-18
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1017,7 +1017,7 @@
@@ -1012,7 +1012,7 @@
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment