Merge remote-tracking branch 'upstream/master'

Author: plotn

android/AndroidManifest.xml

@@ -4,7 +4,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.coolreader"
       android:installLocation="auto"
-      android:versionName="3.2.7-1" android:versionCode="2071">
+      android:versionName="3.2.9-1" android:versionCode="2091">
     <supports-screens
         android:xlargeScreens="true"
         android:largeScreens="true"

android/app/build.gradle

@@ -8,8 +8,8 @@ android {
         targetSdkVersion 26
         // When new version released, version code must be incremented at least by 8
         // for compatibility with ABI versioning of split apk (see below).
-        versionCode 2071
-        versionName "3.2.7-1"
+        versionCode 2091
+        versionName "3.2.9-1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

android/src/org/coolreader/crengine/OPDSUtil.java

@@ -141,7 +141,7 @@ public static String convertHref( URL baseURL, String href ) {
 				return baseURL.getProtocol() + ":" + href;
 			if ( href.startsWith("/") )
 				return baseURL.getProtocol() + "://" + hostPort + href;
-			if ( !href.startsWith("http://") ) {
+			if ( !href.startsWith("http://") && !href.startsWith("https://") ) {
 				return baseURL.getProtocol() + "://" + hostPort + dirPath(baseURL.getPath()) + "/" + href;
 			}
 			return href;

crengine/src/lvxml.cpp

@@ -3455,7 +3455,7 @@ int PreProcessXmlString(lChar16 * str, int len, lUInt32 flags, const lChar16 * e
                 int n;
                 lChar16 code = 0;
                 // TODO: optimize search
-                if ( str[k]==';' || str[k]==' ' ) {
+                if ( str[i+k]==';' || str[i+k]==' ' ) {
                     for ( n=0; def_entity_table[n].name; n++ ) {
                         if ( !lStr_cmp( def_entity_table[n].name, entname ) ) {
                             code = def_entity_table[n].code;
@@ -3464,7 +3464,7 @@ int PreProcessXmlString(lChar16 * str, int len, lUInt32 flags, const lChar16 * e
                     }
                 }
                 if ( code ) {
-                    i=k;
+                    i+=k;
                     state = 0;
                     if ( enc_table && code<256 && code>=128 )
                         code = enc_table[code - 128];