Down-integrate from internal branch

1 files changed, 21 insertions, 0 deletions

diff --git a/src/google/protobuf/unittest_custom_options.proto b/src/google/protobuf/unittest_custom_options.proto
index a610785f..e591d294 100644
--- a/src/google/protobuf/unittest_custom_options.proto
+++ b/src/google/protobuf/unittest_custom_options.proto
@@ -116,6 +116,12 @@ message CustomOptionFooRequest {
 message CustomOptionFooResponse {
 }
 
+message CustomOptionFooClientMessage {
+}
+
+message CustomOptionFooServerMessage {
+}
+
 service TestServiceWithCustomOptions {
   option (service_opt1) = -9876543210;
 
@@ -364,3 +370,18 @@ enum AggregateEnum {
   option (enumopt) = { s:'EnumAnnotation' };
   VALUE = 1 [(enumvalopt) = { s:'EnumValueAnnotation' }];
 }
+
+// Test custom options for nested type.
+message NestedOptionType {
+  message NestedMessage {
+    option (message_opt1) = 1001;
+    optional int32 nested_field = 1 [(field_opt1) = 1002];
+  }
+  enum NestedEnum {
+    option (enum_opt1) = 1003;
+    NESTED_ENUM_VALUE = 1 [(enum_value_opt1) = 1004];
+  }
+  extend google.protobuf.FileOptions {
+    optional int32 nested_extension = 7912573 [(field_opt2) = 1005];
+  }
+}