272 + if (!session_authorizer->connection_is_allowed(session->client_pid())) 273 + { 274 + start_accept(); 275 + return; 276 + } 277 + 278 connected_sessions->add(session); 279 - 280 session->read_next_message(); 281 } 282 start_accept();
if (session_authorizer->connection_is_allowed(session->client_pid())) { connected_sessions->add(session); session->read_next_message(); } } start_accept();
~~~~
368 - 369 + ... 377 - 378 +
Introduces trailing whitespace
392 + optional int32 client_pid = 2;
Not used
712 - struct sockaddr_un remote; 713 +/* struct sockaddr_un remote; ... 721 - close(sockfd); 722 + close(sockfd);*/
Not suitable for trunk
« Back to merge proposal
272 + if (!session_ authorizer- >connection_ is_allowed( session- >client_ pid())) sessions- >add(session) ; >read_next_ message( );
273 + {
274 + start_accept();
275 + return;
276 + }
277 +
278 connected_
279 -
280 session-
281 }
282 start_accept();
if (session_ authorizer- >connection_ is_allowed( session- >client_ pid()))
connected_ sessions- >add(session) ;
session- >read_next_ message( );
{
}
}
start_accept();
~~~~
368 -
369 +
...
377 -
378 +
Introduces trailing whitespace
~~~~
392 + optional int32 client_pid = 2;
Not used
~~~~
712 - struct sockaddr_un remote;
713 +/* struct sockaddr_un remote;
...
721 - close(sockfd);
722 + close(sockfd);*/
Not suitable for trunk