php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
88,418 Commits 547 Branches 1,481 Tags
ec00a4de4e8db83c07afde9a182d43fe73d860c9
Commit Graph

792 Commits

Author SHA1 Message Date
Jakub Zelenka
0676f39ee4 Remove unnecessary resource checks in openssl ext 
The resource val is already checking Z_TYPE_P(val) == IS_RESOURCE.
There is no need to call extended resource fetch functions though.
 2015-02-17 20:46:36 +00:00
Xinchen Hui
10fe317300 Merge branch 'PHP-5.6' 
Conflicts:
	ext/openssl/openssl.c
 2015-02-16 14:18:08 +08:00
Xinchen Hui
8309988111 Fixed bug #68912 (Segmentation fault at openssl_spki_new) 2015-02-16 14:16:52 +08:00
Anatol Belski
c17e007a29 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix condition
 2015-02-13 13:40:37 +01:00
Anatol Belski
b3d28d14d6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix condition
 2015-02-13 13:40:10 +01:00
Anatol Belski
5ff77b005b fix condition 2015-02-13 13:39:46 +01:00
Daniel Lowrey
712712e8d6 Merge branch 'PHP-5.6' 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-02-09 15:14:47 -05:00
Daniel Lowrey
fb2314798e Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-02-09 11:44:09 -05:00
Daniel Lowrey
1eef4f2a0c Miscellaneous cleanup 2015-02-09 11:42:17 -05:00
Brad Broerman
dddbe0fc33 Update xp_ssl.c 
Added TSRMLS_CC to php_openssl_sockop_io calls.
 2015-02-04 10:13:36 -05:00
Xinchen Hui
e98caf27ea found type is unnecessary 2015-02-02 14:45:19 +08:00
Xinchen Hui
942809909e Cleanup resource handling APIs 2015-02-02 13:23:16 +08:00
Michael Wallner
3c4540dec9 fix warnings 2015-01-30 22:49:44 +01:00
Anatol Belski
8d054be62f fix datatype mismatches, improve error checks 2015-01-30 14:36:33 +01:00
Anatol Belski
085907d168 fix datatype mismatches, improved error checks 2015-01-30 13:52:11 +01:00
Anatol Belski
3acdbaeba0 fix datatype mismatch warns, improve error check 2015-01-30 12:14:27 +01:00
Anatol Belski
397615071c make the cleanup function as static, as it's not exported 2015-01-30 11:20:25 +01:00
Anatol Belski
f6330f9912 fix datatype mismatches, add stronger error checks 2015-01-30 11:10:11 +01:00
Anatol Belski
55936775d2 fix datatype mismatches, improve error checks 2015-01-30 11:02:25 +01:00
Brad Broerman
1482ed2d56 reneg and should_close are not yet members of sslsock. Removing... 2015-01-28 22:36:41 -05:00
Anatol Belski
4d16937449 fix unportable dereferencing 2015-01-28 15:15:38 +01:00
Brad Broerman
fd4641696c Updated with SSL fixes (backported from trunk) 2015-01-28 00:04:20 -05:00
Daniel Lowrey
4965fe7fb8 Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-01-27 13:22:47 -05:00
Brad Broerman
8302d658db Quick fix 2015-01-26 21:35:35 -05:00
Brad Broerman
db49dd91bd Fixed windows infinite loop problem. 2015-01-26 20:40:52 -05:00
Dmitry Stogov
23b683c0d3 Fixed wrong size 2015-01-26 15:33:10 +03:00
Anatol Belski
ee8a0b3797 cleanup TSRMLS_* 2015-01-23 18:05:18 +01:00
Anatol Belski
647caea9f7 C89 compat 2015-01-23 15:04:29 +01:00
Daniel Lowrey
459edceea9 Merge branch 'master' of https://github.com/bbroerman30/php-src 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-01-23 01:03:39 -05:00
Brad Broerman
ebb67cd6fe Renamed timeval functions to comply with PHP naming standards 2015-01-21 10:20:32 -05:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Daniel Lowrey
80a337bba1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
  Fixed bug #55618 (use case-insensitive cert name matching)
 2015-01-14 18:04:41 +01:00
Daniel Lowrey
e2fe8e164f Fixed bug #55618 (use case-insensitive cert name matching) 2015-01-14 18:02:50 +01:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Brad Broerman
9ec7fac127 Change declaration of subtractTimeval and compareTimeval to static 2015-01-10 11:19:17 -05:00
Brad Broerman
8ded274413 Re-ordered the read and write methods to match the order of the original code, to make the DIFF easier to read. 2014-12-31 13:30:48 -05:00
Brad Broerman
fea9253c1c try to update mod 2014-12-31 10:59:57 -05:00
Brad Broerman
f22c3d643a Fixed indentation 2014-12-31 10:49:21 -05:00
Brad Broerman
49571cfad7 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	ext/openssl/xp_ssl.c
 2014-12-30 19:44:45 -05:00
Xinchen Hui
b5b617674e Micro optimaztion (yeah, I know compiler supposed to do that) 2014-12-22 00:10:46 -05:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Anatol Belski
50a93357fb Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  fix perms
  fix perms
  PowerPC64 support in safe_address function
 2014-12-16 08:42:18 +01:00
Remi Collet
ee0b922ece Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix perms
 2014-12-16 08:38:29 +01:00
Remi Collet
181f34f375 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix perms
 2014-12-16 08:37:56 +01:00
Remi Collet
9c4de388c6 fix perms 2014-12-16 08:37:48 +01:00
Anatol Belski
e112f6a04e second shot on removing TSRMLS_* 2014-12-14 14:07:59 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Stanislav Malyshev
c64949626d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
  Fixes memory leak introduced in 2b9af967

Conflicts:
	ext/openssl/openssl.c
 2014-11-30 18:32:56 -08:00