Mirror fix from trunk.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@12052 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 9fd62a0731614d1e3b2bf4fefe51145e4aa5406a..fc659438f29f409d3211129c6ebd1b9e52cee046 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,10 @@
-CHANGES.txt - 1.7.4 - 2014-07-15
+CHANGES.txt - 1.7.4 - 2014-07-18
 --------------------------------
 
 CHANGES IN CUPS V1.7.5
 
        - The LPD backend did not work with some versions of glibc (STR #4452)
+       - CGI scripts did not work (STR #4454)
 
 
 CHANGES IN CUPS V1.7.4

diff --git a/scheduler/client.c b/scheduler/client.c
index deb02316162a04b9550b46870d15941f4bbf817e..e5959faf78ee6805674d75fe4d95a10eda97d985 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -3812,12 +3812,7 @@ pipe_command(cupsd_client_t *con,        /* I - Client connection */
   argv[0] = command;
 
   if (options)
-  {
-    commptr = options;
-    if (*commptr == ' ')
-      commptr ++;
-    strlcpy(argbuf, commptr, sizeof(argbuf));
-  }
+    strlcpy(argbuf, options, sizeof(argbuf));
   else
     argbuf[0] = '\0';