https://bz.apache.org/ooo/show_bug.cgi?id=127886
Issue ID: 127886
Issue Type: PATCH
Summary: Upgraded bundled curl from 7.19.7 to 7.61.1
Product: General
Version: 4.1.6-dev
Hardware: All
OS: All
Status: CONFIRMED
Severity: Normal
Priority: P5 (lowest)
Component: code
Assignee: [email protected]
Reporter: [email protected]
Target Milestone: ---
Flags: 4.1.6_release_blocker?
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.
--
You are receiving this mail because:
You are the assignee for the issue.
