Merge branch 'v0.20.x'

NEWS

@@ -9,6 +9,10 @@ ver 0.21 (not yet released)
 * output
   - alsa: non-blocking mode
 
+ver 0.20.11 (not yet released)
+* storage
+  - curl: support Content-Type application/xml
+
 ver 0.20.10 (2017/08/24)
 * decoder
   - ffmpeg: support MusicBrainz ID3v2 tags

doc/protocol.xml

@@ -444,7 +444,9 @@
               <listitem>
                 <para>
                   <varname>volume</varname>:
-                  <returnvalue>0-100</returnvalue>
+                  <returnvalue>0-100</returnvalue> or
+                  <returnvalue>-1</returnvalue> if the volume cannot
+                  be determined
                 </para>
               </listitem>
               <listitem>

src/storage/plugins/CurlStorage.cxx

@@ -210,6 +210,22 @@ ParseU64(const char *s, size_t length)
 	return ParseU64(std::string(s, length).c_str());
 }
 
+gcc_pure
+static bool
+IsXmlContentType(const char *content_type) noexcept
+{
+	return StringStartsWith(content_type, "text/xml") ||
+		StringStartsWith(content_type, "application/xml");
+}
+
+gcc_pure
+static bool
+IsXmlContentType(const std::multimap<std::string, std::string> &headers) noexcept
+{
+	auto i = headers.find("content-type");
+	return i != headers.end() && IsXmlContentType(i->second.c_str());
+}
+
 /**
  * A WebDAV PROPFIND request.  Each "response" element will be passed
  * to OnDavResponse() (to be implemented by a derived class).
@@ -271,9 +287,7 @@ private:
 			throw FormatRuntimeError("Status %d from WebDAV server; expected \"207 Multi-Status\"",
 						 status);
 
-		auto i = headers.find("content-type");
+		if (!IsXmlContentType(headers))
-		if (i == headers.end() ||
-		    strncmp(i->second.c_str(), "text/xml", 8) != 0)
 			throw std::runtime_error("Unexpected Content-Type from WebDAV server");
 	}
 

win32/build.py

@@ -51,6 +51,11 @@ class CrossGccToolchain:
         self.strip = os.path.join(toolchain_bin, arch + '-strip')
 
         common_flags = ''
+
+        if not x64:
+            # enable SSE support which is required for LAME
+            common_flags += ' -march=pentium3'
+
         self.cflags = '-O2 -g ' + common_flags
         self.cxxflags = '-O2 -g ' + common_flags
         self.cppflags = '-isystem ' + os.path.join(install_prefix, 'include')