diff options
Diffstat (limited to 'src/include/microhttpd.h')
-rw-r--r-- | src/include/microhttpd.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index 21d90fa2..60878cbc 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -126,7 +126,7 @@ typedef intptr_t ssize_t; | |||
126 | * Current version of the library. | 126 | * Current version of the library. |
127 | * 0x01093001 = 1.9.30-1. | 127 | * 0x01093001 = 1.9.30-1. |
128 | */ | 128 | */ |
129 | #define MHD_VERSION 0x00095205 | 129 | #define MHD_VERSION 0x00095206 |
130 | 130 | ||
131 | /** | 131 | /** |
132 | * MHD-internal return code for "YES". | 132 | * MHD-internal return code for "YES". |
@@ -601,7 +601,12 @@ enum MHD_FLAG | |||
601 | * and that DO provide other mechanisms for cache control. See also | 601 | * and that DO provide other mechanisms for cache control. See also |
602 | * RFC 2616, section 14.18 (exception 3). | 602 | * RFC 2616, section 14.18 (exception 3). |
603 | */ | 603 | */ |
604 | MHD_SUPPRESS_DATE_NO_CLOCK = 128, | 604 | MHD_USE_SUPPRESS_DATE_NO_CLOCK = 128, |
605 | |||
606 | /** @deprecated */ | ||
607 | #define MHD_SUPPRESS_DATE_NO_CLOCK \ | ||
608 | _MHD_DEPR_IN_MACRO("Value MHD_SUPPRESS_DATE_NO_CLOCK is deprecated, use MHD_USE_SUPPRESS_DATE_NO_CLOCK instead") \ | ||
609 | MHD_USE_SUPPRESS_DATE_NO_CLOCK | ||
605 | 610 | ||
606 | /** | 611 | /** |
607 | * Run without a listen socket. This option only makes sense if | 612 | * Run without a listen socket. This option only makes sense if |
@@ -645,7 +650,7 @@ enum MHD_FLAG | |||
645 | * "external" mode. | 650 | * "external" mode. |
646 | * It's required for use of #MHD_quiesce_daemon | 651 | * It's required for use of #MHD_quiesce_daemon |
647 | * or #MHD_add_connection. | 652 | * or #MHD_add_connection. |
648 | * This option is enforced by #MHD_USE_SUSPEND_RESUME or | 653 | * This option is enforced by #MHD_ALLOW_SUSPEND_RESUME or |
649 | * #MHD_USE_NO_LISTEN_SOCKET. | 654 | * #MHD_USE_NO_LISTEN_SOCKET. |
650 | * #MHD_USE_ITC is always used automatically on platforms | 655 | * #MHD_USE_ITC is always used automatically on platforms |
651 | * where select()/poll()/other ignore shutdown of listen | 656 | * where select()/poll()/other ignore shutdown of listen |
@@ -676,7 +681,13 @@ enum MHD_FLAG | |||
676 | * Enable suspend/resume functions, which also implies setting up | 681 | * Enable suspend/resume functions, which also implies setting up |
677 | * ITC to signal resume. | 682 | * ITC to signal resume. |
678 | */ | 683 | */ |
679 | MHD_USE_SUSPEND_RESUME = 8192 | MHD_USE_ITC, | 684 | MHD_ALLOW_SUSPEND_RESUME = 8192 | MHD_USE_ITC, |
685 | |||
686 | /** @deprecated */ | ||
687 | #define MHD_USE_SUSPEND_RESUME \ | ||
688 | _MHD_DEPR_IN_MACRO("Value MHD_USE_SUSPEND_RESUME is deprecated, use MHD_ALLOW_SUSPEND_RESUME instead") \ | ||
689 | MHD_ALLOW_SUSPEND_RESUME | ||
690 | |||
680 | 691 | ||
681 | /** | 692 | /** |
682 | * Enable TCP_FASTOPEN option. This option is only available on Linux with a | 693 | * Enable TCP_FASTOPEN option. This option is only available on Linux with a |
@@ -690,7 +701,7 @@ enum MHD_FLAG | |||
690 | * "Upgrade" may require usage of additional internal resources, | 701 | * "Upgrade" may require usage of additional internal resources, |
691 | * which we do not want to use unless necessary. | 702 | * which we do not want to use unless necessary. |
692 | */ | 703 | */ |
693 | MHD_USE_UPGRADE = 32768 | 704 | MHD_ALLOW_UPGRADE = 32768 |
694 | 705 | ||
695 | }; | 706 | }; |
696 | 707 | ||
@@ -2859,7 +2870,7 @@ enum MHD_FEATURE | |||
2859 | 2870 | ||
2860 | /** | 2871 | /** |
2861 | * Get whether HTTP "Upgrade" is supported. | 2872 | * Get whether HTTP "Upgrade" is supported. |
2862 | * If supported then #MHD_USE_UPGRADE, #MHD_upgrade_action() and | 2873 | * If supported then #MHD_ALLOW_UPGRADE, #MHD_upgrade_action() and |
2863 | * #MHD_create_response_for_upgrade() can be used. | 2874 | * #MHD_create_response_for_upgrade() can be used. |
2864 | */ | 2875 | */ |
2865 | MHD_FEATURE_UPGRADE = 17 | 2876 | MHD_FEATURE_UPGRADE = 17 |