Issue 127886 - Upgraded bundled curl from 7.19.7 to 7.61.1
Summary: Upgraded bundled curl from 7.19.7 to 7.61.1
Status: CLOSED FIXED
Alias: None
Product: General
Classification: Code
Component: code (show other issues)
Version: 4.1.6-dev
Hardware: All All
: P5 (lowest) Normal (vote)
Target Milestone: 4.1.6
Assignee: AOO issues mailing list
QA Contact:
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-09-10 05:37 UTC by Don Lewis
Modified: 2022-10-28 12:54 UTC (History)
2 users (show)

See Also:
Issue Type: PATCH
Latest Confirmation in: ---
Developer Difficulty: ---
petko: 4.1.6_release_blocker+

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description Don Lewis 2018-09-10 05:37:03 UTC 
These trunk commits should be merged to AOO416 to upgrade the bundled version of curl from 7.19.7 to 7.61.1:
  https://svn.apache.org/viewvc?view=revision&revision=1754469
  https://svn.apache.org/viewvc?view=revision&revision=1756017
  https://svn.apache.org/viewvc?view=revision&revision=1761808
  https://svn.apache.org/viewvc?view=revision&revision=1772139
  https://svn.apache.org/viewvc?view=revision&revision=1825850
  https://svn.apache.org/viewvc?view=revision&revision=1839837
  https://svn.apache.org/viewvc?view=revision&revision=1840427

In the top level directory of AOO416:
  svn merge -c 1754469 '^/openoffice/trunk' .
    take their side of conflict on external_deps.lst
  svn rm main/curl/curl-7.19.7.patch
  svn merge -c 1756017 '^/openoffice/trunk' .
  svn merge -c 1761808 '^/openoffice/trunk' .
  svn merge -c 1772139 '^/openoffice/trunk' .
  svn merge -c 1825850 '^/openoffice/trunk' .
  svn merge -c 1839837 '^/openoffice/trunk' .
  svn merge -c 1840427 '^/openoffice/trunk' .

Tested in 4.1.6 on 32-bit Windows 7 and CentOS 6 x86_64.
Comment 1 Peter 2018-09-16 09:25:58 UTC 
Accepted for 4.1.6
Comment 2 SVN Robot 2018-10-07 21:13:58 UTC 
"petko" committed SVN revision 1843088 into branches/AOO416:
Issue 127886 - Upgraded bundled curl from 7.19.7 to 7.61.1
Comment 3 Matthias Seidel 2018-10-09 10:37:04 UTC 
Fix confirmed in r1843088 on Windows 7 (32-bit).