Skip to content
Snippets Groups Projects
  1. May 11, 2016
  2. May 09, 2016
  3. Apr 20, 2016
  4. Apr 19, 2016
  5. Apr 18, 2016
  6. Apr 16, 2016
  7. Apr 15, 2016
  8. Apr 14, 2016
  9. Apr 13, 2016
    • Andreas Gohr's avatar
      34df7cb0
    • Andreas Gohr's avatar
      Added 3way merge from PEAR Text_Diff3 · a297e675
      Andreas Gohr authored
      This adds 3way merge functionality to our DifferenceEngine stack. The
      code was taken from the PEAR Text_Diff3 package and adapted to work with
      our implementation.
      
      For the curious:
      Here's a short Origin tree of the different versions of the Diff code to
      make clear how our implementation is related to the PEAR package.
      
      -- original code Geoffrey T. Dairiki
         `-- Adaption for the Horde project
             |-- Adaption for phpwiki
             |   `-- Adaption for MediaWiki
             |       `-- Adaption for DokuWiki
             `-- Creation of PEAR Text_Diff
      a297e675
  10. Apr 11, 2016
    • Andreas Gohr's avatar
      URI scheme is only relevant for TLS if not proxy connection #1526 · c67b1dab
      Andreas Gohr authored
      This should fix the test problems errors in #1527. When requesting a
      HTTPS URI from a HTTP only proxy, the initial connection is *not* TLS
      secured. The URI scheme is only relevant when directly connecting.
      
      This also changes the (wrong) assumption that everything on port 443 is
      always TLS secured. Only the URI scheme should decide that.
      c67b1dab
    • Michael Grosse's avatar
      use SSL if scheme is https · 4167de31
      Michael Grosse authored
      This is to ensure that we use SSL/TLS if a custom port is defined an no
      proxy is used.
      
      Fixes #1526
      4167de31
  11. Apr 02, 2016
  12. Mar 31, 2016
    • Andreas Gohr's avatar
      avoid HTTP Response Splitting attacks via redirects #1513 · 98ca30d2
      Andreas Gohr authored
      The header() method of PHP is vulnerable to HTTP Response Splitting
      attacks.
      
      This change makes sure the URL passed to send_redirect (and thus to
      header()) does not contain any control characters that would be needed
      to execute such an attack.
      
      Cleaning input is recommended anyway.
      98ca30d2
  13. Mar 24, 2016
  14. Mar 20, 2016
  15. Mar 19, 2016
  16. Mar 18, 2016
Loading