← Back to branch summary

~clint-fewbar/ubuntu/precise/squid3/ignore-sighup-early

« back to all changes in this revision

Viewing changes to src/redirect.cc

  • Committer: Package Import Robot
  • Author(s): Luigi Gangitano
  • Date: 2011-09-02 13:33:41 UTC
  • mto: (21.2.8 sid)
  • mto: This revision was merged to the branch mainline in revision 30.
  • Revision ID: package-import@ubuntu.com-20110902133341-56p01dh4mh6e308v
Tags: upstream-3.1.15
Import upstream version 3.1.15

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/redirect.cc
141
141
    else
142
142
        r->client_addr.SetNoAddr();
143
143
    r->client_ident = NULL;
144
 
 
145
 
    if (http->request->auth_user_request)
 
144
    if (http->request->auth_user_request != NULL) {
146
145
        r->client_ident = http->request->auth_user_request->username();
147
 
    else if (http->request->extacl_user.defined()) {
 
146
        debugs(61, 5, HERE << "auth-user=" << (r->client_ident?r->client_ident:"NULL"));
 
147
    }
 
148
 
 
149
    // HttpRequest initializes with null_string. So we must check both defined() and size()
 
150
    if (!r->client_ident && http->request->extacl_user.defined() && http->request->extacl_user.size()) {
148
151
        r->client_ident = http->request->extacl_user.termedBuf();
 
152
        debugs(61, 5, HERE << "acl-user=" << (r->client_ident?r->client_ident:"NULL"));
149
153
    }
150
154
 
151
 
    if (!r->client_ident && (conn != NULL && conn->rfc931[0]))
 
155
    if (!r->client_ident && (conn != NULL && conn->rfc931[0])) {
152
156
        r->client_ident = conn->rfc931;
 
157
        debugs(61, 5, HERE << "ident-user=" << (r->client_ident?r->client_ident:"NULL"));
 
158
    }
153
159
 
154
160
#if USE_SSL
155
161
 
156
 
    if (!r->client_ident && conn != NULL)
 
162
    if (!r->client_ident && conn != NULL) {
157
163
        r->client_ident = sslGetUserEmail(fd_table[conn->fd].ssl);
158
 
 
 
164
        debugs(61, 5, HERE << "ssl-user=" << (r->client_ident?r->client_ident:"NULL"));
 
165
    }
159
166
#endif
160
167
 
161
168
    if (!r->client_ident)