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

[palik]

Bug #1348865 "gearman with http, bad request line, gearmand die"
is closed in gearman-2 but it is steel an issue in gearman-1.0.

bug fixing is commited in revno: 802

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

803. By palik on 2014-12-23

bug fixing: http response an empty content on post request

[palik (1-infe-w)]

HTTP request get a response without content. Content-Lenght: 0

bug report https://bugs.launchpad.net/gearmand/+bug/1152707 is an issue in gearman-1 too.

please apply http://bazaar.launchpad.net/~1-infe-w/gearmand/1.0/revision/803 to fix it.

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

804. By palik on 2015-01-23

wrong memcached_return_t in error log. bug r1413889

805. By palik on 2015-02-02

libmemcached produces QUEUE_ERROR for background jobs without unique keys

806. By palik on 2015-05-29

unique size assertion in memcache callback_loade avoids restart if unique keys weren't use

Unmerged revisions

806. By palik on 2015-05-29

unique size assertion in memcache callback_loade avoids restart if unique keys weren't use

805. By palik on 2015-02-02

libmemcached produces QUEUE_ERROR for background jobs without unique keys

804. By palik on 2015-01-23

wrong memcached_return_t in error log. bug r1413889

803. By palik on 2014-12-23

bug fixing: http response an empty content on post request

802. By palik on 2014-12-17

bugfix endless loop on http bad request or bad method

=== 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-05-29 09:44:03 +0000
@@ -157,6 +157,9 @@
     case GEARMAN_COMMAND_WORK_FAIL:
     case GEARMAN_COMMAND_ECHO_RES:
     case GEARMAN_COMMAND_WORK_COMPLETE:
+    {
+      ret_ptr= GEARMAN_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,11 @@
     {
       gearmand_log_error(GEARMAN_DEFAULT_LOG_PARAM, "bad request line: %.*s", (uint32_t)request_size, request);
       set_response(gearmand::protocol::httpd::HTTP_NOT_FOUND);
+<<<<<<< TREE
       ret_ptr= GEARMAND_SUCCESS;
+=======
+      ret_ptr= GEARMAN_INVALID_PACKET;
+>>>>>>> MERGE-SOURCE
       return 0;
     }
 
@@ -330,7 +336,11 @@
       {
         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);
+<<<<<<< TREE
         ret_ptr= GEARMAND_SUCCESS;
+=======
+        ret_ptr= GEARMAN_INVALID_PACKET;
+>>>>>>> MERGE-SOURCE
         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-05-29 09:44:03 +0000
@@ -243,7 +243,14 @@
   memcached_return rc= memcached_delete(memc_, (const char *)key, key_length, 0);
   if (rc != MEMCACHED_SUCCESS)
   {
+<<<<<<< TREE
     return gearmand_gerror(memcached_last_error_message(memc_), GEARMAND_QUEUE_ERROR);
+=======
+    if(rc != MEMCACHED_NOTFOUND)
+    {
+      return gearmand_gerror(memcached_strerror(memc_, rc), GEARMAN_QUEUE_ERROR);
+    }
+>>>>>>> MERGE-SOURCE
   }
 
   return GEARMAND_SUCCESS;
@@ -313,7 +320,7 @@
   size_t unique_size= strlen(unique);
 
   assert(unique);
-  assert(unique_size);
+  //assert(unique_size);
   assert(function);
   assert(function_len);