[PHP-CVS] cvs: php-src /main SAPI.c
sr Wed Sep 10 04:47:38 2003 EDT
Modified files:
/php-src/main SAPI.c
Log:
Fix for bug #23488 zlib.output_compression overrides vary header.
It was already fixed for ob_gzhandler (#24827).
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.177 php-src/main/SAPI.c:1.178
--- php-src/main/SAPI.c:1.177 Thu Aug 28 13:07:40 2003
+++ php-src/main/SAPI.c Wed Sep 10 04:47:37 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.177 2003/08/28 17:07:40 sas Exp $ */
+/* $Id: SAPI.c,v 1.178 2003/09/10 08:47:37 sr Exp $ */
#include ctype.h
#include sys/stat.h
@@ -731,7 +731,7 @@
if (len = 0 || sapi_add_header(buf, len, 1) == FAILURE) {
return FAILURE;
}
- if (sapi_add_header(Vary: Accept-Encoding, sizeof(Vary:
Accept-Encoding) - 1, 1) == FAILURE) {
+ if (sapi_add_header_ex(Vary: Accept-Encoding, sizeof(Vary:
Accept-Encoding) - 1, 1, 0 TSRMLS_CC) == FAILURE) {
return FAILURE;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /main SAPI.c
sr Wed Sep 10 04:49:47 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main SAPI.c
Log:
MFH: Fix for bug #23488 zlib.output_compression overrides vary header.
It was already fixed for ob_gzhandler (#24827).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.386 php-src/NEWS:1.1247.2.387
--- php-src/NEWS:1.1247.2.386 Tue Sep 9 21:28:34 2003
+++ php-src/NEWSWed Sep 10 04:49:45 2003
@@ -7,6 +7,7 @@
- Fixed crash bug when non-existing save/serializer handler was used. (Jani)
- Fixed memory leak in gethostbynamel() if an error occurs. (Sara)
- Fixed FastCGI being unable to bind to a specific IP. (Sascha)
+- Fixed bug #23488 (zlib.output_compression overrides Vary header). (Stefan)
- Fixed bug #25429 (fix copying of stdin using copy() function). (Ilia)
- Fixed bug #25424 (ext/informix: lvarchar not supported in win32). (Jani)
- Fixed bug #25404 (ext/pgsql: open transactions not closed when script ends).
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.155.2.13 php-src/main/SAPI.c:1.155.2.14
--- php-src/main/SAPI.c:1.155.2.13 Thu Aug 28 12:04:18 2003
+++ php-src/main/SAPI.c Wed Sep 10 04:49:46 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.155.2.13 2003/08/28 16:04:18 sas Exp $ */
+/* $Id: SAPI.c,v 1.155.2.14 2003/09/10 08:49:46 sr Exp $ */
#include ctype.h
#include sys/stat.h
@@ -721,7 +721,7 @@
if (len = 0 || sapi_add_header(buf, len, 1) == FAILURE) {
return FAILURE;
}
- if (sapi_add_header(Vary: Accept-Encoding, sizeof(Vary:
Accept-Encoding) - 1, 1) == FAILURE) {
+ if (sapi_add_header_ex(Vary: Accept-Encoding, sizeof(Vary:
Accept-Encoding) - 1, 1, 0 TSRMLS_CC) == FAILURE) {
return FAILURE;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fdf fdf.c
hholzgraWed Sep 10 20:47:34 2003 EDT
Modified files:
/php-src/ext/fdffdf.c
Log:
check for FDFErcNoValue was in the wrong execution path,
should always be treated as 'no error' (should finally fix #22803)
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.83 php-src/ext/fdf/fdf.c:1.84
--- php-src/ext/fdf/fdf.c:1.83 Mon Jul 14 19:23:01 2003
+++ php-src/ext/fdf/fdf.c Wed Sep 10 20:47:32 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.83 2003/07/14 23:23:01 edink Exp $ */
+/* $Id: fdf.c,v 1.84 2003/09/11 00:47:32 hholzgra Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -386,13 +386,12 @@
}
which++;
} while (err == FDFErcOK);
- if(err == FDFErcNoValue) err = FDFErcOK;
efree(buffer);
buffer = NULL;
#endif
}
- if(err != FDFErcOK) {
+ if((err != FDFErcOK) (err != FDFErcNoValue)) {
if(buffer) efree(buffer);
FDF_FAILURE(err);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/fdf fdf.c
hholzgraWed Sep 10 21:45:06 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/fdffdf.c
Log:
MFH
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.66.2.10 php-src/ext/fdf/fdf.c:1.66.2.11
--- php-src/ext/fdf/fdf.c:1.66.2.10 Mon Jul 14 19:20:01 2003
+++ php-src/ext/fdf/fdf.c Wed Sep 10 21:45:02 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.66.2.10 2003/07/14 23:20:01 edink Exp $ */
+/* $Id: fdf.c,v 1.66.2.11 2003/09/11 01:45:02 hholzgra Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -382,13 +382,12 @@
}
which++;
} while (err == FDFErcOK);
- if(err == FDFErcNoValue) err = FDFErcOK;
efree(buffer);
buffer = NULL;
#endif
}
- if(err != FDFErcOK) {
+ if ((err != FDFErcOK) (err != FDFErcNoValue)) {
if(buffer) efree(buffer);
FDF_FAILURE(err);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard mail.c
iliaa Thu Sep 11 00:46:12 2003 EDT
Modified files:
/php-src/ext/standard mail.c
Log:
Cleanup r1.76 patch
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.76 php-src/ext/standard/mail.c:1.77
--- php-src/ext/standard/mail.c:1.76Mon Sep 8 16:15:35 2003
+++ php-src/ext/standard/mail.c Thu Sep 11 00:46:10 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.76 2003/09/08 20:15:35 iliaa Exp $ */
+/* $Id: mail.c,v 1.77 2003/09/11 04:46:10 iliaa Exp $ */
#include stdlib.h
#include ctype.h
@@ -201,21 +201,25 @@
/* make sure that sendmail_path contains a valid executable, failure to do
* would make PHP abruptly exit without a useful error message. */
{
- char *s=NULL, p;
+ char *s=NULL, *p;
if ((s = strchr(sendmail_path, ' '))) {
- p = *s;
- *s = '\0';
+ p = estrndup(sendmail_path, s - sendmail_path);
+ } else {
+ p = sendmail_path;
}
- if (access(sendmail_path, X_OK)) {
+ if (VCWD_ACCESS(p, X_OK)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Permission
denied: unable to execute shell to run mail delivery binary '%s', sendmail_path);
+ if (extra_cmd != NULL) {
+ efree(sendmail_cmd);
+ }
if (s) {
- *s = p;
+ efree(p);
}
return 0;
}
if (s) {
- *s = p;
+ efree(p);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard mail.c
iliaa Thu Sep 11 00:46:32 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard mail.c
Log:
MFH: Cleanup r1.76 patch
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.66.2.8 php-src/ext/standard/mail.c:1.66.2.9
--- php-src/ext/standard/mail.c:1.66.2.8Mon Sep 8 16:15:43 2003
+++ php-src/ext/standard/mail.c Thu Sep 11 00:46:31 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.66.2.8 2003/09/08 20:15:43 iliaa Exp $ */
+/* $Id: mail.c,v 1.66.2.9 2003/09/11 04:46:31 iliaa Exp $ */
#include stdlib.h
#include ctype.h
@@ -198,21 +198,25 @@
/* make sure that sendmail_path contains a valid executable, failure to do
* would make PHP abruptly exit without a useful error message. */
{
- char *s=NULL, p;
+ char *s=NULL, *p;
if ((s = strchr(sendmail_path, ' '))) {
- p = *s;
- *s = '\0';
+ p = estrndup(sendmail_path, s - sendmail_path);
+ } else {
+ p = sendmail_path;
}
- if (access(sendmail_path, X_OK)) {
+ if (access(p, X_OK)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Permission
denied: unable to execute shell to run mail delivery binary '%s', sendmail_path);
+ if (extra_cmd != NULL) {
+ efree(sendmail_cmd);
+ }
if (s) {
- *s = p;
+ efree(p);
}
return 0;
}
if (s) {
- *s = p;
+ efree(p);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams streams.c
iliaa Thu Sep 11 01:07:39 2003 EDT
Modified files:
/php-src/main/streams streams.c
Log:
Fixed bug #25316 (Possible infinite loop inside _php_stream_write()).
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.34 php-src/main/streams/streams.c:1.35
--- php-src/main/streams/streams.c:1.34 Tue Sep 9 20:58:12 2003
+++ php-src/main/streams/streams.c Thu Sep 11 01:07:26 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.34 2003/09/10 00:58:12 iliaa Exp $ */
+/* $Id: streams.c,v 1.35 2003/09/11 05:07:26 iliaa Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -867,7 +867,8 @@
justwrote = stream-ops-write(stream, buf, towrite TSRMLS_CC);
- if (justwrote 0) {
+ /* convert justwrote to an integer, since normally it is unsigned */
+ if ((int)justwrote 0) {
buf += justwrote;
count -= justwrote;
didwrite += justwrote;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /main streams.c
iliaa Thu Sep 11 01:07:51 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main streams.c
Log:
MFH: Fixed bug #25316 (Possible infinite loop inside _php_stream_write()).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.388 php-src/NEWS:1.1247.2.389
--- php-src/NEWS:1.1247.2.388 Wed Sep 10 22:00:52 2003
+++ php-src/NEWSThu Sep 11 01:07:43 2003
@@ -18,6 +18,7 @@
- Fixed bug #25348 (make install fails with --enable-short-tags). (Jani)
- Fixed bug #25343 (is_dir() gives warning on FreeBSD). (Jani)
- Fixed bug #25333 (Possible body corruption crash in win32 mail()). (Ilia)
+- Fixed bug #25316 (Possible infinite loop inside _php_stream_write()). (Ilia)
- Fixed bug #25314 (FTP_ASCII mode behaving like binary from Win-Unix). (Sara)
- Fixed bug #25308 (php -m crashes when zend extensions are loaded). (Stas)
- Fixed bug #25307 (Crash with WDDX serializer). (Sascha, Jani)
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.80 php-src/main/streams.c:1.125.2.81
--- php-src/main/streams.c:1.125.2.80 Tue Sep 9 20:59:46 2003
+++ php-src/main/streams.c Thu Sep 11 01:07:47 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.125.2.80 2003/09/10 00:59:46 iliaa Exp $ */
+/* $Id: streams.c,v 1.125.2.81 2003/09/11 05:07:47 iliaa Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -908,7 +908,8 @@
} else {
justwrote = stream-ops-write(stream, buf, towrite TSRMLS_CC);
}
- if (justwrote 0) {
+ /* convert justwrote to an integer, since normally it is unsigned */
+ if ((int)justwrote 0) {
buf += justwrote;
count -= justwrote;
didwrite += justwrote;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
