mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-04 04:32:24 -05:00 
			
		
		
		
	Merge remote-tracking branch 'upstream-public/pr/1287' into development
This commit is contained in:
		
						commit
						4d3e1582b0
					
				@ -2019,8 +2019,10 @@ reset:
 | 
				
			|||||||
#if !defined(_WIN32)
 | 
					#if !defined(_WIN32)
 | 
				
			||||||
    if( received_sigterm )
 | 
					    if( received_sigterm )
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        mbedtls_printf( " interrupted by SIGTERM\n" );
 | 
					        mbedtls_printf( " interrupted by SIGTERM (not in net_accept())\n" );
 | 
				
			||||||
        ret = 0;
 | 
					        if( ret == MBEDTLS_ERR_NET_INVALID_CONTEXT )
 | 
				
			||||||
 | 
					            ret = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        goto exit;
 | 
					        goto exit;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
@ -2056,8 +2058,10 @@ reset:
 | 
				
			|||||||
#if !defined(_WIN32)
 | 
					#if !defined(_WIN32)
 | 
				
			||||||
        if( received_sigterm )
 | 
					        if( received_sigterm )
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            mbedtls_printf( " interrupted by signal\n" );
 | 
					            mbedtls_printf( " interrupted by SIGTERM (in net_accept())\n" );
 | 
				
			||||||
            ret = 0;
 | 
					            if( ret == MBEDTLS_ERR_NET_ACCEPT_FAILED )
 | 
				
			||||||
 | 
					                ret = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            goto exit;
 | 
					            goto exit;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user