Ticket #8678: 0002-Attempt-to-fix-8678.patch

File 0002-Attempt-to-fix-8678.patch, 896 bytes (added by Michael Pedersen <mythtv@…>, 7 years ago)

Minor alteration of 0001-Attempt-to-fix-8678.patch that completes the fix

  • libs/libmythupnp/httprequest.cpp

    diff -r f421f639ef65 libs/libmythupnp/httprequest.cpp
    a b  
    12041204{
    12051205    // Strip out leading http://192.168.1.1:6544/ -> /
    12061206    // Should fix #8678
    1207     m_sBaseUrl.replace(QRegExp("^http://.*?/"), "/");
     1207    QRegExp sRegex("^http://.*/");
     1208    sRegex.setMinimal(true);
     1209    m_sBaseUrl.replace(sRegex, "/");
    12081210    QStringList sList = m_sBaseUrl.split('/', QString::SkipEmptyParts);
    12091211
    12101212    m_sMethod = "";
     
    12161218    }
    12171219
    12181220    m_sBaseUrl = '/' + sList.join( "/" );
    1219     //VERBOSE(VB_UPNP, QString("ExtractMethodFromURL : %1 : ").arg(m_sMethod));
     1221    VERBOSE(VB_UPNP, QString("ExtractMethodFromURL(end) : %1 : %2").arg(m_sMethod).arg(m_sBaseUrl));
    12201222}
    12211223
    12221224/////////////////////////////////////////////////////////////////////////////