Changeset 27629 for branches/backfire


Ignore:
Timestamp:
2011-07-17T09:19:41+02:00 (5 years ago)
Author:
jow
Message:

[backfire] merge r27628

Location:
branches/backfire/package/uhttpd
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/uhttpd/Makefile

    r25221 r27629  
    11# 
    2 # Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org> 
     2# Copyright (C) 2010-2011 Jo-Philipp Wich <xm@subsignal.org> 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=uhttpd 
    11 PKG_RELEASE:=22 
     11PKG_RELEASE:=23 
    1212 
    1313PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) 
  • branches/backfire/package/uhttpd/src/uhttpd-cgi.c

    r22962 r27629  
    158158        fd_set writer; 
    159159 
     160        sigset_t ss; 
     161 
    160162        struct sigaction sa; 
    161163        struct timeval timeout; 
     
    188190                /* exec child */ 
    189191                case 0: 
     192                        /* unblock signals */ 
     193                        sigemptyset(&ss); 
     194                        sigprocmask(SIG_SETMASK, &ss, NULL); 
     195 
    190196                        /* restore SIGTERM */ 
    191197                        sa.sa_flags = 0; 
     
    201207                        dup2(rfd[1], 1); 
    202208                        dup2(wfd[0], 0); 
     209 
     210                        /* avoid leaking our pipe into child-child processes */ 
     211                        fd_cloexec(rfd[1]); 
     212                        fd_cloexec(wfd[0]); 
    203213 
    204214                        /* check for regular, world-executable file _or_ interpreter */ 
  • branches/backfire/package/uhttpd/src/uhttpd.c

    r25221 r27629  
    622622 
    623623#ifdef HAVE_TLS 
    624 static inline uh_inittls(struct config *conf) 
     624static inline int uh_inittls(struct config *conf) 
    625625{ 
    626626        /* library handle */ 
Note: See TracChangeset for help on using the changeset viewer.