Denis Vlasenko
72b6a65b2f
httpd: fix buglet in hex conversion. Remove alloca NULL checks
...
(never happens, app just crashes if stack overflows)
svlogd: cosmetic messages and style fixes
2007-08-21 11:18:25 +00:00
Denis Vlasenko
e58e8d9444
httpd: add optional support for error pages
...
(by Pierre Metras <genepi@sympatico.ca>)
2007-08-21 10:26:55 +00:00
Denis Vlasenko
63db27f9f4
removed stray debugging comments
2007-08-19 21:24:37 +00:00
Denis Vlasenko
d867f32a7a
httpd: explain IP/mask parsing, and simplify it a bit.
...
parse_conf 1258 1247 -11
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-11) Total: -11 bytes
text data bss dec hex filename
772602 1058 11092 784752 bf970 busybox_old
772594 1058 11092 784744 bf968 busybox_unstripped
2007-08-19 21:15:42 +00:00
Denis Vlasenko
921799da4e
httpd: reinstate (much lighter) paranoid connection close code
...
allegedly needed for some versions of IE. +45 bytes.
2007-08-19 19:28:09 +00:00
Denis Vlasenko
37c3316fd7
httpd: get rid of rmt_port and setenv_log
2007-08-19 18:54:22 +00:00
Denis Vlasenko
52e15dc50b
httpd: get rid of sscanf usage. Rename some variables.
2007-08-19 18:53:43 +00:00
Denis Vlasenko
fe7cd642b0
don't pass argc in getopt32, it's superfluous
...
(add/remove: 0/0 grow/shrink: 12/131 up/down: 91/-727) Total: -636 bytes
text data bss dec hex filename
773469 1058 11092 785619 bfcd3 busybox_old
772644 1058 11092 784794 bf99a busybox_unstripped
2007-08-18 15:32:12 +00:00
Denis Vlasenko
d6cd9d7fe9
httpd: stop reading headers using 1-byte read()
...
get_line 73 105 +32
httpd_main 769 766 -3
send_cgi_and_exit 1583 1577 -6
send_headers 449 432 -17
handle_incoming_and_exit 2217 2172 -45
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/4 up/down: 32/-71) Total: -39 bytes
2007-08-18 14:22:09 +00:00
Denis Vlasenko
367960ba9a
make standalone httpd work on NOMMU machines
2007-08-18 14:20:21 +00:00
Denis Vlasenko
9611cb1215
get rid of server_ and accepted_socket globals.
...
get_line 74 73 -1
log_and_exit 33 32 -1
send_headers 457 449 -8
httpd_main 906 892 -14
handle_incoming_and_exit 2136 2113 -23
send_cgi_and_exit 1743 1583 -160
2007-08-18 14:18:43 +00:00
Denis Vlasenko
b98c26ad68
httpd shrink and logging update, part 7 of 7
...
text data bss dec hex filename
9836 0 0 9836 266c busybox.t1/networking/httpd.o.orig
9724 0 0 9724 25fc busybox.t2/networking/httpd.o
9657 0 0 9657 25b9 busybox.t3/networking/httpd.o
9342 0 0 9342 247e busybox.t4/networking/httpd.o
9342 0 0 9342 247e busybox.t5/networking/httpd.o
9262 0 0 9262 242e busybox.t6/networking/httpd.o
9283 0 0 9283 2443 busybox.t7/networking/httpd.o
9334 0 0 9334 2476 busybox.t8/networking/httpd.o
2007-08-17 19:21:12 +00:00
Denis Vlasenko
feac3ce8c0
httpd shrink and logging update, part 6 of 7
...
text data bss dec hex filename
9836 0 0 9836 266c busybox.t1/networking/httpd.o.orig
9724 0 0 9724 25fc busybox.t2/networking/httpd.o
9657 0 0 9657 25b9 busybox.t3/networking/httpd.o
9342 0 0 9342 247e busybox.t4/networking/httpd.o
9342 0 0 9342 247e busybox.t5/networking/httpd.o
9262 0 0 9262 242e busybox.t6/networking/httpd.o
9283 0 0 9283 2443 busybox.t7/networking/httpd.o
9334 0 0 9334 2476 busybox.t8/networking/httpd.o
2007-08-17 19:20:39 +00:00
Denis Vlasenko
073214f894
httpd shrink and logging update, part 5 of 7
...
text data bss dec hex filename
9836 0 0 9836 266c busybox.t1/networking/httpd.o.orig
9724 0 0 9724 25fc busybox.t2/networking/httpd.o
9657 0 0 9657 25b9 busybox.t3/networking/httpd.o
9342 0 0 9342 247e busybox.t4/networking/httpd.o
9342 0 0 9342 247e busybox.t5/networking/httpd.o
9262 0 0 9262 242e busybox.t6/networking/httpd.o
9283 0 0 9283 2443 busybox.t7/networking/httpd.o
9334 0 0 9334 2476 busybox.t8/networking/httpd.o
2007-08-17 19:20:07 +00:00
Denis Vlasenko
91adf7d587
httpd shrink and logging update, part 4 of 7
...
text data bss dec hex filename
9836 0 0 9836 266c busybox.t1/networking/httpd.o.orig
9724 0 0 9724 25fc busybox.t2/networking/httpd.o
9657 0 0 9657 25b9 busybox.t3/networking/httpd.o
9342 0 0 9342 247e busybox.t4/networking/httpd.o
9342 0 0 9342 247e busybox.t5/networking/httpd.o
9262 0 0 9262 242e busybox.t6/networking/httpd.o
9283 0 0 9283 2443 busybox.t7/networking/httpd.o
9334 0 0 9334 2476 busybox.t8/networking/httpd.o
2007-08-17 19:19:42 +00:00
Denis Vlasenko
e45af73dc2
httpd shrink and logging update, part 3 of 7
...
text data bss dec hex filename
9836 0 0 9836 266c busybox.t1/networking/httpd.o.orig
9724 0 0 9724 25fc busybox.t2/networking/httpd.o
9657 0 0 9657 25b9 busybox.t3/networking/httpd.o
9342 0 0 9342 247e busybox.t4/networking/httpd.o
9342 0 0 9342 247e busybox.t5/networking/httpd.o
9262 0 0 9262 242e busybox.t6/networking/httpd.o
9283 0 0 9283 2443 busybox.t7/networking/httpd.o
9334 0 0 9334 2476 busybox.t8/networking/httpd.o
2007-08-17 19:19:15 +00:00
Denis Vlasenko
241b1567ad
httpd shrink and logging update, part 2 of 7
...
text data bss dec hex filename
9836 0 0 9836 266c busybox.t1/networking/httpd.o.orig
9724 0 0 9724 25fc busybox.t2/networking/httpd.o
9657 0 0 9657 25b9 busybox.t3/networking/httpd.o
9342 0 0 9342 247e busybox.t4/networking/httpd.o
9342 0 0 9342 247e busybox.t5/networking/httpd.o
9262 0 0 9262 242e busybox.t6/networking/httpd.o
9283 0 0 9283 2443 busybox.t7/networking/httpd.o
9334 0 0 9334 2476 busybox.t8/networking/httpd.o
2007-08-17 19:18:47 +00:00
Denis Vlasenko
6a2f7f41cf
whitespace fixes, no code changes
2007-08-16 10:35:17 +00:00
Denis Vlasenko
384b1d12f9
httpd: add -v[v]: prints client addresses, HTTP codes returned [and URLs]
...
get_line - 70 +70
packed_usage 22811 22863 +52
handle_incoming_and_exit 2246 2277 +31
httpd_main 1141 1155 +14
sendHeaders 489 482 -7
getLine 77 - -77
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 3/1 up/down: 167/-84) Total: 83 bytes
text data bss dec hex filename
774335 1058 11092 786485 c0035 busybox_old
774447 1058 11092 786597 c00a5 busybox_unstripped
2007-08-14 16:55:01 +00:00
Denis Vlasenko
0372f0f199
httpd: extend -p PORT to -p [IP[v6]:]PORT
...
httpd: comment out strange code which "closes connection properly"
(isnt exit(0) good enough?)
handle_incoming_and_exit - 2246 +2246
httpd_main 1116 1141 +25
getLine 75 77 +2
packed_usage 22827 22811 -16
parse_conf 1303 1284 -19
shutdown 32 - -32
handleIncoming 2578 - -2578
------------------------------------------------------------------------------
(add/remove: 1/2 grow/shrink: 2/2 up/down: 2273/-2645) Total: -372 bytes
text data bss dec hex filename
774704 1058 11092 786854 c01a6 busybox_old
774335 1058 11092 786485 c0035 busybox_unstripped
2007-08-14 16:50:01 +00:00
Denis Vlasenko
319f8ebef8
httpd: round down sendfile byte count to 64k
...
*: style fixes
2007-08-13 11:09:30 +00:00
Denis Vlasenko
1b9064d535
httpd: sendfile support
2007-08-12 21:05:49 +00:00
Denis Vlasenko
6ca409e0e4
trylink: produce even more info about final link stage
...
trylink: explain how to modify link and drastically decrease amount
of padding (unfortunately, needs hand editing ATM).
*: add ALIGN1 / ALIGN2 to global strings and arrays of bytes and shorts
size saving: 0.5k
2007-08-12 20:58:27 +00:00
Denis Vlasenko
4185548984
httpd: CGI Status: header fix
2007-08-11 20:26:02 +00:00
Denis Vlasenko
1ec15cd818
httpd: add support for Status: CGI header
2007-08-11 20:20:43 +00:00
Denis Vlasenko
e5d37ccb6e
httpd: fix CGI handling bug (we were closing wrong fd).
2007-08-11 20:20:02 +00:00
Denis Vlasenko
82bd9ee645
fix typo in last commit
2007-07-21 15:07:22 +00:00
Denis Vlasenko
6cd84dac84
Three patches from FreeWRT people
2007-07-21 14:57:54 +00:00
Denis Vlasenko
dc757aa16c
introduce and use bb_basename()
...
function old new delta
bb_basename - 26 +26
sv_main 1226 1225 -1
passwd_main 1985 1983 -2
showdirs 482 478 -4
sendCgi 1811 1807 -4
make_device 1354 1350 -4
handleIncoming 2443 2439 -4
func_name 82 78 -4
service_name 2292 2285 -7
main 909 901 -8
cmp_main 555 547 -8
test_main 434 422 -12
act 228 216 -12
find_pair 180 164 -16
rmmod_main 298 280 -18
find_pid_by_name 156 134 -22
modprobe_main 1606 1576 -30
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/16 up/down: 26/-156) Total: -130 bytes
text data bss dec hex filename
734933 3028 14400 752361 b7ae9 busybox_old
734801 3028 14400 752229 b7a65 busybox_unstripped
2007-06-30 08:04:05 +00:00
Denis Vlasenko
80b8b39899
Consolidate ARRAY_SIZE macro; remove one unneeded global var (walter harms <wharms@bfs.de>)
2007-06-25 10:55:35 +00:00
Denis Vlasenko
56258b688c
httpd: NOMMU fixes by Alex Landau <landau_alex@yahoo.com>
2007-06-23 23:14:02 +00:00
Denis Vlasenko
77e44d60e6
httpd: move data off bss.
...
httpd: do not realpath() for SCRIPT_FILENAME - it resolves symlinks
but it should not:
- /* SCRIPT_FILENAME required by PHP in CGI mode */
- if (!realpath(purl + 1, realpath_buff))
- goto error_execing_cgi;
- setenv1("SCRIPT_FILENAME", realpath_buff);
+
+ /* SCRIPT_FILENAME required by PHP in CGI mode */
+ fullpath = concat_path_file(home_httpd, purl);
+ setenv1("SCRIPT_FILENAME", fullpath);
2007-06-09 23:49:05 +00:00
Denis Vlasenko
b6adbf1be2
usage.c: remove reference to busybox.h
...
*: s/include "busybox.h"/include "libbb.h"
2007-05-26 19:00:18 +00:00
Denis Vlasenko
088b959d00
"Unify base64 handling" is done, remove TODO
2007-04-18 21:14:46 +00:00
Denis Vlasenko
16abcd90ae
teach find_root_device to deal with /dev/ subdirs
...
(by "Kirill K. Smirnov" <lich@math.spbu.ru>)
2007-04-13 23:59:52 +00:00
Denis Vlasenko
473dae080a
add more convenient defines for [NO]MMU:
...
"#ifndef BB_NOMMU" is a double negative
2007-04-11 07:04:23 +00:00
Bernhard Reutner-Fischer
febe3c4211
- sed -e "s/char[[:space:]]*\*[[:space:]]*argv\[\]/char **argv/g"
2007-04-04 20:52:03 +00:00
Denis Vlasenko
53091ecd20
Attempt to get more applets compile for NOMMU.
...
TODO_config_nommu documents what I managed to compile so far
(yay! msh works! cool). inetd, telnetd, httpd still do not compile. TODO
Also make fork(), daemon() produce warnings on compile stage
(in addition to erros on link stage).
2007-03-26 13:35:09 +00:00
Denis Vlasenko
5a142025d3
move everything to new NOMMU helpers, except udhcp
2007-03-26 13:20:54 +00:00
Denis Vlasenko
80281fefc0
httpd: make httpd usable for NOMMU CPUs
2007-03-07 22:16:38 +00:00
Denis Vlasenko
8e858e2700
clean up accumulated whitespace damage
2007-03-07 09:35:43 +00:00
Denis Vlasenko
1ccd96fd1f
httpd: run interpreter for configured file extensions in any dir,
...
not only in /cgi-bin/
2007-03-05 19:24:33 +00:00
Denis Vlasenko
ec77ba128a
httpd: fix breakage (introduced by me)
2007-03-05 16:56:25 +00:00
Denis Vlasenko
b5368bf437
httpd: a little bit more correct handling of CGI "HTTP/xxx" output
2007-02-13 23:42:54 +00:00
Denis Vlasenko
a3055846a4
httpd: fix for POSTDATA handling bugs:
...
erroneous close(0)
full_read -> safe_read (with explanation)
2007-02-11 19:51:06 +00:00
Denis Vlasenko
06af216528
suppress warnings about easch <applet>_main() having
...
no preceding prototype
2007-02-03 17:28:39 +00:00
Denis Vlasenko
ab2aea4447
preparatory patch for -Wwrite-strings #4
2007-01-29 22:51:58 +00:00
Denis Vlasenko
703e20235a
cleanups: unnecessary casts, unified const_1, eliminate cross-.c file
...
prototypes (heresy!), add spaces in places like "flags&NETSTAT_CONNECTED",
removed unused #defines, #ifdef -> #if, use uint32_t for ipv4 addrs.
2007-01-22 14:12:08 +00:00
Denis Vlasenko
b64eed6030
httpd: use fd#1 in inetd mode
...
inetd: micro style fix
2007-01-14 17:06:11 +00:00
Denis Vlasenko
6536a9b583
next part of ipv6-ization is here: wget & httpd
2007-01-12 10:35:23 +00:00
Denis Vlasenko
f7996f3b70
Trailing whitespace removal over entire tree
2007-01-11 17:20:00 +00:00
Denis Vlasenko
6998142998
httpd: stop adding our own "Content-type:" to CGI output
2007-01-07 21:25:12 +00:00
Denis Vlasenko
a773af3b1d
httpd: read cgi output with full_read, not safe_read
...
(avoids mangling of HTTP headers)
2007-01-03 23:02:18 +00:00
Denis Vlasenko
9b1381fd2f
convert calloc to xzalloc
...
fix sleep-on-die option
2007-01-03 02:56:00 +00:00
Denis Vlasenko
3bba545a54
done a dozen of randconfig test. guess what? ALL failed...
...
these are resulting fixes
2006-12-30 17:57:03 +00:00
Denis Vlasenko
a35c9e91ba
httpd: fix decode of '/' when called via -d
2006-11-29 15:58:50 +00:00
Denis Vlasenko
601ae1378b
od: sometime ago I landed BIG od implementation
...
from coreutils. My fault. This commit contains
cleanups and size reductions.
2006-11-28 23:37:46 +00:00
Denis Vlasenko
cf30cc82a3
header_verbose_list: stop truncating file size in listing
2006-11-24 14:53:18 +00:00
Denis Vlasenko
48237b0c88
introduce setsockopt_reuseaddr(int fd), setsockopt_broadcast(int fd),
...
use them where appropriate. 200 bytes saved
2006-11-22 23:22:06 +00:00
Denis Vlasenko
428f7ae6e2
httpd: comment on QUERY_STRING
2006-11-21 21:35:14 +00:00
Denis Vlasenko
8b45837b4c
httpd: add link to docs
2006-11-21 21:23:21 +00:00
Denis Vlasenko
1288722f3e
wget: add TODO
2006-11-21 11:15:58 +00:00
Denis Vlasenko
04291bc5ae
httpd: slight reduction of #ifdef forest
...
few other applets: #ifdef CONFIG_ -> #if ENABLE_
traceroute: fix exposed bugs
defconfig: update
2006-11-21 10:15:25 +00:00
Denis Vlasenko
5d148e2646
httpd: fix cgi-bin/index.cgi support, add example of it,
...
stat: fix end-of-line if format is specified (wasn't printing it),
fix %z (time) format to match coreutils 6.3
2006-11-21 00:12:09 +00:00
Denis Vlasenko
fcdb00f735
httpd: LC_TIME locale _must_ be POSIX to httpd! We speak over the net!
2006-11-21 00:09:37 +00:00
Denis Vlasenko
6c85ddc850
httpd: add support for directory indexer (cgi-bin/index.cgi)
2006-11-21 00:08:39 +00:00
Denis Vlasenko
a3ee69fa6c
httpd: get rid of big, useless blocks (deindent,
...
bring code under 80 columns)
2006-11-21 00:07:31 +00:00
Denis Vlasenko
0bb993f39b
httpd: More robust Content-length: parsing,
...
code reorganization (less indented)
2006-11-21 00:06:28 +00:00
Denis Vlasenko
a5342b4541
httpd: make Bernhard happier
2006-11-17 18:26:57 +00:00
Denis Vlasenko
b3a071543d
httpd: reduce ifdef forest. comment out redundant PATH setting
2006-11-16 18:04:43 +00:00
Denis Vlasenko
d4f3d1a4bd
httpd:
...
fix union aliasing bug
symptom: wget of non-existent file gets redirected to /text/html/something
on second and subsequend wget attempts
fix double-free bug
symptom: glibc caught double-free (we didn't NULL config->xxx ptrs after free)
2006-11-16 16:20:12 +00:00
Denis Vlasenko
0871bc89fb
httpd: add -i (inetd) and -f (foreground) otions.
...
-i makes possible to run httpd in both inetd and standalone mode
without recompile (or need to have two different binaries)
2006-11-16 16:17:02 +00:00
Denis Vlasenko
e867b7ce86
httpd: stop being silly with setenv
2006-11-16 16:12:09 +00:00
Denis Vlasenko
6c5e5a0e85
httpd: cosmetic fixes (the bug which was being hunted down
...
turned out to be nonexistent :)
2006-11-10 23:28:57 +00:00
Denis Vlasenko
9f60929cc4
httpd: sendCgi() forked child needs to close opened
...
server socket and accepted socket
2006-11-05 19:47:33 +00:00
Denis Vlasenko
5d499e1600
find: a lot more compliant to 'standard' find
...
(we were not respecting order of actions!).
Add -o and -a handling.
2006-10-29 19:07:01 +00:00
Denis Vlasenko
5c7596058d
ls: cleanup part 1
2006-10-28 12:37:16 +00:00
Denis Vlasenko
e1a0d486e4
message string changes, mostly for consistency, also -32 bytes in .rodata
2006-10-20 13:28:22 +00:00
Denis Vlasenko
7039a66b58
correct largefile support, add comments about it.
2006-10-08 17:54:47 +00:00
Denis Vlasenko
1385899416
attempt to regularize atoi mess.
2006-10-08 12:49:22 +00:00
Denis Vlasenko
5625415085
dd: make it recognize not only 'k' but 'K' too;
...
make it (partially) CONFIG_LFS-aware
2006-10-07 16:24:46 +00:00
Denis Vlasenko
de59c0f58f
httpd: add -u user[:grp] support
2006-10-05 22:50:22 +00:00
Denis Vlasenko
67b23e6043
getopt_ulflags -> getopt32.
...
It is impossible to formulate sane ABI based on
size of ulong because it can be 32-bit or 64-bit.
Basically it means that you cannot portably use
more that 32 option chars in one call anyway...
Make it explicit.
2006-10-03 21:00:06 +00:00
Denis Vlasenko
9275814a9e
lots of silly indent fixes
2006-10-03 19:56:34 +00:00
Denis Vlasenko
55a994055f
lsmod: repair indentation
...
httpd: ifdef CONFIG -> if ENABLE (shorted, catched typos)
2006-09-30 20:41:44 +00:00
Denis Vlasenko
8b8c75e6ab
httpd: sanitize indentation
2006-09-26 10:07:41 +00:00
Denis Vlasenko
3538b9a882
Implement optional syslog logging using ordinary
...
bb_xx_msg calls, and convert networking/* to it.
The rest of bbox will be converted gradually.
2006-09-06 18:36:50 +00:00
Rob Landley
081e38483e
Remove xcalloc() and convert its callers to xzalloc(). About half of them
...
were using "1" as one of the arguments anyway, and as for the rest a multiply
and a push isn't noticeably bigger than pushing two arguments on the stack.
2006-08-03 20:07:35 +00:00
Rob Landley
280a264fb8
Attempt to fixup httpd.c to match svn 15767.
2006-08-03 17:49:15 +00:00
"Robert P. J. Day"
581d4f36b3
Move declaration to be compatible with older gcc's.
2006-08-03 10:50:39 +00:00
Rob Landley
534374755d
Cleaup read() and write() variants, plus a couple of new functions like
...
xlseek and fdlength() for the new mkswap.
2006-07-16 08:14:35 +00:00
Rob Landley
299a6b4d7b
Consolidate #include <sys/time.h> so libbb.h does it.
2006-05-27 21:42:58 +00:00
Mike Frysinger
fa6c4844b2
fix spelling mistakes
2006-05-26 01:48:17 +00:00
Rob Landley
a2d9a1752c
More usage.h cleanups, with collateral changes to httpd. Specifically,
...
most of our CONFIG entries switch stuff on instead of off when enabled, so fix
the gratuitously reversed INETD thing.
2006-04-28 19:38:04 +00:00
Rob Landley
da0dcd1050
Patch from Robert P Day to remove standalone code from httpd. (Busybox has
...
its own make standalone planned as a general solution to this for all
applets.)
2006-04-14 19:46:19 +00:00
Rob Landley
d086b504c3
Hard wiring configuration symbol values into the code defeats the purpose
...
of _having_ configuration symbol values.
Also, changing #ifdef CONFIG to #if ENABLE isn't nearly as useful as changing
them to if (ENABLE) or USE()/SKIP()...
2006-04-14 02:32:29 +00:00
Bernhard Reutner-Fischer
d9cf7ac781
- patch from Denis Vlasenko to add and use bb_xchdir()
2006-04-12 18:39:58 +00:00
Bernhard Reutner-Fischer
67f641e75b
- patch from Denis Vlasenko to add bb_xbind() and bb_xlisten()
2006-04-12 18:24:37 +00:00
Bernhard Reutner-Fischer
2c99851181
- patch from Denis Vlasenko to add and use bb_xdaemon()
2006-04-12 18:09:26 +00:00
Bernhard Reutner-Fischer
dac7ff15b7
- patch from Denis Vlasenko to add and use bb_xsocket() and to use
...
bb_xopen some more while at it.
Also use shorter boilerplate while at it.
2006-04-12 17:55:51 +00:00