Author: Armin Rigo <[email protected]>
Branch: py3.5
Changeset: r91592:29c9a89359e4
Date: 2017-06-12 16:00 +0200
http://bitbucket.org/pypy/pypy/changeset/29c9a89359e4/
Log: Issue #2575
Fix the current and maybe some future openssl issues. See comment.
diff --git a/lib_pypy/_cffi_ssl/_cffi_src/utils.py
b/lib_pypy/_cffi_ssl/_cffi_src/utils.py
--- a/lib_pypy/_cffi_ssl/_cffi_src/utils.py
+++ b/lib_pypy/_cffi_ssl/_cffi_src/utils.py
@@ -47,9 +47,19 @@
# is legal, but the following will fail to compile:
# int foo(int);
# int foo(short);
+ #
+ # XXX <arigo> No, it is a bad idea. OpenSSL itself tends to tweak
+ # the definitions, like adding a 'const' (see issue #2575). Every
+ # time they do so, it makes a gratuitous break in this code. It is
+ # better to rely on the C compiler for that, which is a little bit
+ # more flexible. That's the point of set_source(). We can still
+ # re-enable the line ``#functions +`` below to get the original
+ # behavior. (I would enable it during tests, but I don't find any
+ # custom test at all..??)
+ #
verify_source = "\n".join(
includes +
- functions +
+ #functions +
customizations
)
ffi = build_ffi(
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
