[PHP-CVS] cvs: php4 /main rfc1867.c
sesser Sat Dec 14 05:45:26 2002 EDT
Modified files:
/php4/main rfc1867.c
Log:
cleanup
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.127 php4/main/rfc1867.c:1.128
--- php4/main/rfc1867.c:1.127 Tue Dec 10 10:58:31 2002
+++ php4/main/rfc1867.c Sat Dec 14 05:45:25 2002
@@ -16,7 +16,7 @@
| Jani Taskinen [EMAIL PROTECTED] |
+--+
*/
-/* $Id: rfc1867.c,v 1.127 2002/12/10 15:58:31 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.128 2002/12/14 10:45:25 sesser Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -813,13 +813,7 @@
/* If file_uploads=off, skip the file part */
if (!PG(file_uploads)) {
- if (filename) {
- efree(filename);
- }
- if (param) {
- efree(param);
- }
- continue;
+ skip_upload = 1;
}
/* Return with an error if the posted data is garbled */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /sapi/cli php_cli.c
This doesn't look right to me. We always use CONST_PERSISTENT in all of PHP. What is the problem? Andi At 10:24 AM 12/11/2002 +, Edin Kadribasic wrote: edink Wed Dec 11 05:24:03 2002 EDT Modified files: /php4/sapi/cli php_cli.c Log: Fix for #20539 (patch by Moriyoshi Koizumi). Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.55 php4/sapi/cli/php_cli.c:1.56 --- php4/sapi/cli/php_cli.c:1.55Mon Dec 9 06:45:46 2002 +++ php4/sapi/cli/php_cli.c Wed Dec 11 05:24:02 2002 @@ -375,19 +375,19 @@ php_stream_to_zval(s_err, zerr); ic.value = *zin; - ic.flags = CONST_CS | CONST_PERSISTENT; + ic.flags = CONST_CS; ic.name = zend_strndup(STDIN, 6); ic.name_len = 6; zend_register_constant(ic TSRMLS_CC); oc.value = *zout; - oc.flags = CONST_CS | CONST_PERSISTENT; + oc.flags = CONST_CS; oc.name = zend_strndup(STDOUT, 7); oc.name_len = 7; zend_register_constant(oc TSRMLS_CC); ec.value = *zerr; - ec.flags = CONST_CS | CONST_PERSISTENT; + ec.flags = CONST_CS; ec.name = zend_strndup(STDERR, 7); ec.name_len = 7; zend_register_constant(ec TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/exif exif.c
helly Sat Dec 14 12:50:57 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/exif exif.c
Log:
MFH: bugfix: #21010
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.118.2.6 php4/ext/exif/exif.c:1.118.2.7
--- php4/ext/exif/exif.c:1.118.2.6 Tue Dec 10 13:01:33 2002
+++ php4/ext/exif/exif.cSat Dec 14 12:50:57 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.118.2.6 2002/12/10 18:01:33 iliaa Exp $ */
+/* $Id: exif.c,v 1.118.2.7 2002/12/14 17:50:57 helly Exp $ */
/* ToDos
*
@@ -89,7 +89,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.6 2002/12/10 18:01:33 iliaa Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.7 2002/12/14 17:50:57 helly Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -427,7 +427,7 @@
/* 0x920B - 0x920D */
/* 0x9211 - 0x9216 */
#define TAG_SUBJECT_AREA0x9214
-#define TAG_MARKER_NOTE 0x927C
+#define TAG_MAKER_NOTE 0x927C
#define TAG_USERCOMMENT 0x9286
#define TAG_SUB_SEC_TIME0x9290
#define TAG_SUB_SEC_TIME_ORIGINAL 0x9291
@@ -904,7 +904,7 @@
typedef enum mn_offset_mode_t {
MN_OFFSET_NORMAL,
- MN_OFFSET_MARKER,
+ MN_OFFSET_MAKER,
MN_OFFSET_GUESS
} mn_offset_mode_t;
@@ -917,13 +917,13 @@
int offset;
mn_byte_order_t byte_order;
mn_offset_mode_t offset_mode;
-} marker_note_type;
+} maker_note_type;
-static const marker_note_type marker_note_array[] = {
+static const maker_note_type maker_note_array[] = {
{ tag_table_VND_CANON, Canon, NULL, NULL,
0, 0, MN_ORDER_INTEL,MN_OFFSET_GUESS},
/* { tag_table_VND_CANON, Canon, NULL, NULL,
0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},*/
{ tag_table_VND_CASIO, CASIO, NULL, NULL,
0, 0, MN_ORDER_MOTOROLA, MN_OFFSET_NORMAL},
- { tag_table_VND_FUJI, FUJIFILM,NULL,
FUJIFILM\x0C\x00\x00\x00, 12, 12, MN_ORDER_INTEL,MN_OFFSET_MARKER},
+ { tag_table_VND_FUJI, FUJIFILM,NULL,
+FUJIFILM\x0C\x00\x00\x00, 12, 12, MN_ORDER_INTEL,MN_OFFSET_MAKER},
{ tag_table_VND_NIKON, NIKON, NULL, Nikon\x00\x01\x00,
8, 8, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
{ tag_table_VND_NIKON_990, NIKON, NULL, NULL,
0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
{ tag_table_VND_OLYMPUS, OLYMPUS OPTICAL CO.,LTD, NULL, OLYMP\x00\x01\x00,
8, 8, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
@@ -1253,7 +1253,7 @@
#define SECTION_INTEROP 10
#define SECTION_APP12 11
#define SECTION_WINXP 12
-#define SECTION_MARKERNOTE 13
+#define SECTION_MAKERNOTE 13
#define SECTION_COUNT 14
#define FOUND_FILE (1SECTION_FILE)
@@ -1269,7 +1269,7 @@
#define FOUND_INTEROP (1SECTION_INTEROP)
#define FOUND_APP12 (1SECTION_APP12)
#define FOUND_WINXP (1SECTION_WINXP)
-#define FOUND_MARKERNOTE(1SECTION_MARKERNOTE)
+#define FOUND_MAKERNOTE (1SECTION_MAKERNOTE)
static char *exif_get_sectionname(int section)
{
@@ -1287,7 +1287,7 @@
case SECTION_INTEROP: return INTEROP;
case SECTION_APP12: return APP12;
case SECTION_WINXP: return WINXP;
- case SECTION_MARKERNOTE:return MARKERNOTE;
+ case SECTION_MAKERNOTE: return MAKERNOTE;
}
return ;
}
@@ -2640,40 +2640,40 @@
}
/* }}} */
-/* {{{ exif_process_IFD_in_MARKERNOTE
- * Process nested IFDs directories in Marker Note. */
-static int exif_process_IFD_in_MARKERNOTE(image_info_type *ImageInfo, char *
value_ptr, int value_len, char *offset_base, size_t IFDlength, size_t displacement
TSRMLS_DC)
+/* {{{ exif_process_IFD_in_MAKERNOTE
+ * Process nested IFDs directories in Maker Note. */
+static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char *
+value_ptr, int value_len, char *offset_base, size_t IFDlength, size_t displacement
+TSRMLS_DC)
{
- int de, i=0, section_index = SECTION_MARKERNOTE;
+ int de, i=0, section_index = SECTION_MAKERNOTE;
int NumDirEntries, old_motorola_intel, offset_diff;
- const marker_note_type *marker_note;
+ const maker_note_type *maker_note;
char *dir_start;
- for (i=0; i=sizeof(marker_note_array)/sizeof(marker_note_type); i++) {
- if (i==sizeof(marker_note_array)/sizeof(marker_note_type))
+ for (i=0; i=sizeof(maker_note_array)/sizeof(maker_note_type); i++) {
+ if (i==sizeof(maker_note_array)/sizeof(maker_note_type))
return FALSE;
- marker_note = marker_note_array+i;
+ maker_note = maker_note_array+i;
[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c
pajoye Sat Dec 14 14:23:29 2002 EDT
Modified files:
/php4/ext/gd/libgd gd.c
Log:
Do not allow AA if not trueColor (imageantialias does nothing)
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.36 php4/ext/gd/libgd/gd.c:1.37
--- php4/ext/gd/libgd/gd.c:1.36 Wed Dec 11 17:23:51 2002
+++ php4/ext/gd/libgd/gd.c Sat Dec 14 14:23:29 2002
@@ -3189,7 +3189,9 @@
void
gdImageAntialias (gdImagePtr im, int antialias)
{
- im-antialias = antialias;
+ if (im-trueColor){
+ im-antialias = antialias;
+ }
}
void
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/exif exif.c
helly Sat Dec 14 14:53:52 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/exif exif.c
Log:
MFH
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.118.2.7 php4/ext/exif/exif.c:1.118.2.8
--- php4/ext/exif/exif.c:1.118.2.7 Sat Dec 14 12:50:57 2002
+++ php4/ext/exif/exif.cSat Dec 14 14:53:52 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.118.2.7 2002/12/14 17:50:57 helly Exp $ */
+/* $Id: exif.c,v 1.118.2.8 2002/12/14 19:53:52 helly Exp $ */
/* ToDos
*
@@ -58,7 +58,11 @@
#include ext/standard/php_image.h
#include ext/standard/info.h
-#ifdef HAVE_MBSTRING
+#if defined(HAVE_MBSTRING) !defined(COMPILE_DL_MBSTRING)
+#define EXIF_USE_MBSTRING 1
+#endif
+
+#ifdef EXIF_USE_MBSTRING
#include ext/mbstring/mbstring.h
#endif
@@ -89,7 +93,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.7 2002/12/14 17:50:57 helly Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.8 2002/12/14 19:53:52 helly Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -126,7 +130,7 @@
ZEND_API ZEND_INI_MH(OnUpdateEncode)
{
-#ifdef HAVE_MBSTRING
+#ifdef EXIF_USE_MBSTRING
if (new_value strlen(new_value) !php_mb_check_encoding_list(new_value
TSRMLS_CC)) {
php_error_docref( NULL TSRMLS_CC, E_WARNING, Illegal encoding
ignored: '%s', new_value);
return FAILURE;
@@ -137,7 +141,7 @@
ZEND_API ZEND_INI_MH(OnUpdateDecode)
{
-#ifdef HAVE_MBSTRING
+#ifdef EXIF_USE_MBSTRING
if (!php_mb_check_encoding_list(new_value TSRMLS_CC)) {
php_error_docref( NULL TSRMLS_CC, E_WARNING, Illegal encoding
ignored: '%s', new_value);
return FAILURE;
@@ -2507,7 +2511,7 @@
/* {{{ exif_process_string_raw
* Copy a string in Exif header to a character string returns length of allocated
buffer if any. */
-#ifndef HAVE_MBSTRING
+#ifndef EXIF_USE_MBSTRING
static int exif_process_string_raw(char **result, char *value, size_t byte_count) {
/* we cannot use strlcpy - here the problem is that we have to copy NUL
* chars up to byte_count, we also have to add a single NUL character to
@@ -2553,7 +2557,7 @@
{
int a;
-#ifdef HAVE_MBSTRING
+#ifdef EXIF_USE_MBSTRING
size_t len;;
#endif
@@ -2564,7 +2568,7 @@
*pszEncoding = estrdup((const char*)szValuePtr);
szValuePtr = szValuePtr+8;
ByteCount -= 8;
-#ifdef HAVE_MBSTRING
+#ifdef EXIF_USE_MBSTRING
if (ImageInfo-motorola_intel) {
*pszInfoPtr = php_mb_convert_encoding(szValuePtr,
ByteCount, ImageInfo-encode_unicode, ImageInfo-decode_unicode_be, len TSRMLS_CC);
} else {
@@ -2585,7 +2589,7 @@
*pszEncoding = estrdup((const char*)szValuePtr);
szValuePtr = szValuePtr+8;
ByteCount -= 8;
-#ifdef HAVE_MBSTRING
+#ifdef EXIF_USE_MBSTRING
if (ImageInfo-motorola_intel) {
*pszInfoPtr = php_mb_convert_encoding(szValuePtr,
ByteCount, ImageInfo-encode_jis, ImageInfo-decode_jis_be, len TSRMLS_CC);
} else {
@@ -2624,7 +2628,7 @@
xp_field-tag = tag;
/* Copy the comment */
-#ifdef HAVE_MBSTRING
+#ifdef EXIF_USE_MBSTRING
/* What if MS supports big-endian with XP? */
/* if (ImageInfo-motorola_intel) {
xp_field-value = php_mb_convert_encoding(szValuePtr, ByteCount,
ImageInfo-encode_unicode, ImageInfo-decode_unicode_be, xp_field-size TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sat Dec 14 16:44:33 2002 EDT Modified files: /CVSROOTavail Log: give sesser phpweb karma Index: CVSROOT/avail diff -u CVSROOT/avail:1.560 CVSROOT/avail:1.561 --- CVSROOT/avail:1.560 Sat Dec 14 01:18:10 2002 +++ CVSROOT/avail Sat Dec 14 16:44:32 2002 @@ -32,7 +32,7 @@ # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net, # and master.php.net. -avail|cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,sniper,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web +avail|cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,sniper,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /sapi/cli php_cli.c
It appears that the problem was because stream resources are finalized before the constants that contain those resources are destructed, as php_stream_open_wrapper_ex() doesn't return persistent resources. Moriyoshi Andi Gutmans [EMAIL PROTECTED] wrote: This doesn't look right to me. We always use CONST_PERSISTENT in all of PHP. What is the problem? Andi At 10:24 AM 12/11/2002 +, Edin Kadribasic wrote: edink Wed Dec 11 05:24:03 2002 EDT Modified files: /php4/sapi/cli php_cli.c Log: Fix for #20539 (patch by Moriyoshi Koizumi). Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.55 php4/sapi/cli/php_cli.c:1.56 --- php4/sapi/cli/php_cli.c:1.55Mon Dec 9 06:45:46 2002 +++ php4/sapi/cli/php_cli.c Wed Dec 11 05:24:02 2002 @@ -375,19 +375,19 @@ php_stream_to_zval(s_err, zerr); ic.value = *zin; - ic.flags = CONST_CS | CONST_PERSISTENT; + ic.flags = CONST_CS; ic.name = zend_strndup(STDIN, 6); ic.name_len = 6; zend_register_constant(ic TSRMLS_CC); oc.value = *zout; - oc.flags = CONST_CS | CONST_PERSISTENT; + oc.flags = CONST_CS; oc.name = zend_strndup(STDOUT, 7); oc.name_len = 7; zend_register_constant(oc TSRMLS_CC); ec.value = *zerr; - ec.flags = CONST_CS | CONST_PERSISTENT; + ec.flags = CONST_CS; ec.name = zend_strndup(STDERR, 7); ec.name_len = 7; zend_register_constant(ec TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c
iliaa Sun Dec 15 01:44:31 2002 EDT
Modified files:
/php4/ext/pgsql pgsql.c
Log:
Fixed a memory leak.
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.250 php4/ext/pgsql/pgsql.c:1.251
--- php4/ext/pgsql/pgsql.c:1.250Fri Nov 29 12:18:01 2002
+++ php4/ext/pgsql/pgsql.c Sun Dec 15 01:44:30 2002
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.250 2002/11/29 17:18:01 yohgaki Exp $ */
+/* $Id: pgsql.c,v 1.251 2002/12/15 06:44:30 iliaa Exp $ */
#include stdlib.h
@@ -447,7 +447,7 @@
PHP_RSHUTDOWN_FUNCTION(pgsql)
{
/* clean up notice messages */
- zend_hash_clean(PGG(notices));
+ zend_hash_destroy(PGG(notices));
/* clean up persistent connection */
zend_hash_apply(EG(persistent_list), (apply_func_t) _rollback_transactions
TSRMLS_CC);
return SUCCESS;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
