Merge branch 'master' of github.com:unbit/uwsgi

core/lock.c

@@ -45,6 +45,10 @@ static struct uwsgi_lock_item *uwsgi_register_lock(char *id, int rw) {
 
 #ifdef UWSGI_LOCK_USE_MUTEX
 
+#ifdef OBSOLETE_LINUX_KERNEL
+#undef EOWNERDEAD
+#endif
+
 #ifdef EOWNERDEAD
 #define UWSGI_LOCK_ENGINE_NAME "pthread robust mutexes"
 int uwsgi_pthread_robust_mutexes_enabled = 1;

core/ssl.c

@@ -235,7 +235,9 @@ SSL_CTX *uwsgi_ssl_new_server_context(char *name, char *crt, char *key, char *ci
                         SSL_SESS_CACHE_NO_INTERNAL|
                         SSL_SESS_CACHE_NO_AUTO_CLEAR);
 
+#ifdef SSL_OP_NO_TICKET
                 ssloptions |= SSL_OP_NO_TICKET;
+#endif
 
                 // just for fun
                 SSL_CTX_sess_set_cache_size(ctx, 0);