aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--README8
-rw-r--r--doc/libmicrohttpd.texi3
-rw-r--r--src/microhttpd/daemon.c10
-rw-r--r--symbian/MHD_config.h261
-rw-r--r--symbian/README.txt13
-rw-r--r--symbian/SConstruct39
7 files changed, 10 insertions, 329 deletions
diff --git a/ChangeLog b/ChangeLog
index 66f77867..3247c89d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
1Wed Jun 14 21:42:00 MSK 2017
2 Added support for debug assert() and new configure parameter
3 --enable-asserts for debug builds.
4 Removed non-functional Symbian support. -EG
5
1Mon Jun 05 23:34:00 MSK 2017 6Mon Jun 05 23:34:00 MSK 2017
2 More internal refactoring: 7 More internal refactoring:
3 merged MHD_tls_connection_handle_read/write() with non-TLS version, 8 merged MHD_tls_connection_handle_read/write() with non-TLS version,
diff --git a/README b/README
index 6a8d2780..768df2e1 100644
--- a/README
+++ b/README
@@ -48,10 +48,10 @@ main application should install a signal handler to handle SIGPIPE.
48 48
49libmicrohttpd should work well on GNU/Linux, BSD, OS X, W32 and z/OS. 49libmicrohttpd should work well on GNU/Linux, BSD, OS X, W32 and z/OS.
50Note that HTTPS is not supported on z/OS (yet). We also have reports 50Note that HTTPS is not supported on z/OS (yet). We also have reports
51of users using it on vxWorks and Symbian. Note that on platforms 51of users using it on vxWorks. Note that on platforms where the
52where the compiler does not support the "constructor" attribute, you 52compiler does not support the "constructor" attribute, you must call
53must call "MHD_init" before using any MHD functions and "MHD_fini" 53"MHD_init" before using any MHD functions and "MHD_fini" after you
54after you are done using MHD. 54are done using MHD.
55 55
56 56
57Development Status 57Development Status
diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi
index 5a0cc8fb..05b1f834 100644
--- a/doc/libmicrohttpd.texi
+++ b/doc/libmicrohttpd.texi
@@ -448,8 +448,7 @@ have MHD processed network connections and data.
448Starting the daemon may also fail if a particular option is not 448Starting the daemon may also fail if a particular option is not
449implemented or not supported on the target platform (i.e. no support 449implemented or not supported on the target platform (i.e. no support
450for @acronym{TLS}, threads or IPv6). TLS support generally depends on 450for @acronym{TLS}, threads or IPv6). TLS support generally depends on
451options given during MHD compilation. Threaded operations (including 451options given during MHD compilation.
452@code{MHD_USE_INTERNAL_POLLING_THREAD}) are not supported on Symbian.
453 452
454@table @code 453@table @code
455@item MHD_NO_FLAG 454@item MHD_NO_FLAG
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 57e7ea2e..17b46678 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5381,16 +5381,6 @@ MHD_start_daemon_va (unsigned int flags,
5381 goto free_and_fail; 5381 goto free_and_fail;
5382 } 5382 }
5383 5383
5384#ifdef __SYMBIAN32__
5385 if (0 != (*pflags & (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_THREAD_PER_CONNECTION)))
5386 {
5387#ifdef HAVE_MESSAGES
5388 MHD_DLOG (daemon,
5389 _("Threaded operations are not supported on Symbian.\n"));
5390#endif
5391 goto free_and_fail;
5392 }
5393#endif
5394 if ( (MHD_INVALID_SOCKET == daemon->listen_fd) && 5384 if ( (MHD_INVALID_SOCKET == daemon->listen_fd) &&
5395 (0 == (*pflags & MHD_USE_NO_LISTEN_SOCKET)) ) 5385 (0 == (*pflags & MHD_USE_NO_LISTEN_SOCKET)) )
5396 { 5386 {
diff --git a/symbian/MHD_config.h b/symbian/MHD_config.h
deleted file mode 100644
index 147dc79b..00000000
--- a/symbian/MHD_config.h
+++ /dev/null
@@ -1,261 +0,0 @@
1/* MHD_config.h. Generated from MHD_config.h.in by configure. */
2/* MHD_config.h.in. Generated from configure.ac by autoheader. */
3
4#define _GNU_SOURCE 1
5
6/* This is a Cygwin system */
7#define CYGWIN 1
8
9/* This is a FreeBSD system */
10/* #undef FREEBSD */
11
12/* GNULIB_GC_RANDOM */
13#define GNULIB_GC_RANDOM 1
14
15/* Define to 1 if you have the <arpa/inet.h> header file. */
16#define HAVE_ARPA_INET_H 1
17
18/* Define to 1 if you have the declaration of `TCP_CORK', and to 0 if you
19 don't. */
20#define HAVE_DECL_TCP_CORK 0
21
22/* Define to 1 if you have the <dlfcn.h> header file. */
23#define HAVE_DLFCN_H 1
24
25/* Define to 1 if you have the <errno.h> header file. */
26#define HAVE_ERRNO_H 1
27
28/* Define to 1 if you have the <fcntl.h> header file. */
29#define HAVE_FCNTL_H 1
30
31/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
32#define HAVE_FSEEKO 1
33
34/* Provides IPv6 headers */
35#undef HAVE_INET6
36
37/* Define to 1 if you have the <inttypes.h> header file. */
38#define HAVE_INTTYPES_H 1
39
40/* Define to 1 if you have a functional curl library. */
41#define HAVE_LIBCURL 1
42
43/* Define to 1 if you have the <limits.h> header file. */
44#define HAVE_LIMITS_H 1
45
46/* Define to 1 if you have the <locale.h> header file. */
47#define HAVE_LOCALE_H 1
48
49/* Define to 1 if you have the <math.h> header file. */
50#define HAVE_MATH_H 1
51
52/* Define to 1 if you have the `memmem' function. */
53#define HAVE_MEMMEM 1
54
55/* Define to 1 if you have the <memory.h> header file. */
56#define HAVE_MEMORY_H 1
57
58/* Include error messages */
59#define HAVE_MESSAGES 1
60
61/* Define to 1 if you have the <netdb.h> header file. */
62#define HAVE_NETDB_H 1
63
64/* Define to 1 if you have the <netinet/in.h> header file. */
65#define HAVE_NETINET_IN_H 1
66
67/* Define to 1 if you have the <netinet/tcp.h> header file. */
68#define HAVE_NETINET_TCP_H 1
69
70/* Define to 1 if you have the <pthread.h> header file. */
71#define HAVE_PTHREAD_H 1
72
73/* Define to 1 if you have the <stdint.h> header file. */
74#define HAVE_STDINT_H 1
75
76/* Define to 1 if you have the <stdio.h> header file. */
77#define HAVE_STDIO_H 1
78
79/* Define to 1 if you have the <stdlib.h> header file. */
80#define HAVE_STDLIB_H 1
81
82/* Define to 1 if you have the <strings.h> header file. */
83#define HAVE_STRINGS_H 1
84
85/* Define to 1 if you have the <string.h> header file. */
86#define HAVE_STRING_H 1
87
88/* Define to 1 if you have the <sys/mman.h> header file. */
89#define HAVE_SYS_MMAN_H 1
90
91/* Define to 1 if you have the <sys/msg.h> header file. */
92#define HAVE_SYS_MSG_H 1
93
94/* Define to 1 if you have the <sys/select.h> header file. */
95#define HAVE_SYS_SELECT_H 1
96
97/* Define to 1 if you have the <sys/socket.h> header file. */
98#define HAVE_SYS_SOCKET_H 1
99
100/* Define to 1 if you have the <sys/stat.h> header file. */
101#define HAVE_SYS_STAT_H 1
102
103/* Define to 1 if you have the <sys/time.h> header file. */
104#define HAVE_SYS_TIME_H 1
105
106/* Define to 1 if you have the <sys/types.h> header file. */
107#define HAVE_SYS_TYPES_H 1
108
109/* Define to 1 if you have the <time.h> header file. */
110#define HAVE_TIME_H 1
111
112/* Define to 1 if you have the <unistd.h> header file. */
113#define HAVE_UNISTD_H 1
114
115/* disable HTTPS support */
116#define HTTPS_SUPPORT 0
117
118/* Defined if libcurl supports AsynchDNS */
119/* #undef LIBCURL_FEATURE_ASYNCHDNS */
120
121/* Defined if libcurl supports IDN */
122/* #undef LIBCURL_FEATURE_IDN */
123
124/* Defined if libcurl supports IPv6 */
125/* #undef LIBCURL_FEATURE_IPV6 */
126
127/* Defined if libcurl supports KRB4 */
128/* #undef LIBCURL_FEATURE_KRB4 */
129
130/* Defined if libcurl supports libz */
131#define LIBCURL_FEATURE_LIBZ 1
132
133/* Defined if libcurl supports NTLM */
134#define LIBCURL_FEATURE_NTLM 1
135
136/* Defined if libcurl supports SSL */
137#define LIBCURL_FEATURE_SSL 1
138
139/* Defined if libcurl supports SSPI */
140/* #undef LIBCURL_FEATURE_SSPI */
141
142/* Defined if libcurl supports DICT */
143#define LIBCURL_PROTOCOL_DICT 1
144
145/* Defined if libcurl supports FILE */
146#define LIBCURL_PROTOCOL_FILE 1
147
148/* Defined if libcurl supports FTP */
149#define LIBCURL_PROTOCOL_FTP 1
150
151/* Defined if libcurl supports FTPS */
152#define LIBCURL_PROTOCOL_FTPS 1
153
154/* Defined if libcurl supports HTTP */
155#define LIBCURL_PROTOCOL_HTTP 1
156
157/* Defined if libcurl supports HTTPS */
158#define LIBCURL_PROTOCOL_HTTPS 1
159
160/* Defined if libcurl supports LDAP */
161#define LIBCURL_PROTOCOL_LDAP 1
162
163/* Defined if libcurl supports TELNET */
164#define LIBCURL_PROTOCOL_TELNET 1
165
166/* Defined if libcurl supports TFTP */
167#define LIBCURL_PROTOCOL_TFTP 1
168
169/* This is a Linux system */
170/* #undef LINUX */
171
172/* Define to the sub-directory in which libtool stores uninstalled libraries.
173 */
174#define LT_OBJDIR ".libs/"
175
176/* Compile client side code. This will enable running some test cases. */
177#define MHD_DEBUG_TLS 0
178
179/* gcrypt lib version */
180#define MHD_GCRYPT_VERSION "1:1.2.4"
181
182/* gnuTLS lib version - used in conjunction with cURL */
183#define MHD_REQ_CURL_GNUTLS_VERSION "2.2.3"
184
185/* required cURL SSL version to run tests */
186#define MHD_REQ_CURL_OPENSSL_VERSION "0.9.8"
187
188/* required cURL version to run tests */
189#define MHD_REQ_CURL_VERSION "7.16.4"
190
191/* This is a MinGW system */
192/* #undef MINGW */
193
194/* This is a NetBSD system */
195/* #undef NETBSD */
196
197/* Define to 1 if your C compiler doesn't accept -c and -o together. */
198/* #undef NO_MINUS_C_MINUS_O */
199
200/* This is an OpenBSD system */
201/* #undef OPENBSD */
202
203/* This is a OS/390 system */
204/* #undef OS390 */
205
206/* This is an OS X system */
207/* #undef OSX */
208
209/* Some strange OS */
210/* #undef OTHEROS */
211
212/* Name of package */
213#define PACKAGE "libmicrohttpd"
214
215/* Define to the address where bug reports for this package should be sent. */
216#define PACKAGE_BUGREPORT "libmicrohttpd@gnu.org"
217
218/* Define to the full name of this package. */
219#define PACKAGE_NAME "libmicrohttpd"
220
221/* Define to the full name and version of this package. */
222#define PACKAGE_STRING "libmicrohttpd 0.4.2"
223
224/* Define to the one symbol short name of this package. */
225#define PACKAGE_TARNAME "libmicrohttpd"
226
227/* Define to the home page for this package. */
228#define PACKAGE_URL ""
229
230/* Define to the version of this package. */
231#define PACKAGE_VERSION "0.4.2"
232
233/* This is a Solaris system */
234/* #undef SOLARIS */
235
236/* This is a BSD system */
237/* #undef SOMEBSD */
238
239/* Define to 1 if you have the ANSI C header files. */
240#define STDC_HEADERS 1
241
242/* Version number of package */
243#define VERSION "0.9.0"
244
245/* This is a Windows system */
246/* #undef WINDOWS */
247
248/* Number of bits in a file offset, on hosts where this is settable. */
249/* #undef _FILE_OFFSET_BITS */
250
251/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
252/* #undef _LARGEFILE_SOURCE */
253
254/* Define for large files, on AIX-style hosts. */
255/* #undef _LARGE_FILES */
256
257/* Need with solaris or errno doesnt work */
258/* #undef _REENTRANT */
259
260/* Define curl_free() as free() if our version of curl lacks curl_free. */
261/* #undef curl_free */
diff --git a/symbian/README.txt b/symbian/README.txt
deleted file mode 100644
index 175a2a2f..00000000
--- a/symbian/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
1Note: plibc was removed from MHD after this was written, so most likely
2the following won't work anymore right now. As usual, patches are welcome...
3
4
5This directory contains a MHD_config.h that allows compilation on Symbian OS 9
6with OpenC 1.6 (possibly earlier and later versions too) and plibc. It also
7contains a Scons-for-Symbian (http://code.google.com/p/scons-for-symbian/)
8SConstruct file that compiler the code into a static library, as an example
9of how to use this. It assumes that plibc is checked out into <libmicrohttpd
10directory>/../plibc.
11
12Since Symbian lacks POSIX signals you need to run this in 'external select
13loop' mode.
diff --git a/symbian/SConstruct b/symbian/SConstruct
deleted file mode 100644
index c820afd9..00000000
--- a/symbian/SConstruct
+++ /dev/null
@@ -1,39 +0,0 @@
1from scons_symbian import *
2
3def MicroHttpd():
4 target = "microhttpd"
5 targettype = "lib"
6 libraries = [ "euser", "libc", "libstdcpp" ]
7
8 uid3 = 0
9
10 sources = Glob("../src/daemon/*c", strings = True)
11 sources += Glob("../../plibc/src/*search.c", strings = True)
12 sources = [ s for s in sources if s.find("test") < 0 ]
13 sources = [ s for s in sources if s.find("https") < 0 ]
14
15 includes = ['.',
16 '../src/include',
17 '../../libc/src/include',
18 ]
19 sysincludes = [ EPOC32_INCLUDE,
20 join(EPOC32_INCLUDE, 'stdapis'),
21 join(EPOC32_INCLUDE, 'stdapis', 'stlport'),
22 join(EPOC32_INCLUDE, 'libc'),
23 ]
24 defines = [
25 "_STLP_NO_WCHAR_T",
26 ]
27
28 return SymbianProgram( target, targettype,
29 sources = sources,
30 includes = includes,
31 sysincludes = sysincludes,
32 libraries = libraries,
33 defines = defines,
34 epocstacksize = 8192,
35 epocheapsize = (0x1000,0x100000),
36 uid3 = uid3,
37 )
38
39microhttpd = MicroHttpd()
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 15:15:04 +0000