Peter Kokot
8d3f8ca12a
Remove unused Git attributes ident
...
The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.
In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.
This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.
2018-07-25 00:53:25 +02:00
Jakub Zelenka
d404b5e255
Add ssl/tls streams options for min and max proto version
2018-07-01 18:46:52 +01:00
Dmitry Stogov
5eb1f92f31
Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.
2018-05-28 16:27:12 +03:00
Jakub Zelenka
3986b6ab6e
Merge branch 'PHP-7.2'
2018-05-22 13:41:22 +01:00
Jakub Zelenka
a231860b02
Merge branch 'PHP-7.1' into PHP-7.2
2018-05-22 13:40:23 +01:00
Jakub Zelenka
68c3d09c2c
Fix bug #76174 (openssl extension fails to build with LibreSSL 2.7)
2018-05-22 13:30:58 +01:00
Gabriel Caruso
6400264856
Trailing whitespaces
...
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-01-03 14:38:00 +01:00
Xinchen Hui
a6519d0514
year++
2018-01-02 12:57:58 +08:00
Xinchen Hui
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
Dmitry Stogov
83e495e0fd
Move constants into read-only data segment
2017-12-14 22:14:36 +03:00
Dmitry Stogov
6a9d2b2190
Cleanup type conversion
2017-12-07 19:24:55 +03:00
Nikita Popov
26f8fc833b
Enable and fix printf() format warnings
...
Add _unchecked() variants of zend_spprintf and zend_strpprintf for
cases where we specifically want to disable these checks, such as
use of %H.
2017-11-16 21:15:36 +01:00
Dmitry Stogov
49ea143bbd
Encapsulate reference-counting primitives.
...
Prohibit direct update of GC_REFCOUNT(), GC_SET_REFCOUNT(), GC_ADDREF() and GC_DELREF() shoukf be instead.
Added mactros to validate reference-counting (disabled for now).
These macros are going to be used to eliminate race-condintions during reference-counting on data shared between threads.
2017-10-27 01:28:58 +03:00
Xinchen Hui
513b0093c2
Refactor php_url struct to save memory dup in common cases
2017-08-06 17:48:05 +08:00
Anatol Belski
e2b61eccb9
Followup on 0ec147d3
for another place
...
which requires also to move the macros into the header
(cherry picked from commit b7eb2c0604
)
2017-07-24 16:33:12 +02:00
Anatol Belski
b7eb2c0604
Followup on 0ec147d3
for another place
...
which requires also to move the macros into the header
2017-07-24 16:24:04 +02:00
Jakub Zelenka
26982e36d5
Add support for OpenSSL security level
2017-07-17 17:40:51 +01:00
Jakub Zelenka
5381ff757d
Make consitent naming and improve CS in xp_ssl
2017-07-16 17:57:43 +01:00
Jakub Zelenka
c08dba3431
Allow setting SNI cert and pk in separate files
2017-07-16 16:15:43 +01:00
Niklas Keller
9badf35386
Default single_dh_use and honor_cipher_order to true
2017-06-18 19:54:45 -04:00
Niklas Keller
bec91e1117
Use any TLS crypto method by default, don't use SSL
2017-06-10 17:31:24 -04:00
Thomas Punt
932c4b35dc
Remove more unnecessary checks on Zend's allocator functions
2017-03-16 12:23:55 +01:00
Jakub Zelenka
117d6a9a14
Merge branch 'PHP-7.1'
2017-03-14 18:47:51 +00:00
Jakub Zelenka
b4f0174e5c
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-14 18:46:29 +00:00
Jakub Zelenka
411f4b1b6f
Fix indent and add comment
2017-03-14 18:13:57 +00:00
Jakub Zelenka
760ff21bf3
Tidy up setting of SSL_MODE_RELEASE_BUFFERS
2017-03-14 18:13:57 +00:00
Jakub Zelenka
53cc72ef86
Remove extra SSL mode settings
2017-03-14 18:13:57 +00:00
Jakub Zelenka
17e9fc9bfe
Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work)
2017-03-14 18:13:57 +00:00
Aaron Piotrowski
fb76d81b6c
Merge branch 'PHP-7.1'
2017-02-23 21:22:28 -06:00
Aaron Piotrowski
c05c65ac80
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-23 21:19:46 -06:00
Aaron Piotrowski
e9873d9853
Fix bug #74159
...
Thanks to @brzuchal for the patch to xp_ssl.c and @DaveRandom for helping debug the problem.
2017-02-23 20:59:43 -06:00
Xinchen Hui
b012d48a3f
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
2017-01-09 16:30:55 +08:00
Xinchen Hui
697809d425
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
2017-01-09 16:30:48 +08:00
Xinchen Hui
f7cb79431f
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
2017-01-09 16:30:00 +08:00
Anatol Belski
97ac819c2b
Merge branch 'PHP-7.1'
...
* PHP-7.1:
move various places to the centralized OpenSSL setup routine
use the new API for opaque symbol in OpenSSL 1.1.x
implement basic config support for OpenSSL 1.1.x
2017-01-08 00:39:53 +01:00
Anatol Belski
bf14ecc0d8
use the new API for opaque symbol in OpenSSL 1.1.x
2017-01-08 00:25:46 +01:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
Bob Weinand
1f474fddbb
Merge branch 'PHP-7.1'
...
Also inline alpn_ctx in openssl_netstream_data (no need for the extra allocation there)
2016-12-22 23:40:24 +01:00
Bob Weinand
7b133e074c
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-22 23:34:51 +01:00
Bob Weinand
ac1372d811
Fix alpn_ctx leaking in openssl
2016-12-22 23:34:07 +01:00
Kalle Sommer Nielsen
2104bea5d7
Remove Netware support
...
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
2016-11-12 11:20:01 +01:00
Jakub Zelenka
820bca8ca3
Try to fix LibreSSL build
2016-10-23 19:55:22 +01:00
Jakub Zelenka
930ae4034e
Drop useless checks for DH and RSA
...
If DH or RSA was disabled, the build would fail already as
it's used already elsewhere without checking the OPENSSL_NO_DH
or OPENSSL_NO_RSA defines.
2016-10-23 19:37:07 +01:00
Jakub Zelenka
1b1b7f8809
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-13 18:27:55 +01:00
Jakub Zelenka
3a739c9f9f
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-13 18:19:20 +01:00
Jakub Zelenka
05baa92727
Fix bug #73072 (Invalid path SNI_server_certs causes segfault)
2016-09-13 18:15:34 +01:00
Jakub Zelenka
d8580cb286
Use always non const SSL cipher version string
2016-07-19 20:01:20 +01:00