Commit Graph

54 Commits (fcc2ed3b17b90e925ddcb69f526c36fe35887e5a)

Author SHA1 Message Date
John Crispin d4c51ebe26 uhttpd: properly handle return codes
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45153 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-30 12:35:13 +00:00
Nicolas Thill d951b2beb1 packages: more (e)glibc fixes after r44701
_GNU_SOURCE has been declared "deprecated" in favor of _DEFAULT_SOURCE in glibc

Signed-off-by: Nicolas Thill <nico@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44843 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-16 12:32:22 +00:00
Felix Fietkau de3c3ab44d uhttpd: make generating SSL keys more reliable against interrupted boots
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44772 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 10:32:10 +00:00
John Crispin 72e4b3b9bf uhttp: update to latest git HEAD
this add json-c 0.12, sorry forgot to push this earlier today

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44682 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-11 17:58:47 +00:00
Jo-Philipp Wich 48acc3f8cc uhttpd: relay stderr to syslog
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44548 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-02-26 13:44:05 +00:00
Jo-Philipp Wich fe829c5a75 uhttpd: fix another remaining relro issue in the Lua plugin
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44143 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-25 20:43:17 +00:00
Jo-Philipp Wich dfa9a409c9 uhttpd: fix time_t type mismatch on 32bit systems
The previous update introducing LFS support unconditionally changed the
sprintf() pattern used to print the file modification time to use PRIx64.

Explicitely convert the st_mtime member of the stat struct to uint64_t in
order to avoid type mismatch errors when building for non-64bit targets.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44138 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-25 17:59:08 +00:00
Jo-Philipp Wich cfc5c0c8b4 uhttpd: fix crash with enabled relro, memory leak in dirlists and lfs
* Fix the ubus plugin to not make its uhttpd_plugin entry symbol
   constant as uhttpd needs to modify its list_head member
 * Make sure that uhttpd supports large files by using 64bit ints
   where appropriate and by passing _FILE_OFFSET_BITS=64 to the build
 * Plug a possible memleak in the directory listing code

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44135 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-25 17:23:26 +00:00
Jo-Philipp Wich 644087a08b uhttpd: fix exit code of mod-ubus postinstall script
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44132 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-25 15:54:43 +00:00
John Crispin 85c10a8a6a license info - revert r43155
turns out that r43155 adds duplicate info.

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43167 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-03 09:56:44 +00:00
John Crispin b8df8ca970 Add more license tags with SPDX identifiers
Note, that licensing stuff is a nightmare: many packages does not clearly
state their licenses, and often multiple source files are simply copied
together - each with different licensing information in the file headers.

I tried hard to ensure, that the license information extracted into the OpenWRT's
makefiles fit the "spirit" of the packages, e.g. such small packages which
come without a dedicated source archive "inherites" the OpenWRT's own license
in my opinion.

However, I can not garantee that I always picked the correct information
and/or did not miss license information.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43155 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-03 08:01:08 +00:00
Steven Barth 2bf2015c24 Add a few SPDX tags
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43151 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-02 12:20:54 +00:00
Jo-Philipp Wich 64edfd8a14 uhttpd: fix HTTP incompatibilities in file handler
* Fixes sending an extraneous message body for 204 and 304 resoponses which
   breaks Chrome in keep-alive mode.

 * Adds mimetypes for JSON and JSONP.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43078 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-27 10:25:07 +00:00
Jo-Philipp Wich 6894492f81 uhttpd: do not configure TLS parameters if libustream-ssl is not present
A quite frequent problem after sysupgrading from an older, SSL enabled build
is that ustream-ssl is not installed so uhttpd fails to come up again due to
https listening directives in the preserved configuration.

