Please review the attached patch which removes unnecessary strdup
calls in PHP's NSAPI plugin for Sun Web Server. The strings are
unaltered in the SG(request_info) structure so there isn't any need to
strdup them.

thanks,
arvi
diff -r 94f02183a175 sapi/nsapi/nsapi.c
--- a/sapi/nsapi/nsapi.c        Wed Aug 26 17:11:46 2009 +0530
+++ b/sapi/nsapi/nsapi.c        Wed Aug 26 17:33:06 2009 +0530
@@ -1010,14 +1010,14 @@
        request_context->read_post_bytes = 0;
        request_context->fixed_script = fixed_script;
        request_context->http_error = (error_directive) ? rq->status_num : 0;
-       request_context->path_info = nsapi_strdup(path_info);
+       request_context->path_info = path_info;
 
        SG(server_context) = request_context;
-       SG(request_info).query_string = nsapi_strdup(query_string);
-       SG(request_info).request_uri = nsapi_strdup(uri);
-       SG(request_info).request_method = nsapi_strdup(request_method);
-       SG(request_info).path_translated = nsapi_strdup(path_translated);
-       SG(request_info).content_type = nsapi_strdup(content_type);
+       SG(request_info).query_string = query_string;
+       SG(request_info).request_uri = uri;
+       SG(request_info).request_method = request_method;
+       SG(request_info).path_translated = path_translated;
+       SG(request_info).content_type = content_type;
        SG(request_info).content_length = (content_length == NULL) ? 0 : 
strtoul(content_length, 0, 0);
        SG(sapi_headers).http_response_code = (error_directive) ? 
rq->status_num : 200;
        
@@ -1057,13 +1057,6 @@
                }
        }
 
-       nsapi_free(request_context->path_info);
-       nsapi_free(SG(request_info).query_string);
-       nsapi_free(SG(request_info).request_uri);
-       nsapi_free((void*)(SG(request_info).request_method));
-       nsapi_free(SG(request_info).path_translated);
-       nsapi_free((void*)(SG(request_info).content_type));
-
        pool_free(sn->pool, request_context);
        SG(server_context) = NULL;
 
-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to