commit 2f864fdfdf18318ef24b02141733adb356508370
author Hao Nguyen <haon@google.com> Wed Mar 20 11:45:01 2019 -0700
committer Hao Nguyen <haon@google.com> Wed Mar 20 11:45:01 2019 -0700
tree e13b6e37f187bf02e913ecbc12777d5df4f23268
parent 59284450fa2a85f9f355b4de5a733323af094dcf

Down integrate to Github

conformance/conformance_cpp.cc

diff --git a/conformance/conformance_cpp.cc b/conformance/conformance_cpp.cc
index ff70d5d..5a1f214 100644
--- a/conformance/conformance_cpp.cc
+++ b/conformance/conformance_cpp.cc
@@ -214,8 +214,10 @@
     }
 
     case conformance::TEXT_FORMAT: {
-      GOOGLE_CHECK(TextFormat::PrintToString(*test_message,
-                                             response->mutable_text_payload()));
+      TextFormat::Printer printer;
+      printer.SetHideUnknownFields(!request.print_unknown_fields());
+      GOOGLE_CHECK(printer.PrintToString(*test_message,
+                                         response->mutable_text_payload()));
       break;
     }