diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-02-12 06:43:05 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-02-12 06:43:05 +0100 |
| commit | 99bd2fd9c40b8766a73562297592a475a0b78023 (patch) | |
| tree | d465ccbc464c2768825700edc4d48b67dee09f9a /ext/openssl/php_openssl_structs.h | |
| parent | 1f148f7ad99e78476ff20ef47c09082ae2861bc4 (diff) | |
| parent | 06bbfe1e2a46d6c2eaf74b7c576b09114ee2e670 (diff) | |
| download | php-git-99bd2fd9c40b8766a73562297592a475a0b78023.tar.gz | |
Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (97 commits)
update the alpha2 release date
Fixed ZTS and added fix to NEWS.
Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too.
Rename timelib_get_zone to timelib_parse_zone and export.
fix regex to detect valgrind version New PCRE version got stricter
fix regex to detect valgrind version New PCRE version got stricter
Fixed memory leak in pow operator
5.5.9 now released
Added information in NEWS and UPGRADING
add T_POW (**) operator
add NEWS block for 5.6.0alpha3
updated libs_version.txt
updated libs_version.txt
update libs_version.txt
more tests for ICU >= 52.1 compat
fix tests for ICU >= 52.1
Fix year
adapt test to curl 7.35.0 upgrade
move the NEWS entry into the right section
Fixed SNI failure from missing Z_STRVAL_PP
...
Diffstat (limited to 'ext/openssl/php_openssl_structs.h')
| -rw-r--r-- | ext/openssl/php_openssl_structs.h | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/ext/openssl/php_openssl_structs.h b/ext/openssl/php_openssl_structs.h new file mode 100644 index 0000000000..13f8f320f8 --- /dev/null +++ b/ext/openssl/php_openssl_structs.h @@ -0,0 +1,42 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2013 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Wez Furlong <wez@thebrainroom.com> | + | Daniel Lowrey <rdlowrey@gmail.com> | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#include "php_network.h" +#include <openssl/ssl.h> + +/* This implementation is very closely tied to the that of the native + * sockets implemented in the core. + * Don't try this technique in other extensions! + * */ + +typedef struct _php_openssl_netstream_data_t { + php_netstream_data_t s; + SSL *ssl_handle; + SSL_CTX *ctx; + struct timeval connect_timeout; + int enable_on_connect; + int is_client; + int ssl_active; + php_stream_xport_crypt_method_t method; + char *url_name; + unsigned state_set:1; + unsigned _spare:31; +} php_openssl_netstream_data_t; |