Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed bug #65486 mysqli_poll() is broken on Win x64 | Anatol Belski | 2013-12-12 | 1 | -2/+2 |
* | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-12-11 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Anatol Belski | 2013-12-11 | 1 | -1/+1 |
| |\ | |||||
| | * | fix dir separator in cve-2013-6420 test | Anatol Belski | 2013-12-11 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-12-10 | 3 | -4/+61 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Stanislav Malyshev | 2013-12-10 | 3 | -4/+61 |
| |\ \ | | |/ | |||||
| | * | Fix CVE-2013-6420 - memory corruption in openssl_x509_parse | Stanislav Malyshev | 2013-12-10 | 3 | -4/+61 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2013-10-09 | 1 | -12/+14 |
|\ \ \ | |/ / | |||||
| * | | C89 compatibility | Michael Wallner | 2013-10-09 | 1 | -12/+14 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2013-10-09 | 1 | -5/+6 |
|\ \ \ | |/ / | |||||
| * | | Fixed segfault when built with OpenSSL >= 1.0.1 | Daniel Lowrey | 2013-10-09 | 1 | -5/+6 |
* | | | Remove compile warning: | Christopher Jones | 2013-08-19 | 1 | -1/+1 |
* | | | Remove compile warnings: | Christopher Jones | 2013-08-19 | 1 | -2/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-19 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Stanislav Malyshev | 2013-08-19 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | fix using wrong buffer pointer | Stanislav Malyshev | 2013-08-19 | 1 | -0/+1 |
| | * | Fix CVE-2013-4073 - handling of certs with null bytes | Stanislav Malyshev | 2013-08-13 | 3 | -2/+131 |
| | * | Happy New Year~ | Xinchen Hui | 2013-01-01 | 3 | -3/+3 |
| | * | Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only | Anatoliy Belsky | 2012-04-24 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-18 | 3 | -30/+112 |
|\ \ \ | |/ / | |||||
| * | | Fix for php bug #64802 includes test case | Mark Jones | 2013-08-18 | 3 | -30/+112 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Christopher Jones | 2013-08-14 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Reduce (some) compile noise of 'unused variable' and 'may be used uninitializ... | Christopher Jones | 2013-08-14 | 2 | -2/+2 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-13 | 3 | -2/+131 |
|\ \ \ | |/ / | |||||
| * | | Fix CVE-2013-4073 - handling of certs with null bytes | Stanislav Malyshev | 2013-08-13 | 3 | -2/+131 |
| * | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 2 | -2/+2 |
* | | | Fix long-standing visual pain point: the misalignment of './configure help' t... | Christopher Jones | 2013-08-06 | 1 | -1/+1 |
* | | | fix missing include | Anatol Belski | 2013-07-23 | 1 | -0/+3 |
* | | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 2 | -2/+2 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-02-17 | 2 | -0/+26 |
|\ \ \ | |/ / | |||||
| * | | fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publ... | Stanislav Malyshev | 2013-02-17 | 2 | -0/+26 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Lars Strojny | 2013-01-31 | 1 | -0/+12 |
|\ \ \ | |/ / | |||||
| * | | NEWS entry new OpenSSL option [doc] | Lars Strojny | 2013-01-31 | 1 | -1/+1 |
| * | | Added ssl context option, "disable_compression" | Daniel Lowrey | 2013-01-31 | 1 | -0/+12 |
| * | | Happy New Year | Xinchen Hui | 2013-01-01 | 3 | -3/+3 |
* | | | Happy New Year | Xinchen Hui | 2013-01-01 | 3 | -3/+3 |
* | | | Merge branch 'PHp-5.4' | Stanislav Malyshev | 2012-09-15 | 1 | -1/+31 |
|\ \ \ | |/ / | |||||
| * | | commit for php bug 61421 | Mark Jones | 2012-09-15 | 1 | -1/+31 |
| * | | Revert "Add PBKDF2 support via openssl()" | Stanislav Malyshev | 2012-06-12 | 3 | -93/+0 |
| * | | Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound li... | Stanislav Malyshev | 2012-06-12 | 5 | -32/+32 |
* | | | One more time | Scott MacVicar | 2012-06-11 | 1 | -3/+0 |
* | | | Merge branch '5.4' | Scott MacVicar | 2012-06-11 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell. | Scott MacVicar | 2012-06-11 | 5 | -32/+32 |
| * | | Add PBKDF2 support via openssl() | Scott MacVicar | 2012-06-11 | 3 | -0/+93 |
* | | | Add PBKDF2 support via openssl() | Scott MacVicar | 2012-06-11 | 1 | -1/+0 |
* | | | Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell. | Scott MacVicar | 2012-06-11 | 5 | -32/+32 |
* | | | - Fixed build (PKCS5_PBKDF2_HMAC is from 1.0.0) | Felipe Pena | 2012-06-11 | 2 | -2/+10 |
* | | | Merge branch '5.4' | Scott MacVicar | 2012-06-11 | 3 | -0/+85 |
|\ \ \ | |||||
| * | | | Add PBKDF2 support via openssl() | Scott MacVicar | 2012-06-11 | 3 | -0/+85 |
| |/ / | |||||
* | | | Merge branch 'PHP-5.4' | Anatoliy Belsky | 2012-03-28 | 1 | -2/+2 |
|\ \ \ | |/ / |