|
Lines 105-110
Changelog :
Link Here
|
| 105 |
#define apr_atomic_set32 apr_atomic_set |
105 |
#define apr_atomic_set32 apr_atomic_set |
| 106 |
#endif |
106 |
#endif |
| 107 |
|
107 |
|
|
|
108 |
#define APACHE_VERSION_AT_LEAST(major,minor) \ |
| 109 |
(((major) < AP_SERVER_MAJORVERSION_NUMBER) \ |
| 110 |
|| ((major) == AP_SERVER_MAJORVERSION_NUMBER && (minor) <= AP_SERVER_MINORVERSION_NUMBER)) |
| 111 |
|
| 108 |
/* Enum types of "from address" */ |
112 |
/* Enum types of "from address" */ |
| 109 |
enum from_type { |
113 |
enum from_type { |
| 110 |
T_ALL, |
114 |
T_ALL, |
|
Lines 564-570
static long get_bw_rate(request_rec * r,
Link Here
|
| 564 |
return e[i].rate; |
568 |
return e[i].rate; |
| 565 |
|
569 |
|
| 566 |
case T_IP: |
570 |
case T_IP: |
|
|
571 |
#if APACHE_VERSION_AT_LEAST(2,4) |
| 572 |
if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) { |
| 573 |
#else |
| 567 |
if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) { |
574 |
if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) { |
|
|
575 |
#endif |
| 568 |
return e[i].rate; |
576 |
return e[i].rate; |
| 569 |
} |
577 |
} |
| 570 |
break; |
578 |
break; |
|
Lines 655-661
static int get_maxconn(request_rec * r,
Link Here
|
| 655 |
return e[i].max; |
663 |
return e[i].max; |
| 656 |
|
664 |
|
| 657 |
case T_IP: |
665 |
case T_IP: |
|
|
666 |
#if APACHE_VERSION_AT_LEAST(2,4) |
| 667 |
if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) { |
| 668 |
#else |
| 658 |
if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) { |
669 |
if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) { |
|
|
670 |
#endif |
| 659 |
return e[i].max; |
671 |
return e[i].max; |
| 660 |
} |
672 |
} |
| 661 |
break; |
673 |
break; |
|
Lines 706-712
static int get_sid(request_rec * r, apr_
Link Here
|
| 706 |
return e[i].sid; |
718 |
return e[i].sid; |
| 707 |
|
719 |
|
| 708 |
case T_IP: |
720 |
case T_IP: |
|
|
721 |
#if APACHE_VERSION_AT_LEAST(2,4) |
| 722 |
if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) { |
| 723 |
#else |
| 709 |
if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) { |
724 |
if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) { |
|
|
725 |
#endif |
| 710 |
return e[i].sid; |
726 |
return e[i].sid; |
| 711 |
} |
727 |
} |
| 712 |
break; |
728 |
break; |
