Merge pull request #393 from minond/master

Request headers

Author: film42

lib/protobuf/rpc/env.rb

@@ -41,6 +41,7 @@ def self.hash_accessor(*names) #:nodoc:
                     :method_name,
                     :request,
                     :request_type,
+                    :request_wrapper,
                     :response,
                     :response_type,
                     :rpc_method,

lib/protobuf/rpc/middleware/request_decoder.rb

@@ -21,6 +21,7 @@ def _call(env)
           env.service_name = service_name
           env.method_name = method_name
           env.request = request
+          env.request_wrapper = request_wrapper
           env.client_host = request_wrapper.caller
 
           env.rpc_service = service

lib/protobuf/rpc/rpc.pb.rb

@@ -31,6 +31,7 @@ class ErrorReason < ::Protobuf::Enum
     #
     class Request < ::Protobuf::Message; end
     class Response < ::Protobuf::Message; end
+    class Header < ::Protobuf::Message; end
 
 
     ##
@@ -41,6 +42,7 @@ class Request
       required :string, :method_name, 2
       optional :bytes, :request_proto, 3
       optional :string, :caller, 4
+      repeated ::Protobuf::Socketrpc::Header, :headers, 5
     end
 
     class Response
@@ -51,6 +53,11 @@ class Response
       optional :string, :server, 5
     end
 
+    class Header
+      required :string, :key, 1
+      optional :string, :value, 2
+    end
+
   end
 
 end

proto/rpc.proto

@@ -30,6 +30,7 @@ message Request
   required string method_name = 2;              // Service method to invoke
   optional bytes request_proto = 3;             // Serialized request bytes
   optional string caller = 4;                   // Calling hostname or address
+  repeated Header headers = 5;                  // General purpose request headers
 }
 
 message Response
@@ -41,6 +42,11 @@ message Response
   optional string server = 5;                   // Server hostname or address
 }
 
+message Header {
+  required string key = 1;
+  optional string value = 2;
+}
+
 // Possible error reasons
 // The server-side errors are returned in the response from the server.
 // The client-side errors are returned by the client-side code when it doesn't