|
 |
f63659 |
|
|
|
f63659 |
https://github.com/GrahamDumpleton/mod_wsgi/pull/364
|
|
|
f63659 |
|
|
|
f63659 |
https://bugzilla.redhat.com/show_bug.cgi?id=1602620
|
|
|
f63659 |
|
|
|
f63659 |
--- mod_wsgi-4.6.4/src/server/__init__.py.warnings
|
|
|
f63659 |
+++ mod_wsgi-4.6.4/src/server/__init__.py
|
|
|
f63659 |
@@ -103,7 +103,6 @@
|
|
|
f63659 |
for name in mimetypes.knownfiles:
|
|
|
f63659 |
if os.path.exists(name):
|
|
|
f63659 |
return name
|
|
|
f63659 |
- break
|
|
|
f63659 |
else:
|
|
|
f63659 |
return name
|
|
|
f63659 |
|
|
|
f63659 |
--- mod_wsgi-4.6.4/src/server/mod_wsgi.c.warnings
|
|
|
f63659 |
+++ mod_wsgi-4.6.4/src/server/mod_wsgi.c
|
|
|
f63659 |
@@ -2108,9 +2108,11 @@
|
|
|
f63659 |
/* Publish event for the start of the response. */
|
|
|
f63659 |
|
|
|
f63659 |
if (wsgi_event_subscribers()) {
|
|
|
f63659 |
+#if 0
|
|
|
f63659 |
WSGIThreadInfo *thread_info;
|
|
|
f63659 |
|
|
|
f63659 |
thread_info = wsgi_thread_info(0, 0);
|
|
|
f63659 |
+#endif
|
|
|
f63659 |
|
|
|
f63659 |
event = PyDict_New();
|
|
|
f63659 |
|
|
|
f63659 |
@@ -6349,10 +6351,7 @@
|
|
|
f63659 |
|
|
|
f63659 |
/* Need to cast const away. */
|
|
|
f63659 |
|
|
|
f63659 |
- if (r)
|
|
|
f63659 |
- id = &((request_rec *)r)->log_id;
|
|
|
f63659 |
- else
|
|
|
f63659 |
- id = &((conn_rec *)c)->log_id;
|
|
|
f63659 |
+ id = &((request_rec *)r)->log_id;
|
|
|
f63659 |
|
|
|
f63659 |
ap_run_generate_log_id(c, r, id);
|
|
|
f63659 |
}
|
|
|
f63659 |
@@ -8510,6 +8509,7 @@
|
|
|
f63659 |
ap_log_error(APLOG_MARK, APLOG_ALERT, errno, wsgi_server,
|
|
|
f63659 |
"mod_wsgi (pid=%d): Couldn't bind unix domain "
|
|
|
f63659 |
"socket '%s'.", getpid(), process->socket_path);
|
|
|
f63659 |
+ close(sockfd);
|
|
|
f63659 |
return -1;
|
|
|
f63659 |
}
|
|
|
f63659 |
|
|
|
f63659 |
@@ -8521,6 +8521,7 @@
|
|
|
f63659 |
ap_log_error(APLOG_MARK, APLOG_ALERT, errno, wsgi_server,
|
|
|
f63659 |
"mod_wsgi (pid=%d): Couldn't listen on unix domain "
|
|
|
f63659 |
"socket.", getpid());
|
|
|
f63659 |
+ close(sockfd);
|
|
|
f63659 |
return -1;
|
|
|
f63659 |
}
|
|
|
f63659 |
|
|
|
f63659 |
@@ -8555,6 +8556,7 @@
|
|
|
f63659 |
"mod_wsgi (pid=%d): Couldn't change owner of unix "
|
|
|
f63659 |
"domain socket '%s' to uid=%ld.", getpid(),
|
|
|
f63659 |
process->socket_path, (long)socket_uid);
|
|
|
f63659 |
+ close(sockfd);
|
|
|
f63659 |
return -1;
|
|
|
f63659 |
}
|
|
|
f63659 |
}
|
|
|
f63659 |
@@ -13338,8 +13340,10 @@
|
|
|
f63659 |
for (i = 0; i < wsgi_daemon_list->nelts; ++i) {
|
|
|
f63659 |
entry = &entries[i];
|
|
|
f63659 |
|
|
|
f63659 |
- close(entry->listener_fd);
|
|
|
f63659 |
- entry->listener_fd = -1;
|
|
|
f63659 |
+ if (entry->listener_fd != -1) {
|
|
|
f63659 |
+ close(entry->listener_fd);
|
|
|
f63659 |
+ entry->listener_fd = -1;
|
|
|
f63659 |
+ }
|
|
|
f63659 |
}
|
|
|
f63659 |
}
|
|
|
f63659 |
#endif
|
|
|
f63659 |
@@ -13751,8 +13755,8 @@
|
|
|
f63659 |
|
|
|
f63659 |
if (trusted_proxy) {
|
|
|
f63659 |
for (i=0; i<trusted_proxy_headers->nelts; i++) {
|
|
|
f63659 |
- const char *name = NULL;
|
|
|
f63659 |
- const char *value = NULL;
|
|
|
f63659 |
+ const char *name;
|
|
|
f63659 |
+ const char *value;
|
|
|
f63659 |
|
|
|
f63659 |
name = ((const char**)trusted_proxy_headers->elts)[i];
|
|
|
f63659 |
value = apr_table_get(r->subprocess_env, name);
|
|
|
f63659 |
@@ -13879,11 +13883,9 @@
|
|
|
f63659 |
*/
|
|
|
f63659 |
|
|
|
f63659 |
for (i=0; i<trusted_proxy_headers->nelts; i++) {
|
|
|
f63659 |
- const char *name = NULL;
|
|
|
f63659 |
- const char *value = NULL;
|
|
|
f63659 |
+ const char *name;
|
|
|
f63659 |
|
|
|
f63659 |
name = ((const char**)trusted_proxy_headers->elts)[i];
|
|
|
f63659 |
- value = apr_table_get(r->subprocess_env, name);
|
|
|
f63659 |
|
|
|
f63659 |
if (!strcmp(name, "HTTP_X_FORWARDED_FOR") ||
|
|
|
f63659 |
!strcmp(name, "HTTP_X_REAL_IP")) {
|
|
|
f63659 |
--- mod_wsgi-4.6.4/src/server/wsgi_logger.c.warnings
|
|
|
f63659 |
+++ mod_wsgi-4.6.4/src/server/wsgi_logger.c
|
|
|
f63659 |
@@ -694,9 +694,11 @@
|
|
|
f63659 |
PyObject *object = NULL;
|
|
|
f63659 |
|
|
|
f63659 |
if (wsgi_event_subscribers()) {
|
|
|
f63659 |
+#if 0
|
|
|
f63659 |
WSGIThreadInfo *thread_info;
|
|
|
f63659 |
|
|
|
f63659 |
thread_info = wsgi_thread_info(0, 0);
|
|
|
f63659 |
+#endif
|
|
|
f63659 |
|
|
|
f63659 |
event = PyDict_New();
|
|
|
f63659 |
|
|
|
f63659 |
--- mod_wsgi-4.6.4/src/server/wsgi_python.h.warnings
|
|
|
f63659 |
+++ mod_wsgi-4.6.4/src/server/wsgi_python.h
|
|
|
f63659 |
@@ -21,6 +21,12 @@
|
|
|
f63659 |
|
|
|
f63659 |
/* ------------------------------------------------------------------------- */
|
|
|
f63659 |
|
|
|
f63659 |
+#ifdef _POSIX_C_SOURCE
|
|
|
f63659 |
+#undef _POSIX_C_SOURCE
|
|
|
f63659 |
+#endif
|
|
|
f63659 |
+#ifdef _XOPEN_SOURCE
|
|
|
f63659 |
+#undef _XOPEN_SOURCE
|
|
|
f63659 |
+#endif
|
|
|
f63659 |
#include <Python.h>
|
|
|
f63659 |
|
|
|
f63659 |
#if !defined(PY_VERSION_HEX)
|