diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/axtls/patches/patch-httpd_main_c | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/axtls/patches/patch-httpd_main_c')
| -rw-r--r-- | package/axtls/patches/patch-httpd_main_c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/package/axtls/patches/patch-httpd_main_c b/package/axtls/patches/patch-httpd_main_c deleted file mode 100644 index b4017803e..000000000 --- a/package/axtls/patches/patch-httpd_main_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id$ ---- axTLS.orig/httpd/main.c 2007-01-31 22:35:53.000000000 +0100 -+++ axTLS/httpd/main.c 2007-02-10 12:15:20.000000000 +0100 -@@ -98,11 +98,12 @@ int main(int argc, char *argv[]) - WSADATA wsaData; - WSAStartup(wVersionRequested,&wsaData); - #else -- if (getuid() == 0) /* change our uid if we are root */ -- { -- setgid(32767); -- setuid(32767); -- } -+ /* we can't bind to port 80/443 if we are nobody ?! */ -+ //if (getuid() == 0) /* change our uid if we are root */ -+ //{ -+ // setgid(32767); -+ // setuid(32767); -+ //} - - signal(SIGQUIT, die); - signal(SIGPIPE, SIG_IGN); |