cvs: php-src(PHP_4_4) /sapi/isapi php4isapi.c

stas Mon Mar 5 22:04:54 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/sapi/isapi php4isapi.c Log: MF5: use srtlcat http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/php4isapi.c?r1=1.92.2.13.2.2&r2=1.92.2.13.2.3&diff_format=u Index: php-src/sapi/isapi/php4isapi.c diff -u php-src/sapi/isapi/php4isapi.c:1.92.2.13.2.2 php-src/sapi/isapi/php4isapi.c:1.92.2.13.2.3 --- php-src/sapi/isapi/php4isapi.c:1.92.2.13.2.2 Mon Jan 1 09:46:52 2007 +++ php-src/sapi/isapi/php4isapi.c Mon Mar 5 22:04:54 2007 @@ -16,7 +16,7 @@ | Ben Mansell <ben@zeus.com> (Zeus Support) | +----------------------------------------------------------------------+ */ -/* $Id: php4isapi.c,v 1.92.2.13.2.2 2007/01/01 09:46:52 sebastian Exp $ */ +/* $Id: php4isapi.c,v 1.92.2.13.2.3 2007/03/05 22:04:54 stas Exp $ */ #ifdef PHP_WIN32 # include <windows.h> @@ -302,9 +302,9 @@ lpECB->ServerSupportFunction(lpECB->ConnID, HSE_REQ_SEND_RESPONSE_HEADER_EX, &header_info, NULL, NULL); efree(combined_headers); - if (status_buf) { + if (status_buf) { efree(status_buf); - } + } return SAPI_HEADER_SENT_SUCCESSFULLY; } @@ -385,24 +385,24 @@ */ strcpy( static_cons_buf, "/C=" ); if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_C", static_variable_buf, &variable_len ) && static_variable_buf[0] ) { - strcat( static_cons_buf, static_variable_buf ); + strlcat( static_cons_buf, static_variable_buf, ISAPI_SERVER_VAR_BUF_SIZE ); } - strcat( static_cons_buf, "/ST=" ); + strlcat( static_cons_buf, "/ST=", ISAPI_SERVER_VAR_BUF_SIZE ); variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_ST", static_variable_buf, &variable_len ) && static_variable_buf[0] ) { - strcat( static_cons_buf, static_variable_buf ); + strlcat( static_cons_buf, static_variable_buf, ISAPI_SERVER_VAR_BUF_SIZE ); } php_register_variable( "SSL_CLIENT_DN", static_cons_buf, track_vars_array TSRMLS_CC ); strcpy( static_cons_buf, "/C=" ); variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_I_C", static_variable_buf, &variable_len ) && static_variable_buf[0] ) { - strcat( static_cons_buf, static_variable_buf ); + strlcat( static_cons_buf, static_variable_buf, ISAPI_SERVER_VAR_BUF_SIZE ); } - strcat( static_cons_buf, "/ST=" ); + strlcat( static_cons_buf, "/ST=", ISAPI_SERVER_VAR_BUF_SIZE ); variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_I_ST", static_variable_buf, &variable_len ) && static_variable_buf[0] ) { - strcat( static_cons_buf, static_variable_buf ); + strlcat( static_cons_buf, static_variable_buf, ISAPI_SERVER_VAR_BUF_SIZE ); } php_register_variable( "SSL_CLIENT_I_DN", static_cons_buf, track_vars_array TSRMLS_CC ); }