← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kvirc/trusty-proposed

« back to all changes in this revision

Viewing changes to src/kvilib/net/KviHttpRequest.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kai Wasserbäch
  • Date: 2011-05-07 16:59:40 UTC
  • mfrom: (0.3.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20110507165940-rpkzwgd7xrj0c2d4
Tags: 4:4.1.1~svn5829-1
The "Sleeping Potion" release.

* Synced to upstream's SVN revision 5829.
* debian/gbp.conf: Ensure tags get signed.
* debian/control: Bumped Standards-Version to 3.9.2, no further changes
  needed.
* debian/patches:
  - 10_fix_desktop_entry.patch: Refreshed.
  - 22_use_old_.protocol_file_names.patch: Added, sort of reverts upstream's
    r5756.
* debian/kvirc-data.install: Updated for correct .protocol file
  installation.
* debian/kvirc.lintian-overrides: Updated to match Lintian's current output.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/kvilib/net/KviHttpRequest.cpp
575
575
                szHeader = "";
576
576
        }
577
577
 
578
 
        szResponse.trimmed();
 
578
        szResponse.trim();
579
579
 
580
580
        bool bValid = false;
581
581
 
586
586
        {
587
587
                KviCString szR = szResponse;
588
588
                szR.cutToFirst(' ');
589
 
                szR.trimmed();
 
589
                szR.trim();
590
590
                int idx = szR.findFirstIdx(' ');
591
591
                KviCString szNumber;
592
592
                if(idx != -1)szNumber = szR.left(idx);
637
637
                {
638
638
                        KviCString szName = s->left(idx);
639
639
                        s->cutLeft(idx + 1);
640
 
                        s->trimmed();
 
640
                        s->trim();
641
641
                        hdr.replace(szName.ptr(),new KviCString(*s));
642
642
                        //qDebug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr());
643
643
                }
735
735
        if((m_uMaxContentLength > 0) && (m_uTotalSize > ((unsigned int)m_uMaxContentLength)))
736
736
        {
737
737
                resetInternalStatus();
738
 
                m_szLastError=__tr2qs("Stream exceeding maximum length");
 
738
                m_szLastError=__tr2qs("The amount of received data exceeds the maximum length");
739
739
                emit terminated(false);
740
740
                return false;
741
741
        }
819
819
                        if(((m_uTotalSize > 0) && (m_uReceivedSize > m_uTotalSize)) || ((m_uMaxContentLength > 0) && (m_uReceivedSize > m_uMaxContentLength)))
820
820
                        {
821
821
                                resetInternalStatus();
822
 
                                m_szLastError=__tr2qs("Stream exceeded expected length");
 
822
                                m_szLastError=__tr2qs("The amount of received data exceeds expected length");
823
823
                                emit terminated(false);
824
824
                        }
825
825
 
961
961
        if(((m_uTotalSize > 0) && (m_uReceivedSize > m_uTotalSize)) || ((m_uMaxContentLength > 0) && (m_uReceivedSize > m_uMaxContentLength)))
962
962
        {
963
963
                resetInternalStatus();
964
 
                m_szLastError=__tr2qs("Stream exceeded expected length");
 
964
                m_szLastError=__tr2qs("The amount of received data exceeds expected length");
965
965
                emit terminated(false);
966
966
        }
967
967
        return;