Zip utf-8 file names with encoding bit set.

third_party/zlib/google/zip.cc

Index: third_party/zlib/google/zip.cc
diff --git a/third_party/zlib/google/zip.cc b/third_party/zlib/google/zip.cc
index 64aead1d64a1edfae35e9d21acb8025c97b151e4..c46e56fa07a239354b85486edde33734144fa60e 100644
--- a/third_party/zlib/google/zip.cc
+++ b/third_party/zlib/google/zip.cc
@@ -60,12 +60,14 @@ bool AddEntryToZip(zipFile zip_file, const base::FilePath& path,
   bool is_directory = base::DirectoryExists(path);
   if (is_directory)
     str_path += "/";
-
-  if (ZIP_OK != zipOpenNewFileInZip(
+  const unsigned long LANGUAGE_ENCODING_FLAG = 0x1 << 11;

[hshi1, 2013/12/04 18:30:41]

This flag definition seems to come out of nowhere and I couldn't find it in any
existing header files. Is this defined in a spec document?

+  if (ZIP_OK != zipOpenNewFileInZip4(
       zip_file, str_path.c_str(),
       NULL, NULL, 0u, NULL, 0u, NULL,  // file info, extrafield local, length,
                                        // extrafield global, length, comment
-      Z_DEFLATED, Z_DEFAULT_COMPRESSION)) {
+      Z_DEFLATED, Z_DEFAULT_COMPRESSION, 0,
+      -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+      NULL, 0, 0, LANGUAGE_ENCODING_FLAG)) {
     DLOG(ERROR) << "Could not open zip file entry " << str_path;
     return false;
   }