48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
|
diff --git a/include/http_protocol.h b/include/http_protocol.h
|
||
|
|
index e1572dc..8ed77ac 100644
|
||
|
|
--- a/include/http_protocol.h
|
||
|
|
+++ b/include/http_protocol.h
|
||
|
|
@@ -439,7 +439,27 @@ AP_DECLARE(int) ap_rwrite(const void *buf, int nbyte, request_rec *r);
|
||
|
|
*/
|
||
|
|
static APR_INLINE int ap_rputs(const char *str, request_rec *r)
|
||
|
|
{
|
||
|
|
- return ap_rwrite(str, (int)strlen(str), r);
|
||
|
|
+ apr_size_t len;
|
||
|
|
+
|
||
|
|
+ len = strlen(str);
|
||
|
|
+
|
||
|
|
+ for (;;) {
|
||
|
|
+ if (len <= INT_MAX) {
|
||
|
|
+ return ap_rwrite(str, (int)len, r);
|
||
|
|
+ }
|
||
|
|
+ else {
|
||
|
|
+ int rc;
|
||
|
|
+
|
||
|
|
+ rc = ap_rwrite(str, INT_MAX, r);
|
||
|
|
+ if (rc < 0) {
|
||
|
|
+ return rc;
|
||
|
|
+ }
|
||
|
|
+ else {
|
||
|
|
+ str += INT_MAX;
|
||
|
|
+ len -= INT_MAX;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
/**
|
||
|
|
diff --git a/server/protocol.c b/server/protocol.c
|
||
|
|
index a554970..ea461a2 100644
|
||
|
|
--- a/server/protocol.c
|
||
|
|
+++ b/server/protocol.c
|
||
|
|
@@ -2107,6 +2107,9 @@ AP_DECLARE(int) ap_rputc(int c, request_rec *r)
|
||
|
|
|
||
|
|
AP_DECLARE(int) ap_rwrite(const void *buf, int nbyte, request_rec *r)
|
||
|
|
{
|
||
|
|
+ if (nbyte < 0)
|
||
|
|
+ return -1;
|
||
|
|
+
|
||
|
|
if (r->connection->aborted)
|
||
|
|
return -1;
|
||
|
|
|