Commit 2dc8a42b authored by jan.koester's avatar jan.koester
Browse files

test

parent 8b4262eb

plugins/media/media.cpp

+6 −6
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ namespace blogi { 
                bool hasRange = false;

                size_t rangeStart = 0, rangeEnd = 0;

                {

                    libhttppp::HttpHeader::HeaderData *rangeHdr = req.getHeaderData("Range");

                    libhttppp::HttpHeader::HeaderData *rangeHdr = req.getHeaderData("range");

                    if (rangeHdr && rangeHdr->getfirstValue()) {

                        hasRange = true;

                        std::string rangeVal = rangeHdr->getfirstValue()->getvalue();
@@ -1018,7 +1018,7 @@ namespace blogi { 


                // Forward If-None-Match so mediadb can return 304

                {

                    libhttppp::HttpHeader::HeaderData *inmHdr = req.getHeaderData("If-None-Match");

                    libhttppp::HttpHeader::HeaderData *inmHdr = req.getHeaderData("if-none-match");

                    if (inmHdr && inmHdr->getfirstValue())

                        dataReq.setHeaderData("If-None-Match")->push_back(inmHdr->getfirstValue()->getvalue());

                }
@@ -1077,7 +1077,7 @@ namespace blogi { 
                    curres.setState(HTTP304);

                    curres.setHeaderData("Cache-Control")->push_back(

                        isVideo ? "public, max-age=86400" : "public, max-age=31536000, immutable");

                    libhttppp::HttpHeader::HeaderData *etagHdr = dataRes.getHeaderData("ETag");

                    libhttppp::HttpHeader::HeaderData *etagHdr = dataRes.getHeaderData("etag");

                    if (etagHdr && etagHdr->getfirstValue())

                        curres.setHeaderData("ETag")->push_back(etagHdr->getfirstValue()->getvalue());

                    curres.send(req, "", 0);
@@ -1117,7 +1117,7 @@ namespace blogi { 
                size_t totalSize = 0;

                size_t sendSize = 0;



                libhttppp::HttpHeader::HeaderData *crHdr = dataRes.getHeaderData("Content-Range");

                libhttppp::HttpHeader::HeaderData *crHdr = dataRes.getHeaderData("content-range");

                if (crHdr && crHdr->getfirstValue()) {

                    std::string crVal = crHdr->getfirstValue()->getvalue();

                    size_t slashPos = crVal.find('/');
@@ -1175,7 +1175,7 @@ namespace blogi { 


                // Forward ETag from mediadb so the browser can use If-None-Match

                {

                    libhttppp::HttpHeader::HeaderData *etagHdr = dataRes.getHeaderData("ETag");

                    libhttppp::HttpHeader::HeaderData *etagHdr = dataRes.getHeaderData("etag");

                    if (etagHdr && etagHdr->getfirstValue())

                        curres.setHeaderData("ETag")->push_back(etagHdr->getfirstValue()->getvalue());

                }
@@ -1226,7 +1226,7 @@ namespace blogi { 
                    // Get album ID from X-Album-Id header

                    std::string albumId;

                    {

                        libhttppp::HttpHeader::HeaderData *hdr = req.getHeaderData("X-Album-Id");

                        libhttppp::HttpHeader::HeaderData *hdr = req.getHeaderData("x-album-id");

                        if(hdr && hdr->getfirstValue())

                            albumId = hdr->getfirstValue()->getvalue();

                    }