[PHP-CVS] cvs: php4 /ext/zlib zlib.c

2001-03-30 Thread Anil Madhavapeddy 

avsmFri Mar 30 09:44:09 2001 EDT

  Modified files:  
/php4/ext/zlib  zlib.c 
  Log:
  Send the correct Vary headers, if we negotiate a gzip/deflate session
  via Accept-Encoding.  This obeys a SHOULD directive in RFC2616
  
  PR: 10070
  
  
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.76 php4/ext/zlib/zlib.c:1.77
--- php4/ext/zlib/zlib.c:1.76   Wed Mar  7 09:23:30 2001
+++ php4/ext/zlib/zlib.cFri Mar 30 09:44:08 2001
@@ -16,7 +16,7 @@
|  Stefan Röhrich <[EMAIL PROTECTED]>|
+--+
  */
-/* $Id: zlib.c,v 1.76 2001/03/07 17:23:30 dbeu Exp $ */
+/* $Id: zlib.c,v 1.77 2001/03/30 17:44:08 avsm Exp $ */
 #define IS_EXT_MODULE
 
 #include "php.h"
@@ -1156,9 +1156,15 @@
if (sapi_add_header("Content-Encoding: gzip", 
sizeof("Content-Encoding: gzip") - 1, 1)==FAILURE) {
return_original = 1;
}
+   if (sapi_add_header("Vary: Accept-Encoding", 
+sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
+   return_original = 1;
+   }
break;
case CODING_DEFLATE:
if (sapi_add_header("Content-Encoding: 
deflate", sizeof("Content-Encoding: deflate") - 1, 1)==FAILURE) {
+   return_original = 1;
+   }
+   if (sapi_add_header("Vary: Accept-Encoding", 
+sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
return_original = 1;
}
break;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/zlib zlib.c

2001-03-07 Thread Daniel Beulshausen 

dbeuWed Mar  7 09:23:31 2001 EDT

  Modified files:  
/php4/ext/zlib  zlib.c 
  Log:
  add missing globals fetches
  
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.75 php4/ext/zlib/zlib.c:1.76
--- php4/ext/zlib/zlib.c:1.75   Tue Mar  6 12:43:54 2001
+++ php4/ext/zlib/zlib.cWed Mar  7 09:23:30 2001
@@ -16,7 +16,7 @@
|  Stefan Röhrich <[EMAIL PROTECTED]>|
+--+
  */
-/* $Id: zlib.c,v 1.75 2001/03/06 20:43:54 zeev Exp $ */
+/* $Id: zlib.c,v 1.76 2001/03/07 17:23:30 dbeu Exp $ */
 #define IS_EXT_MODULE
 
 #include "php.h"
@@ -1118,6 +1118,7 @@
zval **data, **a_encoding;
zend_bool return_original=0;
zend_bool do_start, do_end;
+   ZLIBLS_FETCH();
 
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &zv_string, 
&zv_mode)==FAILURE) {
ZEND_WRONG_PARAM_COUNT();
@@ -1206,6 +1207,8 @@
 int php_enable_output_compression(int buffer_size)
 {
zval **a_encoding, **data;
+   ELS_FETCH();
+   ZLIBLS_FETCH();
 
if (zend_hash_find(&EG(symbol_table), "HTTP_SERVER_VARS", 
sizeof("HTTP_SERVER_VARS"), (void **) &data)==FAILURE
|| Z_TYPE_PP(data)!=IS_ARRAY



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/zlib zlib.c

2001-02-01 Thread Thies C. Arntzen 

thies   Thu Feb  1 09:16:35 2001 EDT

  Modified files:  
/php4/ext/zlib  zlib.c 
  Log:
  ws-only
  
  
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.70 php4/ext/zlib/zlib.c:1.71
--- php4/ext/zlib/zlib.c:1.70   Thu Feb  1 09:14:18 2001
+++ php4/ext/zlib/zlib.cThu Feb  1 09:16:35 2001
@@ -16,7 +16,7 @@
|  Stefan Röhrich <[EMAIL PROTECTED]>|
+--+
  */
-/* $Id: zlib.c,v 1.70 2001/02/01 17:14:18 thies Exp $ */
+/* $Id: zlib.c,v 1.71 2001/02/01 17:16:35 thies Exp $ */
 #define IS_EXT_MODULE
 
 #include "php.h"
@@ -1119,7 +1119,7 @@
if (return_original) {
zval_dtor(return_value);
} else {
-   char lenbuf[ 64 ];
+   char lenbuf[64];

sprintf(lenbuf,"Content-Length: %d",Z_STRLEN_P(return_value));
sapi_add_header(lenbuf,strlen(lenbuf), 1);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/zlib zlib.c

2001-02-01 Thread Thies C. Arntzen 

thies   Thu Feb  1 09:14:19 2001 EDT

  Modified files:  
/php4/ext/zlib  zlib.c 
  Log:
  @- When using the ob_gzhandler() PHP now automagically also sets the 
  @  Content-Lengh correctly which enables browsers to use the HTTP 
  @  Keep-Alive feature. (Thies)
  
  
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.69 php4/ext/zlib/zlib.c:1.70
--- php4/ext/zlib/zlib.c:1.69   Thu Feb  1 08:29:07 2001
+++ php4/ext/zlib/zlib.cThu Feb  1 09:14:18 2001
@@ -16,7 +16,7 @@
|  Stefan Röhrich <[EMAIL PROTECTED]>|
+--+
  */
-/* $Id: zlib.c,v 1.69 2001/02/01 16:29:07 sas Exp $ */
+/* $Id: zlib.c,v 1.70 2001/02/01 17:14:18 thies Exp $ */
 #define IS_EXT_MODULE
 
 #include "php.h"
@@ -1115,8 +1115,14 @@
return_original = 1;
break;
}
+
if (return_original) {
zval_dtor(return_value);
+   } else {
+   char lenbuf[ 64 ];
+   
+   sprintf(lenbuf,"Content-Length: %d",Z_STRLEN_P(return_value));
+   sapi_add_header(lenbuf,strlen(lenbuf), 1);
}
} else {
return_original = 1;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/zlib zlib.c

2001-02-01 Thread Sascha Schumann 

sas Thu Feb  1 08:29:07 2001 EDT

  Modified files:  
/php4/ext/zlib  zlib.c 
  Log:
  Fix a huge memory leak in the ob_gzhandler.
  
  
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.68 php4/ext/zlib/zlib.c:1.69
--- php4/ext/zlib/zlib.c:1.68   Mon Nov 20 16:40:12 2000
+++ php4/ext/zlib/zlib.cThu Feb  1 08:29:07 2001
@@ -16,7 +16,7 @@
|  Stefan Röhrich <[EMAIL PROTECTED]>|
+--+
  */
-/* $Id: zlib.c,v 1.68 2000/11/21 00:40:12 hholzgra Exp $ */
+/* $Id: zlib.c,v 1.69 2001/02/01 16:29:07 sas Exp $ */
 #define IS_EXT_MODULE
 
 #include "php.h"
@@ -1032,6 +1032,7 @@
 
*new_length = buf_used + 10 + 8;
*newstr = buffer;
+   deflateEnd(&ZLIBG(stream));
 
return SUCCESS;
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]