]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8aef193)
more tsrm cleanup -- output.c is not doing any fetches anymore
authorSascha Schumann <sas@php.net>
Sun, 5 Aug 2001 15:55:43 +0000 (15:55 +0000)
committerSascha Schumann <sas@php.net>
Sun, 5 Aug 2001 15:55:43 +0000 (15:55 +0000)
14 files changed:
ext/mssql/php_mssql.c patch | blob | history
ext/odbc/php_odbc.c patch | blob | history
ext/session/php_session.h patch | blob | history
ext/standard/credits.c patch | blob | history
ext/standard/file.c patch | blob | history
ext/standard/iptc.c patch | blob | history
ext/standard/php_var.h patch | blob | history
ext/standard/var.c patch | blob | history
main/main.c patch | blob | history
main/output.c patch | blob | history
main/php.h patch | blob | history
main/php_ini.c patch | blob | history
main/php_output.h patch | blob | history
sapi/apache/php_apache.c patch | blob | history

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 957e4d9c476b7a6fd8834c9bf56b8a1e311c20d8..1bf673bddd2e72f33160423c5e676743cea51563 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -103,6 +103,7 @@ ZEND_GET_MODULE(mssql)
 static PHP_INI_DISP(display_text_size)
 {
        char *value;
+       TSRMLS_FETCH();
        
     if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
                value = ini_entry->orig_value;
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 4983058587950387475a939188c6159ca7ba12d9..e5ee7257eb4ab915873b06342eeca9ea8e11bf29 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -234,6 +234,7 @@ static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 static PHP_INI_DISP(display_link_nums)
 {
        char *value;
+       TSRMLS_FETCH();
 
        if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
                value = ini_entry->orig_value;
@@ -255,6 +256,7 @@ static PHP_INI_DISP(display_link_nums)
 static PHP_INI_DISP(display_defPW)
 {
        char *value;
+       TSRMLS_FETCH();
 
        if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
                value = ini_entry->orig_value;
@@ -278,6 +280,7 @@ static PHP_INI_DISP(display_defPW)
 static PHP_INI_DISP(display_binmode)
 {
        char *value;
+       TSRMLS_FETCH();
        
     if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
                value = ini_entry->orig_value;
@@ -305,6 +308,7 @@ static PHP_INI_DISP(display_binmode)
 static PHP_INI_DISP(display_lrl)
 {
        char *value;
+       TSRMLS_FETCH();
 
        if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
                value = ini_entry->orig_value;
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index 8c3ce17208723da058b87b4d6a1436f88744f8e6..3c36d513c17dbf2d089aace2432ec6245c8615c3 100644 (file)
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -146,7 +146,7 @@ typedef struct ps_serializer_struct {
 #ifdef TRANS_SID
 void session_adapt_uris(const char *, size_t, char **, size_t * TSRMLS_DC);
 void session_adapt_url(const char *, size_t, char **, size_t * TSRMLS_DC);
-void session_adapt_flush(int (*)(const char *, uint) TSRMLS_DC);
+void session_adapt_flush(int (*)(const char *, uint TSRMLS_DC) TSRMLS_DC);
 #else
 #define session_adapt_uris(a,b,c,d) do { } while(0)
 #define session_adapt_url(a,b,c,d) do { } while(0)
diff --git a/ext/standard/credits.c b/ext/standard/credits.c
index 9b93f9f4b6b5f14e2b98cbc7f1f8cb203bc9e8d0..2f2417385a8f3e42f7440b26726eed66e4af54c3 100644 (file)
--- a/ext/standard/credits.c
+++ b/ext/standard/credits.c
@@ -28,6 +28,8 @@
  */
 PHPAPI void php_print_credits(int flag)
 {
+       TSRMLS_FETCH();
+
        if (flag & PHP_CREDITS_FULLPAGE) {
                PUTS("<html><head><title>PHP Credits</title></head><body>\n");
        }
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 78a683f5c33fe22c542783fccf95408ebbd6e997..d6b0484324379628639bcb1f05a5728c10ea7570 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1547,7 +1547,7 @@ PHP_FUNCTION(rmdir)
 /* }}} */
 /* {{{ php_passthru_fd */
 
-static size_t php_passthru_fd(int socketd, FILE *fp, int issock)
+static size_t php_passthru_fd(int socketd, FILE *fp, int issock TSRMLS_DC)
 {
        size_t bcount = 0;
        int ready = 0;
@@ -1651,7 +1651,7 @@ PHP_FUNCTION(readfile)
                rsrc_id = ZEND_REGISTER_RESOURCE(NULL,fp,php_file_le_fopen());
        }
 
-       size = php_passthru_fd(socketd, fp, issock);
+       size = php_passthru_fd(socketd, fp, issock TSRMLS_CC);
 
        zend_list_delete(rsrc_id);
 
@@ -1710,7 +1710,7 @@ PHP_FUNCTION(fpassthru)
                socketd=*(int*)what;
        }
 
-       size = php_passthru_fd(socketd, (FILE*) what, issock);
+       size = php_passthru_fd(socketd, (FILE*) what, issock TSRMLS_CC);
 
        zend_list_delete((*arg1)->value.lval);
 
diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index 096d0de42c201cc3fa4af7b024abe60f3708c165..6d9be0ad062972d4c2f0b0a1bb85f3d99d87dcab 100644 (file)
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -75,7 +75,7 @@
 
 /* {{{ php_iptc_put1
  */
-static int php_iptc_put1(FILE *fp,int spool,unsigned char c,unsigned char **spoolbuf)
+static int php_iptc_put1(FILE *fp,int spool,unsigned char c,unsigned char **spoolbuf TSRMLS_DC)
 { 
        if (spool > 0)
                PUTC(c);
@@ -88,7 +88,7 @@ static int php_iptc_put1(FILE *fp,int spool,unsigned char c,unsigned char **spoo
 
 /* {{{ php_iptc_get1
  */
-static int php_iptc_get1(FILE *fp,int spool,unsigned char **spoolbuf)
+static int php_iptc_get1(FILE *fp,int spool,unsigned char **spoolbuf TSRMLS_DC)
 {      
        int c;
        char cc;
@@ -110,11 +110,11 @@ static int php_iptc_get1(FILE *fp,int spool,unsigned char **spoolbuf)
 
 /* {{{ php_iptc_read_remaining
  */
-static int php_iptc_read_remaining(FILE *fp,int spool,unsigned char **spoolbuf)
+static int php_iptc_read_remaining(FILE *fp,int spool,unsigned char **spoolbuf TSRMLS_DC)
 {
        int c;
 
-       while ((c = php_iptc_get1(fp,spool,spoolbuf)) != EOF) continue;
+       while ((c = php_iptc_get1(fp,spool,spoolbuf TSRMLS_CC)) != EOF) continue;
 
        return M_EOI;
 }
@@ -122,21 +122,21 @@ static int php_iptc_read_remaining(FILE *fp,int spool,unsigned char **spoolbuf)
 
 /* {{{ php_iptc_skip_variable
  */
-static int php_iptc_skip_variable(FILE *fp,int spool,unsigned char **spoolbuf)
+static int php_iptc_skip_variable(FILE *fp,int spool,unsigned char **spoolbuf TSRMLS_DC)
 { 
        unsigned int  length;
        int c1,c2;
 
-    if ((c1 = php_iptc_get1(fp,spool,spoolbuf)) == EOF) return M_EOI;
+    if ((c1 = php_iptc_get1(fp,spool,spoolbuf TSRMLS_CC)) == EOF) return M_EOI;
 
-    if ((c2 = php_iptc_get1(fp,spool,spoolbuf)) == EOF) return M_EOI;
+    if ((c2 = php_iptc_get1(fp,spool,spoolbuf TSRMLS_CC)) == EOF) return M_EOI;
 
        length = (((unsigned char) c1) << 8) + ((unsigned char) c2);
 
        length -= 2;
 
        while (length--)
-               if (php_iptc_get1(fp,spool,spoolbuf) == EOF) return M_EOI;
+               if (php_iptc_get1(fp,spool,spoolbuf TSRMLS_CC) == EOF) return M_EOI;
 
        return 0;
 }
@@ -144,29 +144,29 @@ static int php_iptc_skip_variable(FILE *fp,int spool,unsigned char **spoolbuf)
 
 /* {{{ php_iptc_next_marker
  */
-static int php_iptc_next_marker(FILE *fp,int spool,unsigned char **spoolbuf)
+static int php_iptc_next_marker(FILE *fp,int spool,unsigned char **spoolbuf TSRMLS_DC)
 {
     int c;
 
     /* skip unimportant stuff */
 
-    c = php_iptc_get1(fp,spool,spoolbuf);
+    c = php_iptc_get1(fp,spool,spoolbuf TSRMLS_CC);
 
        if (c == EOF) return M_EOI;
 
     while (c != 0xff) {
-        if ((c = php_iptc_get1(fp,spool,spoolbuf)) == EOF)
+        if ((c = php_iptc_get1(fp,spool,spoolbuf TSRMLS_CC)) == EOF)
             return M_EOI; /* we hit EOF */
     }
 
     /* get marker byte, swallowing possible padding */
     do {
-        c = php_iptc_get1(fp,0,0);
+        c = php_iptc_get1(fp,0,0 TSRMLS_CC);
                if (c == EOF)
             return M_EOI;       /* we hit EOF */
                else
                if (c == 0xff)
-                       php_iptc_put1(fp,spool,(unsigned char)c,spoolbuf);
+                       php_iptc_put1(fp,spool,(unsigned char)c,spoolbuf TSRMLS_CC);
     } while (c == 0xff);
 
     return (unsigned int) c;
@@ -232,36 +232,36 @@ PHP_FUNCTION(iptcembed)
                }
        } 
 
-       if (php_iptc_get1(fp,spool,poi?&poi:0) != 0xFF) {
+       if (php_iptc_get1(fp,spool,poi?&poi:0 TSRMLS_CC) != 0xFF) {
                fclose(fp);
                RETURN_FALSE;
        }
 
-       if (php_iptc_get1(fp,spool,poi?&poi:0) != 0xD8) {
+       if (php_iptc_get1(fp,spool,poi?&poi:0 TSRMLS_CC) != 0xD8) {
                fclose(fp);
                RETURN_FALSE;
        }
 
        while (!done) {
-               marker = php_iptc_next_marker(fp,spool,poi?&poi:0);
+               marker = php_iptc_next_marker(fp,spool,poi?&poi:0 TSRMLS_CC);
 
                if (marker == M_EOI) { /* EOF */
                        break;
                } else if (marker != M_APP13) { 
-                       php_iptc_put1(fp,spool,(unsigned char)marker,poi?&poi:0);
+                       php_iptc_put1(fp,spool,(unsigned char)marker,poi?&poi:0 TSRMLS_CC);
                }
 
                switch (marker) {
                        case M_APP13:
                                /* we are going to write a new APP13 marker, so don't output the old one */
-                               php_iptc_skip_variable(fp,0,0);    
-                               php_iptc_read_remaining(fp,spool,poi?&poi:0);
+                               php_iptc_skip_variable(fp,0,0 TSRMLS_CC);    
+                               php_iptc_read_remaining(fp,spool,poi?&poi:0 TSRMLS_CC);
                                done = 1;
                                break;
 
                        case M_APP0:
                                /* APP0 is in each and every JPEG, so when we hit APP0 we insert our new APP13! */
-                               php_iptc_skip_variable(fp,spool,poi?&poi:0);
+                               php_iptc_skip_variable(fp,spool,poi?&poi:0 TSRMLS_CC);
 
                                if (len & 1) len++; /* make the length even */
 
@@ -269,23 +269,23 @@ PHP_FUNCTION(iptcembed)
                                psheader[ 3 ] = (len+28)&0xff;
 
                                for (inx = 0; inx < 28; inx++)
-                                       php_iptc_put1(fp,spool,psheader[inx],poi?&poi:0);
+                                       php_iptc_put1(fp,spool,psheader[inx],poi?&poi:0 TSRMLS_CC);
 
-                               php_iptc_put1(fp,spool,(unsigned char)(len>>8),poi?&poi:0);
-                               php_iptc_put1(fp,spool,(unsigned char)(len&0xff),poi?&poi:0);
+                               php_iptc_put1(fp,spool,(unsigned char)(len>>8),poi?&poi:0 TSRMLS_CC);
+                               php_iptc_put1(fp,spool,(unsigned char)(len&0xff),poi?&poi:0 TSRMLS_CC);
                                        
                                for (inx = 0; inx < len; inx++)
-                                       php_iptc_put1(fp,spool,(*iptcdata)->value.str.val[inx],poi?&poi:0);
+                                       php_iptc_put1(fp,spool,(*iptcdata)->value.str.val[inx],poi?&poi:0 TSRMLS_CC);
                                break;
 
                        case M_SOS:                                                             
                                /* we hit data, no more marker-inserting can be done! */
-                               php_iptc_read_remaining(fp,spool,poi?&poi:0);
+                               php_iptc_read_remaining(fp,spool,poi?&poi:0 TSRMLS_CC);
                                done = 1;
                                break;
                        
                        default:
-                               php_iptc_skip_variable(fp,spool,poi?&poi:0);
+                               php_iptc_skip_variable(fp,spool,poi?&poi:0 TSRMLS_CC);
                                break;
                }
        }
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h
index aceeb34e7a394070145ade8505b829daf29880f8..95de575f43475aafafec5ae27aececaf9888b8ac 100644 (file)
--- a/ext/standard/php_var.h
+++ b/ext/standard/php_var.h
@@ -27,7 +27,7 @@ PHP_FUNCTION(var_dump);
 PHP_FUNCTION(serialize);
 PHP_FUNCTION(unserialize);
 
-void php_var_dump(zval **struc, int level);
+void php_var_dump(zval **struc, int level TSRMLS_DC);
 
 /* typdef HashTable php_serialize_data_t; */
 #define php_serialize_data_t HashTable
diff --git a/ext/standard/var.c b/ext/standard/var.c
index ae8add2b809e606392c1238c62220ed3ea226df6..8627aabca58ab188857828886a1934349a380375 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -42,6 +42,7 @@
 static int php_array_element_dump(zval **zv, int num_args, va_list args, zend_hash_key *hash_key)
 {
        int level;
+       TSRMLS_FETCH();
 
        level = va_arg(args, int);
 
@@ -50,11 +51,11 @@ static int php_array_element_dump(zval **zv, int num_args, va_list args, zend_ha
        } else { /* string key */
                php_printf("%*c[\"%s\"]=>\n", level + 1, ' ', hash_key->arKey);
        }
-       php_var_dump(zv, level + 2);
+       php_var_dump(zv, level + 2 TSRMLS_CC);
        return 0;
 }
 
-void php_var_dump(zval **struc, int level)
+void php_var_dump(zval **struc, int level TSRMLS_DC)
 {
        HashTable *myht;
 
@@ -131,7 +132,7 @@ PHP_FUNCTION(var_dump)
        }
        
        for (i=0; i<argc; i++)
-               php_var_dump(args[i], 1);
+               php_var_dump(args[i], 1 TSRMLS_CC);
        
        efree(args);
 }
@@ -366,7 +367,7 @@ PHPAPI void php_var_serialize(smart_str *buf, zval **struc, HashTable *var_hash)
 }
        
 /* }}} */
-/* {{{ php_var_dump */
+/* {{{ php_var_unserialize */
 
 PHPAPI int php_var_unserialize(zval **rval, const char **p, const char *max, HashTable *var_hash)
 {
diff --git a/main/main.c b/main/main.c
index c55ada3a33b3cbe89d46951bcf222a4fccf704f3..fc11bad4b29d993cd8488c3abd434098fbc13266 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -306,6 +306,7 @@ PHPAPI void php_log_err(char *log_message)
    wrapper for modules to use PHPWRITE */
 PHPAPI int php_write(void *buf, uint size)
 {
+       TSRMLS_FETCH();
        return PHPWRITE(buf, size);
 }
 /* }}} */
@@ -318,6 +319,7 @@ PHPAPI int php_printf(const char *format, ...)
        int ret;
        char buffer[PRINTF_BUFFER_SIZE];
        int size;
+       TSRMLS_FETCH();
 
        va_start(args, format);
        size = vsnprintf(buffer, sizeof(buffer), format, args);
@@ -719,7 +721,8 @@ void php_request_shutdown(void *dummy)
  */
 static int php_body_write_wrapper(const char *str, uint str_length)
 {
-       return php_body_write(str, str_length);
+       TSRMLS_FETCH();
+       return php_body_write(str, str_length TSRMLS_CC);
 }
 /* }}} */
 
diff --git a/main/output.c b/main/output.c
index 7d4e1fa2cbae00142d34c7272a46adb4d2b8975e..63d9b2d8f196552faf55f1e435ad8546e158b1c0 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -95,15 +95,13 @@ void php_output_register_constants(TSRMLS_D)
 }
 
 
-PHPAPI int php_body_write(const char *str, uint str_length)
+PHPAPI int php_body_write(const char *str, uint str_length TSRMLS_DC)
 {
-       TSRMLS_FETCH();
        return OG(php_body_write)(str, str_length TSRMLS_CC);   
 }
 
-PHPAPI int php_header_write(const char *str, uint str_length)
+PHPAPI int php_header_write(const char *str, uint str_length TSRMLS_DC)
 {
-       TSRMLS_FETCH();
        if (OG(disable_output)) {
                return 0;
        } else {
diff --git a/main/php.h b/main/php.h
index aa8395036ad241b85bc9ca88284aa42ec0c2c408..d7f6c13f307fa741d8780bd61981e710345ceac4 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -274,12 +274,12 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 
 /* Output support */
 #include "main/php_output.h"
-#define PHPWRITE(str, str_len)         php_body_write((str), (str_len))
-#define PUTS(str)                                      php_body_write((str), strlen((str)))
-#define PUTC(c)                                                (php_body_write(&(c), 1), (c))
-#define PHPWRITE_H(str, str_len)       php_header_write((str), (str_len))
-#define PUTS_H(str)                                    php_header_write((str), strlen((str)))
-#define PUTC_H(c)                                      (php_header_write(&(c), 1), (c))
+#define PHPWRITE(str, str_len)         php_body_write((str), (str_len) TSRMLS_CC)
+#define PUTS(str)                                      php_body_write((str), strlen((str)) TSRMLS_CC)
+#define PUTC(c)                                                (php_body_write(&(c), 1 TSRMLS_CC), (c))
+#define PHPWRITE_H(str, str_len)       php_header_write((str), (str_len) TSRMLS_CC)
+#define PUTS_H(str)                                    php_header_write((str), strlen((str)) TSRMLS_CC)
+#define PUTC_H(c)                                      (php_header_write(&(c), 1 TSRMLS_CC), (c))
 
 #ifdef ZTS
 #define VIRTUAL_DIR
diff --git a/main/php_ini.c b/main/php_ini.c
index 6e6ca748c17f98aa06dee3cc1a368826d71ab1a6..31929dffcfe9428323d59025cab23f35797f09e7 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -69,6 +69,7 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
                if(esc_html) {
                        zend_html_puts(display_string, display_string_length);
                } else {
+                       TSRMLS_FETCH();
                        PHPWRITE(display_string, display_string_length);
                }
        }
diff --git a/main/php_output.h b/main/php_output.h
index 1521a7319aff51f4a9af386cb7eb10f0c1099244..f489532b0b80bef9973725defb8d9e5293dcca9d 100644 (file)
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -29,8 +29,8 @@ PHPAPI void php_output_startup(void);
 PHPAPI void php_output_activate(TSRMLS_D);
 PHPAPI void php_output_set_status(zend_bool status TSRMLS_DC);
 void php_output_register_constants(TSRMLS_D);
-PHPAPI int  php_body_write(const char *str, uint str_length);
-PHPAPI int  php_header_write(const char *str, uint str_length);
+PHPAPI int  php_body_write(const char *str, uint str_length TSRMLS_DC);
+PHPAPI int  php_header_write(const char *str, uint str_length TSRMLS_DC);
 PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size TSRMLS_DC);
 PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS_DC);
 PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC);
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 0f14f904213592ba463fd353e5fdc433ae273d7a..53fde3343f4764761548b486cb571086e9e0a481 100644 (file)
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -182,6 +182,7 @@ PHP_MINFO_FUNCTION(apache)
        extern char *user_name;
        extern gid_t group_id;
        extern int max_requests_per_child;
+       TSRMLS_FETCH();
 
        serv = ((request_rec *) SG(server_context))->server;
 
@@ -241,7 +242,6 @@ PHP_MINFO_FUNCTION(apache)
                array_header *arr;
                table_entry *elts;
                request_rec *r;
-               TSRMLS_FETCH();
 
                r = ((request_rec *) SG(server_context));
                arr = table_elts(r->subprocess_env);
@@ -261,7 +261,6 @@ PHP_MINFO_FUNCTION(apache)
                table_entry *env;
                int i;
                request_rec *r;
-               TSRMLS_FETCH();
                
                r = ((request_rec *) SG(server_context));
                SECTION("HTTP Headers Information");
Unnamed repository; edit this file 'description' to name the repository.