Changeset 34393 for main/trunk/greenstone2/perllib/unicode.pm

Timestamp:

2020-09-15T20:19:33+12:00 (4 years ago)

Author:

ak19

Message:

Commit of independent code update before committing a bugfix. In this commit, the results of base64 encoding can have linebreaks, which aren't what we want or expect, so have a flag for removing them.

File:

• main/trunk/greenstone2/perllib/unicode.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/unicode.pm

@@ -708 +708 @@
     my ($text) = @_;
     my $force_encode = 1;
-    return &base64_encode($text, $force_encode);
+    my $no_newlines = 1;
+    return &base64_encode($text, $force_encode, $no_newlines);
 }
 
 sub base64_encode {
-    my ($text, $force_encode) = @_;
+    my ($text, $force_encode, $no_newlines) = @_;
     if($force_encode || !&conforms_to_mod_base64($text)) {
     # return entity for underscore to underscore before encoding
@@ -722 +723 @@
     $text =~ s/\+/\-/g; # + -> -
     $text =~ s/\//\_/g; # / -> _
+    
+    # by default base64 encoding a long string introduces newlines to break long strings,
+    # see https://stackoverflow.com/questions/19952621/is-it-ok-to-remove-newline-in-base64-encoding
+    # Java doesn't like that
+    $text =~ s/\n//gs if $no_newlines;
     }
     return $text;
@@ -793 +799 @@
 }
 
-
 sub raw_filename_to_url_encoded
 {