8000 Fix the patch corrupted after inlining by morozov · Pull Request #1123 · phpbrew/phpbrew · GitHub
[go: up one dir, main page]
Skip to content

Fix the patch corrupted after inlining#1123

Merged
morozov merged 1 commit intophpbrew:masterfrom
morozov:fix-patch-line-endings
Dec 24, 2019
Merged

Fix the patch corrupted after inlining#1123
morozov merged 1 commit intophpbrew:masterfrom
morozov:fix-patch-line-endings

Conversation

@morozov
Copy link
Contributor
@morozov morozov commented Dec 24, 2019 •
edited
Loading

The chunks containing mixed line endings were related to the test files which PHPBrew doesn't use, so we can skip them.

===> Checking patches...
Checking patch for php5.3.29 multi-sapi
Checking patch for php5.3.x on 64bit machine when intl is enabled.
Checking patch for openssl dso linking patch
Checking patch for php5.6 with openssl 1.1.x patch.
---> Applying patch...
patching file ext/openssl/openssl.c
patching file ext/openssl/xp_ssl.c
patching file ext/phar/util.c
patching file ext/openssl/openssl.c
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 651 with fuzz 1.

@morozov morozov added Bug Patching PHP Resolving the issue requires patching PHP sources Regression A bug that that was introduced as part of a feature or another bug fix OpenSSL Issues related to compiling PHP with OpenSSL labels Dec 24, 2019
@morozov morozov added this to the Release 1.25.0 milestone Dec 24, 2019
@morozov morozov mentioned this pull request Dec 24, 2019
Merged
@morozov morozov changed the title Preserve the original line endings in the patch Fix the patch corrupted after inlining Dec 24, 2019
@morozov
Fix the patch corrupted after inlining
c27de73 
The chunks containing mixed line endings were related to the test files which PHPBrew doesn't use, so we can skip them.
@morozov morozov merged commit 68762dc into phpbrew:master Dec 24, 2019
@morozov morozov deleted the fix-patch-line-endings branch December 24, 2019 18:28
@morozov morozov self-assigned this Dec 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@morozov morozov

Labels

Bug OpenSSL Issues related to compiling PHP with OpenSSL Patching PHP Resolving the issue requires patching PHP sources Regression A bug that that was introduced as part of a feature or another bug fix

Projects

None yet

Milestone

Release 1.25.0

Development

Successfully merging this pull request may close these issues.

1 participant

@morozov

Comments
0