Merge lp:~1-infe-w/gearmand/gearmand into lp:gearmand

[palik]

HTTP POST result without content.
Same as
https://code.launchpad.net/~1-infe-w/gearmand/1.0/+merge/244981

[palik (1-infe-w)]

http://bazaar.launchpad.net/~1-infe-w/gearmand/gearmand/revision/910

[lp:~1-infe-w/gearmand/gearmand]

911. By palik on 2015-09-15

bad request line, or bad http method kills gearmand

[palik (1-infe-w)]

gearmand can be killed by unknown HTTP method or malicious request

#1348865
r911

[palik (1-infe-w)]

http://bazaar.launchpad.net/~1-infe-w/gearmand/gearmand/revision/911

Unmerged revisions

911. By palik on 2015-09-15

bad request line, or bad http method kills gearmand

910. By palik on 2015-09-15

bug fix: HTTP Request yields Response with empty content

909. By palik on 2015-05-29

LibmemcachedQueue::done mecache_delete returns MEMCACHED_NOTFOUND; callback_loader dangerous unique_size assertion

=== modified file 'docs/Makefile'
--- docs/Makefile	2014-02-16 02:15:49 +0000
+++ docs/Makefile	2015-09-15 13:29:21 +0000
@@ -198,3 +198,6 @@
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
 	@echo
 	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+
+install:
+    

=== modified file 'libgearman-server/plugins/protocol/http/protocol.cc'
--- libgearman-server/plugins/protocol/http/protocol.cc	2013-07-07 00:16:26 +0000
+++ libgearman-server/plugins/protocol/http/protocol.cc	2015-09-15 13:29:21 +0000
@@ -157,6 +157,9 @@
     case GEARMAN_COMMAND_WORK_FAIL:
     case GEARMAN_COMMAND_ECHO_RES:
     case GEARMAN_COMMAND_WORK_COMPLETE:
+    {
+      ret_ptr = GEARMAND_SUCCESS;
+    }
       break;
 
     case GEARMAN_COMMAND_JOB_CREATED:
@@ -215,14 +218,13 @@
                                     "HTTP/1.0 200 OK\r\n"
                                     "X-Gearman-Job-Handle: %.*s\r\n"
                                     "X-Gearman-Command: %s\r\n"
-                                    "Content-Length: %d\r\n"
+                                    "Content-Length: %" PRIu64 "\r\n"
                                     "Server: Gearman/" PACKAGE_VERSION "\r\n"
-                                    "\r\n%.*s",
+                                    "\r\n",
                                     packet->command == GEARMAN_COMMAND_JOB_CREATED ?  int(packet->arg_size[0]) : int(packet->arg_size[0] - 1),
                                     (const char *)packet->arg[0], // Job handle
                                     gearman_strcommand(packet->command),
-                                    int(content.size()), // Content-length
-                                    int(content.size()), &content[0]);
+                                    (uint64_t)packet->data_size); // Content-length
       }
       else
       {
@@ -294,7 +296,7 @@
     {
       gearmand_log_error(GEARMAN_DEFAULT_LOG_PARAM, "bad request line: %.*s", (uint32_t)request_size, request);
       set_response(gearmand::protocol::httpd::HTTP_NOT_FOUND);
-      ret_ptr= GEARMAND_SUCCESS;
+      ret_ptr= GEARMAND_INVALID_PACKET;
       return 0;
     }
 
@@ -330,7 +332,7 @@
       {
         gearmand_log_error(GEARMAN_DEFAULT_LOG_PARAM, "bad method: %.*s", (uint32_t)method_size, method_str);
         set_response(gearmand::protocol::httpd::HTTP_METHOD_NOT_ALLOWED);
-        ret_ptr= GEARMAND_SUCCESS;
+        ret_ptr= GEARMAND_INVALID_PACKET;
         return 0;
       }
     }

=== modified file 'libgearman-server/plugins/queue/libmemcached/queue.cc'
--- libgearman-server/plugins/queue/libmemcached/queue.cc	2013-05-12 01:03:50 +0000
+++ libgearman-server/plugins/queue/libmemcached/queue.cc	2015-09-15 13:29:21 +0000
@@ -243,7 +243,10 @@
   memcached_return rc= memcached_delete(memc_, (const char *)key, key_length, 0);
   if (rc != MEMCACHED_SUCCESS)
   {
-    return gearmand_gerror(memcached_last_error_message(memc_), GEARMAND_QUEUE_ERROR);
+     if(rc != MEMCACHED_NOTFOUND)
+     {
+       return gearmand_gerror(memcached_strerror(memc_, rc), GEARMAND_QUEUE_ERROR);
+     }
   }
 
   return GEARMAND_SUCCESS;
@@ -313,7 +316,7 @@
   size_t unique_size= strlen(unique);
 
   assert(unique);
-  assert(unique_size);
+  //assert(unique_size);
   assert(function);
   assert(function_len);