Skip to content

Commit 3f1a57a

Browse files
Fix CI: update pytest + github RSA
1 parent ee12d7a commit 3f1a57a

File tree

6 files changed

+17
-18
lines changed

6 files changed

+17
-18
lines changed

ci/http/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
requests==2.25.0
2-
pytest==4.6.5
2+
pytest==7.1.*
33
pytest-pythonpath==0.7.3
44
pytest-runner==5.1

src/core/ymo_server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ static inline void close_and_free_connection(
660660
#if YMO_ENABLE_TLS
661661
/* If the connection had SSL, let's clean that up now: */
662662
if( conn->ssl ) {
663-
if ( conn->state == YMO_CONN_TLS_ESTABLISHED ) {
663+
if( conn->state == YMO_CONN_TLS_ESTABLISHED ) {
664664
SERVER_TRACE("Cleaning up SSL for %i", conn->fd);
665665
SSL_shutdown(conn->ssl);
666666
}

src/core/ymo_tls.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
#include <openssl/err.h>
4242

4343
#define CONN_SSL(conn) (conn->ssl && ( \
44-
conn->state == YMO_CONN_OPEN || \
45-
conn->state == YMO_CONN_TLS_ESTABLISHED \
46-
))
44+
conn->state == YMO_CONN_OPEN || \
45+
conn->state == YMO_CONN_TLS_ESTABLISHED \
46+
))
4747

4848
/*---------------------------------------------------------------*
4949
* Yimmo Server TLS Functions (HACK/POC):

src/protocol/http/ymo_http_parse.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -253,18 +253,18 @@ static void http_header_got_value(
253253
}
254254
break;
255255
case YMO_HTTP_HID_CONTENT_LENGTH:
256-
HTTP_PARSE_TRACE("Got content length header: %.*s", (int)value_len, hdr_value);
257-
{
258-
long content_length;
259-
char* end_ptr;
260-
content_length =
261-
strtol(hdr_value, &end_ptr, 10);
262-
if( *end_ptr == '\0' ) {
263-
exchange->request.content_length = \
264-
(size_t)content_length;
256+
HTTP_PARSE_TRACE("Got content length header: %.*s", (int)value_len, hdr_value);
257+
{
258+
long content_length;
259+
char* end_ptr;
260+
content_length =
261+
strtol(hdr_value, &end_ptr, 10);
262+
if( *end_ptr == '\0' ) {
263+
exchange->request.content_length = \
264+
(size_t)content_length;
265+
}
265266
}
266-
}
267-
break;
267+
break;
268268
case YMO_HTTP_HID_EXPECT:
269269
if( !ymo_strcasecmp(hdr_value, value_len, "100-continue", 12) ) {
270270
exchange->request.flags |= YMO_HTTP_FLAG_EXPECT;

wsgi/ymo_wsgi_exchange.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ void ymo_wsgi_exchange_free(
8787
}
8888
}
8989

90+
9091
size_t ymo_wsgi_exchange_incref(ymo_wsgi_exchange_t* exchange)
9192
{
9293
size_t refcnt = atomic_fetch_add(&(exchange->refcnt), 1) + 1;
@@ -116,4 +117,3 @@ size_t ymo_wsgi_exchange_decref(ymo_wsgi_exchange_t* exchange)
116117
return refcnt;
117118
}
118119

119-

wsgi/ymo_wsgi_session.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,3 @@ void ymo_wsgi_session_exchange_done(ymo_wsgi_session_t* session)
235235
session->head = next;
236236
}
237237

238-

0 commit comments

Comments
 (0)