Skip key/cert and ssl listen options when libustream-ssl.so is not present.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42284 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-25 12:39:34 +00:00
Steven Barth a1912788a8 uhttpd: also bind to IPv6 by default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41114 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:11:55 +00:00
Felix Fietkau 59fdd2eedf uhttpd: update to the latest version, fixes musl compile issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41057 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-09 13:47:40 +00:00
Felix Fietkau c026bbe150 uhttpd: update to the latest version, fixes cgi path handling issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40743 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-05-09 11:17:42 +00:00
Jo-Philipp Wich a417886bdc uhttpd: do not attempt to configure Lua handler if referenced file does not exist
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40457 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-11 16:13:27 +00:00
Felix Fietkau 58933441da uhttpd: update to latest version, improves cgi path handling
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40005 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-22 19:38:48 +00:00
Felix Fietkau 1a4dd4ddff uhttpd: update to latest version, fixes HEAD requests to CGI scripts
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40003 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-21 20:49:56 +00:00
Jo-Philipp Wich c5340d1dbf uhttpd: don't process ubus_* and lua_* options if corresponding plugin is not installed (#14618)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39057 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-15 15:32:37 +00:00
Felix Fietkau 6d79816d87 uhttpd: update to the latest version, fixes crashes in the ubus plugin
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38888 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-21 21:52:24 +00:00
Jo-Philipp Wich 781c17117a uhttpd: return after processing -d switch, only set ubus prefix if not already defined
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38743 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-11 19:14:01 +00:00
John Crispin a58e136635 uhttp: add ubus.default
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38741 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-11 18:12:26 +00:00
John Crispin c77ae7ec32 uhttp: make the service auto respawn if it crashes
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38724 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-11 12:19:02 +00:00
John Crispin 7a06fe0b42 uhttp: make sure that the ubus module is loaded when when installed
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38723 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-11 12:18:58 +00:00
Felix Fietkau b8672f84cb uhttpd: add a config option for using ustream-polarssl, and use it by default
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38250 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-29 11:26:09 +00:00
Felix Fietkau 3a931a5b0c uhttpd: fix appending https ports to cmdline
Otherwise it is started only on non-secure ports.

Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38171 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-25 07:44:48 +00:00
John Crispin d330d9fac4 procd: convert various packages to procd style init.d scripts
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38023 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-17 21:45:30 +00:00
Jo-Philipp Wich 546a43923a uhttpd: udpat to git head
- fixes buffer corruption with JSON-RPC list calls
	- change JSON-RPC protocol to include the session ID into the call
	  attributes instead of passing it via the URL
	- forcibly pass effective session ID as "ubus_rpc_session" attribute
	  to called procedures
	- change ubus acl checking to conform with new ubus session namespace

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37962 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-13 13:24:45 +00:00
Felix Fietkau 5cd74c5c9b uhttpd: update to the latest version, fixes a crash on early cgi/lua process termination
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37628 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-31 22:07:09 +00:00
Felix Fietkau 6a732cad77 uhttpd: update to latest version, fixes issues with POST and keep-alive (#13940)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37556 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-26 10:03:07 +00:00
Jo-Philipp Wich f5a4945636 uhttpd: expose missing options to uci
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36932 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-13 11:55:12 +00:00
Felix Fietkau 93ac2d0351 uhttpd: update to latest version, fixes CGI related crashes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36817 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-01 21:43:06 +00:00
Felix Fietkau 1d886ef03c uhttpd: update again to fix a ubus plugin crash bug
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36770 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-30 13:16:38 +00:00
Felix Fietkau 25681e5dbd uhttpd: update to latest version, fixes script timeout for ubus requests
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36767 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-30 10:44:20 +00:00
Felix Fietkau 4ffd43dbc7 uhttpd: update to latest version, fixes #13564, #13560, improves error handling as pointed out in #13537
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36696 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-23 10:50:42 +00:00
Felix Fietkau 8ca26bf040 uhttpd: update to latest version, fixes index page processing order
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36644 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-16 11:38:19 +00:00
Felix Fietkau e252bdb152 uhttpd: update to latest version, fixes a SSL connection memory leak
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36636 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-14 17:43:00 +00:00
Jo-Philipp Wich 49df5264b6 uhttpd: update to git head, fixes regression when parsing IPv6 listen arguments
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36348 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-17 11:34:39 +00:00
Felix Fietkau c916e833c0 uhttpd: update to latest version, fixes compile error with latest libubox
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36338 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-15 14:49:52 +00:00
Felix Fietkau 54ae3b1981 uhttpd: update to latest version, fixes an occasional crash on CGI scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36034 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-03-15 13:43:55 +00:00
Felix Fietkau a2052a26f0 uhttpd: always turn on TLS support, include ustream-ssl as a build dependency
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35295 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-22 15:05:04 +00:00
Felix Fietkau 4c8c6257d4 uhttpd: fix another small hang issue with the same symptoms
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35291 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-22 09:38:00 +00:00
Felix Fietkau fbfc90de7d uhttpd: fix connection hangs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35290 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-22 09:28:55 +00:00
Felix Fietkau 9e2b006414 uhttpd: fix unencrypted passwords in httpd.conf
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35265 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-21 12:46:41 +00:00
Felix Fietkau 6c5a013f22 uhttpd: fix selecting the right ustream implementation when openssl is to be used (#12857)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35257 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-20 21:15:43 +00:00
Felix Fietkau b5a9786bc0 uhttpd: update to a newer version, fixes chunked transfer on some POST requests
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35249 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-19 22:55:46 +00:00
Felix Fietkau 2f518a61da uhttpd: switch to uhttpd2, it is now feature complete
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35247 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-19 18:47:09 +00:00
Jo-Philipp Wich 1369cbd8de uhttpd: update to latest git head, improves handling of invalid requests
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34010 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-30 13:13:21 +00:00