Const'ify part of sapi_request_info.

query_string, post_data, path_translated, request_uri, auth_user,
auth_password and argv0 are modified, so they cannot become const.

diff --git a/ext/session/session.c b/ext/session/session.c
index 1ed71dace093a8ad807c1b13bbfadd32685668cc..ffe7cd89c09c9c07ee400a019a5bb15e4641874b 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -641,7 +641,7 @@ static void strcat_gmt(char *ubuf, time_t *when)
 
 static void last_modified(void)
 {
-       char *path;
+       const char *path;
        struct stat sb;
        char buf[MAX_STR + 1];
        SLS_FETCH();

diff --git a/main/SAPI.h b/main/SAPI.h
index e551a32165f5fd40c588ef0d37c0942e4ecb7f08..31e6872ab8403714175ea4830e8ef944f9777f44 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -61,17 +61,17 @@ extern sapi_module_struct sapi_module;  /* true global */
 
 
 typedef struct {
-       char *request_method;
+       const char *request_method;
        char *query_string;
        char *post_data;
-       char *cookie_data;
+       const char *cookie_data;
        long content_length;
        uint post_data_length;
 
        char *path_translated;
        char *request_uri;
 
-       char *content_type;
+       const char *content_type;
 
        unsigned char headers_only;
 

diff --git a/main/main.c b/main/main.c
index 73e1b3e54d646c2880ba917db837b33a8b01afdf..3a8af10da3cf33dee2ac06eead27a1db5992dc7f 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1140,10 +1140,9 @@ static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC)
 PHPAPI int php_handle_special_queries(SLS_D PLS_DC)
 {
        if (SG(request_info).query_string && SG(request_info).query_string[0]=='=' 
-               && PG(expose_php)) {
-               if(php_info_logos(SG(request_info).query_string+1))
-                       {       
-                               return 1;
+                       && PG(expose_php)) {
+               if (php_info_logos(SG(request_info).query_string+1)) {  
+                       return 1;
                } else if (!strcmp(SG(request_info).query_string+1, PHP_CREDITS_GUID)) {
                        php_print_credits(PHP_CREDITS_ALL);
                        return 1;

diff --git a/main/php_logos.c b/main/php_logos.c
index 94a0830c2f61220bc1d349b6efd7f83b32e30cca..aa66843d6038d046ee760e0777d36f8f0a1fbec5 100644 (file)
--- a/main/php_logos.c
+++ b/main/php_logos.c
@@ -68,7 +68,7 @@ int php_shutdown_info_logos(void)
 }
 
 #define CONTENT_TYPE_HEADER "Content-Type: "
-int php_info_logos(char *logo_string)
+int php_info_logos(const char *logo_string)
 {
        php_info_logo *logo_image;
        char *content_header;

diff --git a/main/php_logos.h b/main/php_logos.h
index d079adf5dfc2d70323b1caebbc5746e2c461a615..54c61d2632ad892ffd903d156099d29cf3098e8d 100644 (file)
--- a/main/php_logos.h
+++ b/main/php_logos.h
@@ -5,6 +5,6 @@ PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, unsigned ch
 PHPAPI int php_unregister_info_logos(char *logo_string);
 int php_init_info_logos(void);
 int php_shutdown_info_logos(void);
-int php_info_logos(char *logo_string);
+int php_info_logos(const char *logo_string);
 
 #endif /* _PHP_LOGOS_H */

diff --git a/main/php_variables.c b/main/php_variables.c
index 4187d00ebafec9db42a1e323654c5a9a510207bc..bff78e4a793c77549eb89ed617d2202df39b4456 100644 (file)
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -212,6 +212,7 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler)
 void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
 {
        char *res = NULL, *var, *val;
+       const char *c_var;
        pval *array_ptr;
        int free_buffer=0;
        char *strtok_buf = NULL;
@@ -246,17 +247,17 @@ void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
        }
 
        if (arg == PARSE_GET) {         /* GET data */
-               var = SG(request_info).query_string;
-               if (var && *var) {
-                       res = (char *) estrdup(var);
+               c_var = SG(request_info).query_string;
+               if (c_var && *c_var) {
+                       res = (char *) estrdup(c_var);
                        free_buffer = 1;
                } else {
                        free_buffer = 0;
                }
        } else if (arg == PARSE_COOKIE) {               /* Cookie data */
-               var = SG(request_info).cookie_data;
-               if (var && *var) {
-                       res = (char *) estrdup(var);
+               c_var = SG(request_info).cookie_data;
+               if (c_var && *c_var) {
+                       res = (char *) estrdup(c_var);
                        free_buffer = 1;
                } else {
                        free_buffer = 0;

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 00f2b9228441b4afb220dc0e6b9146f4177b6502..d7d899b031e12b5f94cd8ef9ff0b68e16f3b5b6e 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -298,9 +298,9 @@ static int php_output_filter(ap_filter_t *f, ap_bucket_brigade *bb)
                /* XXX: Lots of startup crap. Should be moved into its own func */
                PG(during_request_startup) = 0;
                SG(sapi_headers).http_response_code = 200;
-               SG(request_info).content_type = (char *) apr_table_get(f->r->headers_in, "Content-Type");
+               SG(request_info).content_type = apr_table_get(f->r->headers_in, "Content-Type");
                SG(request_info).query_string = f->r->args;
-               SG(request_info).request_method = (char *) f->r->method;
+               SG(request_info).request_method = f->r->method;
                SG(request_info).request_uri = f->r->uri;
                f->r->no_cache = f->r->no_local_copy = 1;
                content_type = sapi_get_default_content_type(SLS_C);