diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/microhttpd.h | 25 | ||||
-rw-r--r-- | src/microhttpd/mhd_panic.c | 20 |
2 files changed, 25 insertions, 20 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index b4bc85e3..06ca6964 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -2355,7 +2355,8 @@ enum MHD_DaemonInfoType | |||
2355 | * an error message and `abort()`. | 2355 | * an error message and `abort()`. |
2356 | * | 2356 | * |
2357 | * @param cls user specified value | 2357 | * @param cls user specified value |
2358 | * @param file where the error occurred | 2358 | * @param file where the error occurred, may be NULL if MHD was built without |
2359 | * messages support | ||
2359 | * @param line where the error occurred | 2360 | * @param line where the error occurred |
2360 | * @param reason error detail, may be NULL | 2361 | * @param reason error detail, may be NULL |
2361 | * @ingroup logging | 2362 | * @ingroup logging |
@@ -3138,16 +3139,18 @@ MHD_set_connection_value_n (struct MHD_Connection *connection, | |||
3138 | 3139 | ||
3139 | 3140 | ||
3140 | /** | 3141 | /** |
3141 | * Sets the global error handler to a different implementation. @a cb | 3142 | * Sets the global error handler to a different implementation. |
3142 | * will only be called in the case of typically fatal, serious | 3143 | * |
3143 | * internal consistency issues. These issues should only arise in the | 3144 | * @a cb will only be called in the case of typically fatal, serious internal |
3144 | * case of serious memory corruption or similar problems with the | 3145 | * consistency issues or serious system failures like failed lock of mutex. |
3145 | * architecture. While @a cb is allowed to return and MHD will then | 3146 | * |
3146 | * try to continue, this is never safe. | 3147 | * These issues should only arise in the case of serious memory corruption or |
3147 | * | 3148 | * similar problems with the architecture, there is no safe way to continue |
3148 | * The default implementation that is used if no panic function is set | 3149 | * even for closing of the application. |
3149 | * simply prints an error message and calls `abort()`. Alternative | 3150 | * |
3150 | * implementations might call `exit()` or other similar functions. | 3151 | * The default implementation that is used if no panic function is set simply |
3152 | * prints an error message and calls `abort()`. | ||
3153 | * Alternative implementations might call `exit()` or other similar functions. | ||
3151 | * | 3154 | * |
3152 | * @param cb new error handler or NULL to use default handler | 3155 | * @param cb new error handler or NULL to use default handler |
3153 | * @param cls passed to @a cb | 3156 | * @param cls passed to @a cb |
diff --git a/src/microhttpd/mhd_panic.c b/src/microhttpd/mhd_panic.c index ae2db248..dfe1f6b5 100644 --- a/src/microhttpd/mhd_panic.c +++ b/src/microhttpd/mhd_panic.c | |||
@@ -73,16 +73,18 @@ mhd_panic_std (void *cls, | |||
73 | 73 | ||
74 | 74 | ||
75 | /** | 75 | /** |
76 | * Sets the global error handler to a different implementation. @a cb | 76 | * Sets the global error handler to a different implementation. |
77 | * will only be called in the case of typically fatal, serious | ||
78 | * internal consistency issues. These issues should only arise in the | ||
79 | * case of serious memory corruption or similar problems with the | ||
80 | * architecture. While @a cb is allowed to return and MHD will then | ||
81 | * try to continue, this is never safe. | ||
82 | * | 77 | * |
83 | * The default implementation that is used if no panic function is set | 78 | * @a cb will only be called in the case of typically fatal, serious internal |
84 | * simply prints an error message and calls `abort()`. Alternative | 79 | * consistency issues or serious system failures like failed lock of mutex. |
85 | * implementations might call `exit()` or other similar functions. | 80 | * |
81 | * These issues should only arise in the case of serious memory corruption or | ||
82 | * similar problems with the architecture, there is no safe way to continue | ||
83 | * even for closing of the application. | ||
84 | * | ||
85 | * The default implementation that is used if no panic function is set simply | ||
86 | * prints an error message and calls `abort()`. | ||
87 | * Alternative implementations might call `exit()` or other similar functions. | ||
86 | * | 88 | * |
87 | * @param cb new error handler or NULL to use default handler | 89 | * @param cb new error handler or NULL to use default handler |
88 | * @param cls passed to @a cb | 90 | * @param cls passed to @a cb |