Skip to content

Fix match() function for PHP56WithOpenSSL11Patch#1066

Merged
morozov merged 1 commit intophpbrew:masterfrom
markwu:fix-match-function-for-PHP56WithOpenSSL11Patch
Dec 7, 2019
Merged

Fix match() function for PHP56WithOpenSSL11Patch#1066
morozov merged 1 commit intophpbrew:masterfrom
markwu:fix-match-function-for-PHP56WithOpenSSL11Patch

Conversation

@markwu
Copy link
Contributor

@markwu markwu commented Dec 5, 2019

Fixed match() function for PHP56WithOpenSSL11Patch.php.

Reference: #1041

@markwu
Copy link
Contributor Author

markwu commented Dec 5, 2019

My build commands are

$ phpbrew --debug install --jobs "$(nproc)" 5.6.40 +default +dbs +dba +apxs2 +bz2="$(brew --prefix bzip2)" +zlib="$(brew --prefix zlib)" +curl="$(brew --prefix curl)"
$ phpbrew ext install gettext -- --with-gettext="$(brew --prefix gettext)" && phpbrew ext install iconv -- --with-iconv="$(brew --prefix libiconv)" && phpbrew ext install ftp -- --with-openssl-dir="$(brew --prefix [email protected])" && phpbrew ext install exif && phpbrew ext install soap && phpbrew ext install gd -- --with-gd=shared --with-zlib-dir="$(brew --prefix zlib)" && phpbrew ext install opcache && phpbrew ext install xdebug 2.5.5

Everything works, without any problems.

@coveralls
Copy link

coveralls commented Dec 5, 2019

Coverage Status

Coverage increased (+0.005%) to 40.222% when pulling 0a5f09c on markwu:fix-match-function-for-PHP56WithOpenSSL11Patch into 01f24a6 on phpbrew:master.

@markwu
Copy link
Contributor Author

markwu commented Dec 5, 2019

Okay, I also tested this PR to build 7.3.12, 7.2.25 and 5.6.40, all of them works.

@morozov morozov added Bug OpenSSL Issues related to compiling PHP with OpenSSL labels Dec 6, 2019
@morozov morozov added this to the Release 1.25.0 milestone Dec 6, 2019
@morozov
Copy link
Contributor

morozov commented Dec 7, 2019

Looks good. Please squash all the changes in one commit.

@markwu
Copy link
Contributor Author

markwu commented Dec 7, 2019

Let me figure how to use squash, I never use it.

@markwu
Copy link
Contributor Author

markwu commented Dec 7, 2019

Okay, I just squashed 3 commits to 1. Done.

@morozov morozov merged commit c7df465 into phpbrew:master Dec 7, 2019
@morozov
Copy link
Contributor

morozov commented Dec 7, 2019

Thank you, @markwu!

@morozov morozov added the Patching PHP Resolving the issue requires patching PHP sources label Dec 7, 2019
@morozov morozov self-assigned this Dec 7, 2019
@markwu markwu deleted the fix-match-function-for-PHP56WithOpenSSL11Patch branch December 9, 2019 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Bug OpenSSL Issues related to compiling PHP with OpenSSL Patching PHP Resolving the issue requires patching PHP sources

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants