[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/bz2 bz2.c
iliaa Sun Jun 5 14:06:18 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/bz2bz2.c
/php-srcNEWS
Log:
MFH: Fixed bug #33070 (Improved performance of bzdecompress() by several
orders of magnitude).
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.1.2.4r2=1.1.2.5ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.1.2.4 php-src/ext/bz2/bz2.c:1.1.2.5
--- php-src/ext/bz2/bz2.c:1.1.2.4 Sat Mar 19 08:56:56 2005
+++ php-src/ext/bz2/bz2.c Sun Jun 5 14:06:17 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.1.2.4 2005/03/19 13:56:56 tony2001 Exp $ */
+/* $Id: bz2.c,v 1.1.2.5 2005/06/05 18:06:17 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -40,9 +40,6 @@
#define PHP_BZ_ERRSTR 1
#define PHP_BZ_ERRBOTH 2
-/* Blocksize of the decompression buffer */
-#define PHP_BZ_DECOMPRESS_SIZE 4096
-
function_entry bz2_functions[] = {
PHP_FE(bzopen, NULL)
PHP_FE(bzread, NULL)
@@ -434,56 +431,49 @@
Decompresses BZip2 compressed data */
PHP_FUNCTION(bzdecompress)
{
- zval**source, /* Source data to
decompress */
- **zsmall; /* (Optional) user
specified small */
- char *dest; /* Destination buffer,
initially allocated */
- int error, /* Error container */
- iter = 1, /* Iteration count for
the compression loop */
- size, /* Current size
to realloc the dest buffer to */
- dest_len = PHP_BZ_DECOMPRESS_SIZE, /* Size of the
destination length */
- small= 0, /* The actual
small */
- argc = ZEND_NUM_ARGS(); /* Argument count
*/
-
- if (argc 1 || argc 2 || zend_get_parameters_ex(argc, source,
zsmall) == FAILURE) {
- WRONG_PARAM_COUNT;
+ char *source, *dest;
+ int source_len, error;
+ long small = 0;
+ unsigned int size = 0;
+ bz_stream bzs;
+
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l,
source, source_len, small)) {
+ RETURN_FALSE;
}
- convert_to_string_ex(source);
-
- /* optional small argument handling */
- if (argc 1) {
- convert_to_long_ex(zsmall);
- small = Z_LVAL_PP(zsmall);
+ bzs.bzalloc = NULL;
+ bzs.bzfree = NULL;
+
+ if (BZ2_bzDecompressInit(bzs, 0, small) != BZ_OK) {
+ RETURN_FALSE;
}
- /* Depending on the size of the source buffer, either allocate
- the length of the source buffer or the a default decompression
- size */
- dest = emalloc(PHP_BZ_DECOMPRESS_SIZE Z_STRLEN_PP(source) ?
PHP_BZ_DECOMPRESS_SIZE : Z_STRLEN_PP(source));
-
- /* (de)Compression Loop */
- do {
- /* Handle the (re)allocation of the buffer */
- size = dest_len * iter;
- if (iter 1) {
- dest = erealloc(dest, size);
- }
- ++iter;
+ bzs.next_in = source;
+ bzs.avail_in = source_len;
- /* Perform the decompression */
- error = BZ2_bzBuffToBuffDecompress(dest, size,
Z_STRVAL_PP(source), Z_STRLEN_PP(source), small, 0);
- } while (error == BZ_OUTBUFF_FULL);
-
- if (error != BZ_OK) {
- efree(dest);
- RETURN_LONG(error);
- } else {
- /* we might have allocated a little to much, so erealloc the
buffer
-down to size, before returning it */
+ /* in most cases bz2 offers at least 2:1 compression, so we use that as
our base */
+ bzs.avail_out = source_len * 2;
+ bzs.next_out = dest = emalloc(bzs.avail_out + 1);
+
+ while ((error = BZ2_bzDecompress(bzs)) == BZ_OK bzs.avail_in 0) {
+ /* compression is better then 2:1, need to allocate more memory
*/
+ bzs.avail_out = source_len;
+ size = (bzs.total_out_hi32 32) + bzs.total_out_lo32;
+ dest = erealloc(dest, size + bzs.avail_out + 1);
+ bzs.next_out = dest + size;
+ }
+
+ if (error == BZ_STREAM_END || error == BZ_OK) {
+ size = (bzs.total_out_hi32 32) + bzs.total_out_lo32;
dest = erealloc(dest, size + 1);
- dest[size] = 0;
- RETURN_STRINGL(dest, size, 0);
+ dest[size] = '\0';
+ RETVAL_STRINGL(dest, size, 0);
+ } else { /* real error */
+ efree(dest);
+ RETVAL_LONG(error);
}
+
+ BZ2_bzDecompressEnd(bzs);
}
/*
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard string.c
derick Thu Jun 2 04:31:39 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard string.c
/php-srcNEWS
Log:
- MFH: Fixed memory corruption in stristr().
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.333.2.50r2=1.333.2.51ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.50
php-src/ext/standard/string.c:1.333.2.51
--- php-src/ext/standard/string.c:1.333.2.50Tue May 31 08:56:00 2005
+++ php-src/ext/standard/string.c Thu Jun 2 04:31:38 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.333.2.50 2005/05/31 12:56:00 sniper Exp $ */
+/* $Id: string.c,v 1.333.2.51 2005/06/02 08:31:38 derick Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1317,8 +1317,8 @@
if (!Z_STRLEN_PP(needle)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Empty
delimiter.);
efree(haystack_orig);
- zval_ptr_dtor(haystack);
- zval_ptr_dtor(needle);
+// zval_ptr_dtor(haystack);
+// zval_ptr_dtor(needle);
RETURN_FALSE;
}
@@ -1339,8 +1339,8 @@
RETVAL_FALSE;
}
- zval_ptr_dtor(haystack);
- zval_ptr_dtor(needle);
+// zval_ptr_dtor(haystack);
+// zval_ptr_dtor(needle);
efree(haystack_orig);
}
/* }}} */
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.916r2=1.1247.2.917ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.916 php-src/NEWS:1.1247.2.917
--- php-src/NEWS:1.1247.2.916 Wed Jun 1 18:29:19 2005
+++ php-src/NEWSThu Jun 2 04:31:38 2005
@@ -7,6 +7,7 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed memory corruption in stristr(). (Derick)
- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
misbehave). (Jani)
--
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 /ext/odbc php_odbc.c
tony2001Thu Jun 2 11:42:59 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/odbc php_odbc.c
/php-srcNEWS
Log:
MFH: fix bug #33214 (odbc_next_result does not signal SQL errors with
2-statement SQL batches).
Path by rich at kastle dot com.
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.143.2.20r2=1.143.2.21ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.143.2.20
php-src/ext/odbc/php_odbc.c:1.143.2.21
--- php-src/ext/odbc/php_odbc.c:1.143.2.20 Tue Jan 18 10:11:22 2005
+++ php-src/ext/odbc/php_odbc.c Thu Jun 2 11:42:58 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_odbc.c,v 1.143.2.20 2005/01/18 15:11:22 tony2001 Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.21 2005/06/02 15:42:58 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2436,8 +2436,10 @@
result-values = NULL;
}
RETURN_TRUE;
- }
- else {
+ } else if (rc == SQL_NO_DATA_FOUND) {
+ RETURN_FALSE;
+ } else {
+ odbc_sql_error(result-conn_ptr, result-stmt,
SQLMoreResults);
RETURN_FALSE;
}
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.917r2=1.1247.2.918ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.917 php-src/NEWS:1.1247.2.918
--- php-src/NEWS:1.1247.2.917 Thu Jun 2 04:31:38 2005
+++ php-src/NEWSThu Jun 2 11:42:58 2005
@@ -8,6 +8,8 @@
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
- Fixed memory corruption in stristr(). (Derick)
+- Fixed bug #33214 (odbc_next_result does not signal SQL errors with
+ 2-statement SQL batches). (rich at kastle dot com, Tony)
- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
misbehave). (Jani)
--
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 configure.in
sniper Thu Jun 2 17:32:50 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS configure.in Log: MFH: - Fixed bug #28605 (Need to use -[m]ieee option for Alpha CPUs) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.919r2=1.1247.2.920ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.919 php-src/NEWS:1.1247.2.920 --- php-src/NEWS:1.1247.2.919 Thu Jun 2 17:05:06 2005 +++ php-src/NEWSThu Jun 2 17:32:49 2005 @@ -70,6 +70,7 @@ handler). (Tony) - Fixed bug #29944 (Function defined in switch, crashes). (Dmitry) - Fixed bug #29338 (unencoded spaces get ignored after certain tags). (Ilia) +- Fixed bug #28605 (Need to use -[m]ieee option for Alpha CPUs). (Jani) 31 Mar 2005, Version 4.3.11 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.163r2=1.396.2.164ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.163 php-src/configure.in:1.396.2.164 --- php-src/configure.in:1.396.2.163Sat Apr 30 00:28:23 2005 +++ php-src/configure.inThu Jun 2 17:32:49 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.163 2005/04/30 04:28:23 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164 2005/06/02 21:32:49 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -180,6 +180,17 @@ dnl Platform-specific compile settings. dnl - +dnl See bug #28605 +case $host_cpu in +alpha*) +if test $GCC = yes; then + CFLAGS=$CFLAGS -mieee +else + CFLAGS=$CFLAGS -ieee +fi +;; +esac + case $host_alias in *solaris*) CPPFLAGS=$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS -- 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 /ext/standard image.c
iliaa Wed Jun 1 18:29:20 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard image.c
Log:
MFH: Fixed bug #33210 (relax jpeg recursive loop protection).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.915r2=1.1247.2.916ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.915 php-src/NEWS:1.1247.2.916
--- php-src/NEWS:1.1247.2.915 Tue May 31 08:56:00 2005
+++ php-src/NEWSWed Jun 1 18:29:19 2005
@@ -7,6 +7,7 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
misbehave). (Jani)
- Fixed bug #33072 (Add a safemode/open_basedir check for runtime save_path
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.72.2.18r2=1.72.2.19ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.72.2.18
php-src/ext/standard/image.c:1.72.2.19
--- php-src/ext/standard/image.c:1.72.2.18 Sun Mar 6 12:05:41 2005
+++ php-src/ext/standard/image.cWed Jun 1 18:29:20 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.72.2.18 2005/03/06 17:05:41 iliaa Exp $ */
+/* $Id: image.c,v 1.72.2.19 2005/06/01 22:29:20 iliaa Exp $ */
#include php.h
#include stdio.h
@@ -401,7 +401,7 @@
last_marker = M_PSEUDO; /* stop skipping non
0xff for M_COM */
}
}
- if (++a 10)
+ if (++a 25)
{
/* who knows the maxim amount of 0xff? though 7 */
/* but found other implementations */
--
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 /ext/pcre php_pcre.c /ext/pcre/tests bug33200.phpt /ext/standard php_string.h string.c
sniper Tue May 31 08:56:02 2005 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/pcre/tests bug33200.phpt
Modified files:
/php-srcNEWS
/php-src/ext/pcre php_pcre.c
/php-src/ext/standard php_string.h string.c
Log:
MFH: - Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e'
modifier misbehave)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.914r2=1.1247.2.915ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.914 php-src/NEWS:1.1247.2.915
--- php-src/NEWS:1.1247.2.914 Mon May 23 17:50:58 2005
+++ php-src/NEWSTue May 31 08:56:00 2005
@@ -7,6 +7,8 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
+ misbehave). (Jani)
- Fixed bug #33072 (Add a safemode/open_basedir check for runtime save_path
change) (Rasmus)
- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.132.2.23r2=1.132.2.24ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.132.2.23
php-src/ext/pcre/php_pcre.c:1.132.2.24
--- php-src/ext/pcre/php_pcre.c:1.132.2.23 Tue May 24 17:12:16 2005
+++ php-src/ext/pcre/php_pcre.c Tue May 31 08:56:00 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.132.2.23 2005/05/24 21:12:16 andrei Exp $ */
+/* $Id: php_pcre.c,v 1.132.2.24 2005/05/31 12:56:00 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -750,9 +750,9 @@
in instead of the backref */
match = subject + offsets[backref1];
match_len = offsets[(backref1)+1] -
offsets[backref1];
- if (match_len)
- esc_match =
php_addslashes(match, match_len, esc_match_len, 0 TSRMLS_CC);
- else {
+ if (match_len) {
+ esc_match =
php_addslashes_ex(match, match_len, esc_match_len, 0, 1 TSRMLS_CC);
+ } else {
esc_match = match;
esc_match_len = 0;
}
http://cvs.php.net/diff.php/php-src/ext/standard/php_string.h?r1=1.65.2.4r2=1.65.2.5ty=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.65.2.4
php-src/ext/standard/php_string.h:1.65.2.5
--- php-src/ext/standard/php_string.h:1.65.2.4 Wed Nov 3 18:36:01 2004
+++ php-src/ext/standard/php_string.h Tue May 31 08:56:00 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_string.h,v 1.65.2.4 2004/11/03 23:36:01 derick Exp $ */
+/* $Id: php_string.h,v 1.65.2.5 2005/05/31 12:56:00 sniper Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -116,6 +116,7 @@
PHPAPI char *php_strtolower(char *s, size_t len);
PHPAPI char *php_strtr(char *str, int len, char *str_from, char *str_to, int
trlen);
PHPAPI char *php_addslashes(char *str, int length, int *new_length, int freeit
TSRMLS_DC);
+PHPAPI char *php_addslashes_ex(char *str, int length, int *new_length, int
freeit, int ignore_sybase TSRMLS_DC);
PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int
freeit, char *what, int wlength TSRMLS_DC);
PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC);
PHPAPI void php_stripcslashes(char *str, int *len);
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.333.2.49r2=1.333.2.50ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.49
php-src/ext/standard/string.c:1.333.2.50
--- php-src/ext/standard/string.c:1.333.2.49Sun Apr 3 14:09:54 2005
+++ php-src/ext/standard/string.c Tue May 31 08:56:00 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.333.2.49 2005/04/03 18:09:54 iliaa Exp $ */
+/* $Id: string.c,v 1.333.2.50 2005/05/31 12:56:00 sniper Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2413,18 +2413,26 @@
}
/* }}} */
+/* {{{ php_addslashes
+ */
+PHPAPI char *php_addslashes(char *str, int length, int *new_length, int
should_free TSRMLS_DC)
+{
+ return php_addslashes_ex(str, length, new_length, should_free, 0
TSRMLS_CC);
+}
+/* }}} */
+
/* true static */
const unsigned char php_esc_list[256] =
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /main streams.c
tony2001Mon May 23 07:52:45 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main streams.c
Log:
MFH: fix bug #32810 (fread after tmpfile() reads only 8192 bytes)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.911r2=1.1247.2.912ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.911 php-src/NEWS:1.1247.2.912
--- php-src/NEWS:1.1247.2.911 Mon May 23 05:43:59 2005
+++ php-src/NEWSMon May 23 07:52:42 2005
@@ -23,6 +23,7 @@
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
+- Fixed bug #32810 (fread after tmpfile() reads only 8192 bytes). (Tony)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
- Fixed bug #32773 (GMP functions break when second parameter is 0). (Stas)
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.96r2=1.125.2.97ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.96 php-src/main/streams.c:1.125.2.97
--- php-src/main/streams.c:1.125.2.96 Mon May 16 04:55:31 2005
+++ php-src/main/streams.c Mon May 23 07:52:44 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.125.2.96 2005/05/16 08:55:31 tony2001 Exp $ */
+/* $Id: streams.c,v 1.125.2.97 2005/05/23 11:52:44 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -654,8 +654,9 @@
}
/* just break anyway, to avoid greedy read */
- if (stream-wrapper != php_plain_files_wrapper)
+ if (stream-wrapper != NULL stream-wrapper !=
php_plain_files_wrapper) {
break;
+ }
}
if (didread 0)
--
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
tony2001Mon May 23 11:37:30 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main streams.c
Log:
revert by Wez's request
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.912r2=1.1247.2.913ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.912 php-src/NEWS:1.1247.2.913
--- php-src/NEWS:1.1247.2.912 Mon May 23 07:52:42 2005
+++ php-src/NEWSMon May 23 11:37:29 2005
@@ -23,7 +23,6 @@
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
-- Fixed bug #32810 (fread after tmpfile() reads only 8192 bytes). (Tony)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
- Fixed bug #32773 (GMP functions break when second parameter is 0). (Stas)
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.97r2=1.125.2.98ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.97 php-src/main/streams.c:1.125.2.98
--- php-src/main/streams.c:1.125.2.97 Mon May 23 07:52:44 2005
+++ php-src/main/streams.c Mon May 23 11:37:29 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.125.2.97 2005/05/23 11:52:44 tony2001 Exp $ */
+/* $Id: streams.c,v 1.125.2.98 2005/05/23 15:37:29 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -654,7 +654,7 @@
}
/* just break anyway, to avoid greedy read */
- if (stream-wrapper != NULL stream-wrapper !=
php_plain_files_wrapper) {
+ if (stream-wrapper != php_plain_files_wrapper) {
break;
}
}
--
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 /ext/session session.c
rasmus Sat May 21 15:46:35 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/sessionsession.c
Log:
Fixed bug #33072 - Add a safemode/open_basedir check for runtime save_path
change
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.908r2=1.1247.2.909ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.908 php-src/NEWS:1.1247.2.909
--- php-src/NEWS:1.1247.2.908 Fri May 20 07:15:33 2005
+++ php-src/NEWSSat May 21 15:46:32 2005
@@ -7,6 +7,8 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed bug #33072 (Add a safemode/open_basedir check for runtime save_path
+ change) (Rasmus)
- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per
RFC 2616 section 10.3.5) (Rasmus, Choitel)
- Fixed bug #33019 (socket errors cause memory leaks in php_strerror()).
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.336.2.51r2=1.336.2.52ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.51
php-src/ext/session/session.c:1.336.2.52
--- php-src/ext/session/session.c:1.336.2.51Fri May 20 06:28:35 2005
+++ php-src/ext/session/session.c Sat May 21 15:46:34 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.51 2005/05/20 10:28:35 tony2001 Exp $ */
+/* $Id: session.c,v 1.336.2.52 2005/05/21 19:46:34 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -117,6 +117,19 @@
return SUCCESS;
}
+static PHP_INI_MH(OnUpdateSaveDir) {
+ /* Only do the safemode/open_basedir check at runtime */
+ if(stage == PHP_INI_STAGE_RUNTIME) {
+ if (PG(safe_mode) (!php_checkuid(new_value, NULL,
CHECKUID_ALLOW_ONLY_DIR))) {
+ return FAILURE;
+ }
+
+ if (php_check_open_basedir(new_value TSRMLS_CC)) {
+ return FAILURE;
+ }
+ }
+ OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2,
mh_arg3, stage TSRMLS_CC);
+}
/* {{{ PHP_INI
*/
@@ -124,9 +137,9 @@
STD_PHP_INI_BOOLEAN(session.bug_compat_42,1,
PHP_INI_ALL, OnUpdateBool, bug_compat, php_ps_globals,ps_globals)
STD_PHP_INI_BOOLEAN(session.bug_compat_warn, 1,
PHP_INI_ALL, OnUpdateBool, bug_compat_warn,php_ps_globals,ps_globals)
#ifdef PHP_WIN32
- STD_PHP_INI_ENTRY(session.save_path, , PHP_INI_ALL,
OnUpdateString, save_path, php_ps_globals,ps_globals)
+ STD_PHP_INI_ENTRY(session.save_path, ,
PHP_INI_ALL, OnUpdateSaveDir,save_path, php_ps_globals,ps_globals)
#else
- STD_PHP_INI_ENTRY(session.save_path, /tmp,
PHP_INI_ALL, OnUpdateString, save_path, php_ps_globals,ps_globals)
+ STD_PHP_INI_ENTRY(session.save_path, /tmp,
PHP_INI_ALL, OnUpdateSaveDir,save_path, php_ps_globals,ps_globals)
#endif
STD_PHP_INI_ENTRY(session.name, PHPSESSID,
PHP_INI_ALL, OnUpdateString, session_name, php_ps_globals,ps_globals)
PHP_INI_ENTRY(session.save_handler, files,
PHP_INI_ALL, OnUpdateSaveHandler)
--
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
sniper Fri May 20 02:36:57 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: reorder http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.905r2=1.1247.2.906ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.905 php-src/NEWS:1.1247.2.906 --- php-src/NEWS:1.1247.2.905 Thu May 19 12:16:44 2005 +++ php-src/NEWSFri May 20 02:36:56 2005 @@ -1,14 +1,14 @@ PHP 4 NEWS ||| ?? ??? 20??, Version 4.?.? -- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per - RFC 2616 section 10.3.5) (Rasmus, Choitel) - Added man pages for phpize and php-config scripts. (Jakub Vrana) - Added support for .cc files in extensions. (Brian) - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes them sort based on the current locale. (Derick) - Changed sha1_file() and md5_file() functions to use streams instead of low level IO. (Uwe) +- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per + RFC 2616 section 10.3.5) (Rasmus, Choitel) - Fixed bug #33019 (socket errors cause memory leaks in php_strerror()). (jwozniak23 at poczta dot onet dot pl, Tony). - Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez) -- 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 /ext/session session.c
tony2001Fri May 20 06:28:35 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/sessionsession.c
Log:
MFH: fix bug #32944 (Disabling session.use_cookies doesn't prevent reading
session cookies)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.906r2=1.1247.2.907ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.906 php-src/NEWS:1.1247.2.907
--- php-src/NEWS:1.1247.2.906 Fri May 20 02:36:56 2005
+++ php-src/NEWSFri May 20 06:28:34 2005
@@ -12,6 +12,8 @@
- Fixed bug #33019 (socket errors cause memory leaks in php_strerror()).
(jwozniak23 at poczta dot onet dot pl, Tony).
- Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez)
+- Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading
+ session cookies). (Jani, Tony)
- Fixed bug #32936 (http redirects URLs are not checked for control chars).
(Ilia)
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.336.2.50r2=1.336.2.51ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.50
php-src/ext/session/session.c:1.336.2.51
--- php-src/ext/session/session.c:1.336.2.50Sun Feb 13 12:51:32 2005
+++ php-src/ext/session/session.c Fri May 20 06:28:35 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.50 2005/02/13 17:51:32 sniper Exp $ */
+/* $Id: session.c,v 1.336.2.51 2005/05/20 10:28:35 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1015,7 +1015,7 @@
*/
if (!PS(id)) {
- if (zend_hash_find(EG(symbol_table), _COOKIE,
+ if (PS(use_cookies) zend_hash_find(EG(symbol_table),
_COOKIE,
sizeof(_COOKIE), (void **) data) ==
SUCCESS
Z_TYPE_PP(data) == IS_ARRAY
zend_hash_find(Z_ARRVAL_PP(data),
PS(session_name),
--
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
derick Fri May 20 07:15:34 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: Update NEWS http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.907r2=1.1247.2.908ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.907 php-src/NEWS:1.1247.2.908 --- php-src/NEWS:1.1247.2.907 Fri May 20 06:28:34 2005 +++ php-src/NEWSFri May 20 07:15:33 2005 @@ -11,6 +11,8 @@ RFC 2616 section 10.3.5) (Rasmus, Choitel) - Fixed bug #33019 (socket errors cause memory leaks in php_strerror()). (jwozniak23 at poczta dot onet dot pl, Tony). +- Fixed bug #33013 (next month was handled wrong while parsing dates). + (Derick) - Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez) - Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading session cookies). (Jani, Tony) -- 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
rasmus Thu May 19 12:16:45 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: NEWS file update for Jani http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.904r2=1.1247.2.905ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.904 php-src/NEWS:1.1247.2.905 --- php-src/NEWS:1.1247.2.904 Mon May 16 04:55:29 2005 +++ php-src/NEWSThu May 19 12:16:44 2005 @@ -1,6 +1,8 @@ PHP 4 NEWS ||| ?? ??? 20??, Version 4.?.? +- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per + RFC 2616 section 10.3.5) (Rasmus, Choitel) - Added man pages for phpize and php-config scripts. (Jakub Vrana) - Added support for .cc files in extensions. (Brian) - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes -- 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 /ext/standard basic_functions.c /main main.c php_streams.h streams.c
tony2001Mon May 16 04:55:32 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard basic_functions.c
/php-src/main main.c php_streams.h streams.c
Log:
MFH: fix bug #32742 (segmentation fault when the stream with a wrapper is not
closed)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.903r2=1.1247.2.904ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.903 php-src/NEWS:1.1247.2.904
--- php-src/NEWS:1.1247.2.903 Fri May 13 19:11:17 2005
+++ php-src/NEWSMon May 16 04:55:29 2005
@@ -16,6 +16,8 @@
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
+- Fixed bug #32742 (segmentation fault when the stream with a wrapper
+ is not closed). (Tony, Dmitry)
- Fixed bug #32730 (ext/crack.c fails to compile with cracklib-2.8.3). (Jani)
- Fixed bug #32670 (foreach() does not issue warning on unset array arg).
(Ilia)
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.543.2.50r2=1.543.2.51ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.543.2.50
php-src/ext/standard/basic_functions.c:1.543.2.51
--- php-src/ext/standard/basic_functions.c:1.543.2.50 Mon May 9 03:08:42 2005
+++ php-src/ext/standard/basic_functions.c Mon May 16 04:55:31 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.543.2.50 2005/05/09 07:08:42 sniper Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.51 2005/05/16 08:55:31 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -1239,11 +1239,10 @@
}
STR_FREE(BG(locale_string));
- if (FG(stream_wrappers)) {
- zend_hash_destroy(FG(stream_wrappers));
- efree(FG(stream_wrappers));
- FG(stream_wrappers) = NULL;
- }
+ /*
+FG(stream_wrappers) are destroyed
+during php_request_shutdown()
+*/
PHP_RSHUTDOWN(fsock) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_RSHUTDOWN(filestat) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.62r2=1.512.2.63ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.62 php-src/main/main.c:1.512.2.63
--- php-src/main/main.c:1.512.2.62 Wed Apr 27 17:22:18 2005
+++ php-src/main/main.c Mon May 16 04:55:31 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.62 2005/04/27 21:22:18 andrey Exp $ */
+/* $Id: main.c,v 1.512.2.63 2005/05/16 08:55:31 tony2001 Exp $ */
/* {{{ includes
*/
@@ -1000,6 +1000,10 @@
sapi_deactivate(TSRMLS_C);
} zend_end_try();
+ zend_try {
+ php_shutdown_stream_hashes(TSRMLS_C);
+ } zend_end_try();
+
zend_try {
shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
} zend_end_try();
http://cvs.php.net/diff.php/php-src/main/php_streams.h?r1=1.61.2.17r2=1.61.2.18ty=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.61.2.17
php-src/main/php_streams.h:1.61.2.18
--- php-src/main/php_streams.h:1.61.2.17Mon Jun 21 15:33:48 2004
+++ php-src/main/php_streams.h Mon May 16 04:55:31 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams.h,v 1.61.2.17 2004/06/21 19:33:48 pollita Exp $ */
+/* $Id: php_streams.h,v 1.61.2.18 2005/05/16 08:55:31 tony2001 Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -526,6 +526,7 @@
int php_init_stream_wrappers(int module_number TSRMLS_DC);
int php_shutdown_stream_wrappers(int module_number TSRMLS_DC);
+void php_shutdown_stream_hashes(TSRMLS_D);
PHP_RSHUTDOWN_FUNCTION(streams);
PHPAPI int php_register_url_stream_wrapper(char *protocol, php_stream_wrapper
*wrapper TSRMLS_DC);
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.95r2=1.125.2.96ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.95 php-src/main/streams.c:1.125.2.96
--- php-src/main/streams.c:1.125.2.95 Thu Apr 7 03:28:08 2005
+++ php-src/main/streams.c Mon May 16 04:55:31 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.125.2.95 2005/04/07 07:28:08 thetaphi Exp $ */
+/* $Id: streams.c,v 1.125.2.96 2005/05/16 08:55:31 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -2330,6 +2330,15 @@
FG(pclose_ret) = php_stream_free(stream, PHP_STREAM_FREE_CLOSE |
PHP_STREAM_FREE_RSRC_DTOR);
}
+void php_shutdown_stream_hashes(TSRMLS_D)
+{
+ if
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/sockets sockets.c
tony2001Thu May 12 12:27:23 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/socketssockets.c
/php-srcNEWS
Log:
MFH: fix #33019 (socket errors cause memory leaks in php_strerror())
patch by jwozniak23 at poczta dot onet dot pl
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.125.2.28r2=1.125.2.29ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.28
php-src/ext/sockets/sockets.c:1.125.2.29
--- php-src/ext/sockets/sockets.c:1.125.2.28Mon Feb 14 18:46:07 2005
+++ php-src/ext/sockets/sockets.c Thu May 12 12:27:21 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.125.2.28 2005/02/14 23:46:07 sniper Exp $ */
+/* $Id: sockets.c,v 1.125.2.29 2005/05/12 16:27:21 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -354,6 +354,10 @@
buf = hstrerror(error);
#else
{
+ if (SOCKETS_G(strerror_buf)) {
+ efree(SOCKETS_G(strerror_buf));
+ }
+
spprintf((SOCKETS_G(strerror_buf)), 0, Host lookup
error %d, error);
buf = SOCKETS_G(strerror_buf);
}
@@ -368,6 +372,11 @@
if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, error, MAKELANGID(LANG_NEUTRAL,
SUBLANG_DEFAULT), (LPTSTR) tmp, 0, NULL)) {
+
+ if (SOCKETS_G(strerror_buf)) {
+ efree(SOCKETS_G(strerror_buf));
+ }
+
SOCKETS_G(strerror_buf) = estrdup(tmp);
LocalFree(tmp);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.901r2=1.1247.2.902ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.901 php-src/NEWS:1.1247.2.902
--- php-src/NEWS:1.1247.2.901 Tue May 10 19:15:05 2005
+++ php-src/NEWSThu May 12 12:27:22 2005
@@ -7,6 +7,8 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed bug #33019 (socket errors cause memory leaks in php_strerror()).
+ (jwozniak23 at poczta dot onet dot pl, Tony).
- Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez)
- Fixed bug #32936 (http redirects URLs are not checked for control chars).
(Ilia)
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
--
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 /ext/odbc php_odbc_includes.h
sniper Tue May 10 09:21:36 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/odbc php_odbc_includes.h
Log:
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.897r2=1.1247.2.898ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.897 php-src/NEWS:1.1247.2.898
--- php-src/NEWS:1.1247.2.897 Mon May 9 13:45:49 2005
+++ php-src/NEWSTue May 10 09:21:35 2005
@@ -12,6 +12,7 @@
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
+- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
- Fixed bug #32730 (ext/crack.c fails to compile with cracklib-2.8.3). (Jani)
- Fixed bug #32670 (foreach() does not issue warning on unset array arg).
(Ilia)
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc_includes.h?r1=1.2.4.2r2=1.2.4.3ty=u
Index: php-src/ext/odbc/php_odbc_includes.h
diff -u php-src/ext/odbc/php_odbc_includes.h:1.2.4.2
php-src/ext/odbc/php_odbc_includes.h:1.2.4.3
--- php-src/ext/odbc/php_odbc_includes.h:1.2.4.2Mon Jul 14 12:13:30 2003
+++ php-src/ext/odbc/php_odbc_includes.hTue May 10 09:21:36 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_odbc_includes.h,v 1.2.4.2 2003/07/14 16:13:30 sniper Exp $ */
+/* $Id: php_odbc_includes.h,v 1.2.4.3 2005/05/10 13:21:36 sniper Exp $ */
#ifndef PHP_ODBC_INCLUDES_H
#define PHP_ODBC_INCLUDES_H
@@ -216,7 +216,7 @@
typedef struct odbc_result_value {
char name[32];
char *value;
- long int vallen;
+ SDWORD vallen;
SDWORD coltype;
} odbc_result_value;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/mysql/libmysql config-win.h
Am Mo, den 09.05.2005 schrieb Jani Taskinen um 23:17: Just curious..why was it disabled..? :) --Jani Afaik someone disabled it when PHP4 Windows didn't support zlib by default. /Georg -- 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 /ext/pgsql pgsql.c
tony2001Tue May 10 16:14:13 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/pgsql pgsql.c
/php-srcNEWS
Log:
MFH: fix #32904 (pg_get_notify() ignores result_type parameter)
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.244.2.38r2=1.244.2.39ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.38
php-src/ext/pgsql/pgsql.c:1.244.2.39
--- php-src/ext/pgsql/pgsql.c:1.244.2.38Wed Apr 13 18:12:06 2005
+++ php-src/ext/pgsql/pgsql.c Tue May 10 16:14:11 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.244.2.38 2005/04/13 22:12:06 tony2001 Exp $ */
+/* $Id: pgsql.c,v 1.244.2.39 2005/05/10 20:14:11 tony2001 Exp $ */
#include stdlib.h
@@ -3138,11 +3138,11 @@
RETURN_FALSE;
}
array_init(return_value);
- if (result_type (PGSQL_NUM|PGSQL_BOTH)) {
+ if (result_type == PGSQL_NUM || result_type == PGSQL_BOTH) {
add_index_string(return_value, 0, pgsql_notify-relname, 1);
add_index_long(return_value, 1, pgsql_notify-be_pid);
}
- if (result_type (PGSQL_ASSOC|PGSQL_BOTH)) {
+ if (result_type == PGSQL_ASSOC || result_type == PGSQL_BOTH) {
add_assoc_string(return_value, message,
pgsql_notify-relname, 1);
add_assoc_long(return_value, pid, pgsql_notify-be_pid);
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.898r2=1.1247.2.899ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.898 php-src/NEWS:1.1247.2.899
--- php-src/NEWS:1.1247.2.898 Tue May 10 09:21:35 2005
+++ php-src/NEWSTue May 10 16:14:11 2005
@@ -10,6 +10,7 @@
- Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez)
- Fixed bug #32936 (http redirects URLs are not checked for control chars).
(Ilia)
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
+- Fixed bug #32904 (pg_get_notify() ignores result_type parameter)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
--
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
sniper Tue May 10 17:47:12 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: Tony or Antony? :) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.899r2=1.1247.2.900ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.899 php-src/NEWS:1.1247.2.900 --- php-src/NEWS:1.1247.2.899 Tue May 10 16:14:11 2005 +++ php-src/NEWSTue May 10 17:47:11 2005 @@ -10,7 +10,7 @@ - Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez) - Fixed bug #32936 (http redirects URLs are not checked for control chars). (Ilia) - Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani) -- Fixed bug #32904 (pg_get_notify() ignores result_type parameter) +- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Antony) - Fixed bug #32813 (parse_url() does not handle scheme-only urls properly). (Ilia) - Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia) - Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani) -- 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 /ext/pgsql pgsql.c
tony2001Tue May 10 19:15:07 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/pgsql pgsql.c
Log:
use and check for the right value of result_type
btw, nobody noticed that result_type wasn't ever working in 4.3, because it
was absent in parse_params()..
also, I prefer Tony just for uniformity =)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.900r2=1.1247.2.901ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.900 php-src/NEWS:1.1247.2.901
--- php-src/NEWS:1.1247.2.900 Tue May 10 17:47:11 2005
+++ php-src/NEWSTue May 10 19:15:05 2005
@@ -10,7 +10,7 @@
- Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez)
- Fixed bug #32936 (http redirects URLs are not checked for control chars).
(Ilia)
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
-- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Antony)
+- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.244.2.39r2=1.244.2.40ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.39
php-src/ext/pgsql/pgsql.c:1.244.2.40
--- php-src/ext/pgsql/pgsql.c:1.244.2.39Tue May 10 16:14:11 2005
+++ php-src/ext/pgsql/pgsql.c Tue May 10 19:15:06 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.244.2.39 2005/05/10 20:14:11 tony2001 Exp $ */
+/* $Id: pgsql.c,v 1.244.2.40 2005/05/10 23:15:06 tony2001 Exp $ */
#include stdlib.h
@@ -3125,12 +3125,17 @@
PGnotify *pgsql_notify;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, r|l,
-pgsql_link)
== FAILURE) {
+pgsql_link,
result_type) == FAILURE) {
RETURN_FALSE;
}
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, PostgreSQL
link, le_link, le_plink);
+ if (!(result_type PGSQL_BOTH)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid result
type);
+ RETURN_FALSE;
+ }
+
PQconsumeInput(pgsql);
pgsql_notify = PQnotifies(pgsql);
if (!pgsql_notify) {
@@ -3138,11 +3143,11 @@
RETURN_FALSE;
}
array_init(return_value);
- if (result_type == PGSQL_NUM || result_type == PGSQL_BOTH) {
+ if (result_type PGSQL_NUM) {
add_index_string(return_value, 0, pgsql_notify-relname, 1);
add_index_long(return_value, 1, pgsql_notify-be_pid);
}
- if (result_type == PGSQL_ASSOC || result_type == PGSQL_BOTH) {
+ if (result_type PGSQL_ASSOC) {
add_assoc_string(return_value, message,
pgsql_notify-relname, 1);
add_assoc_long(return_value, pid, pgsql_notify-be_pid);
}
--
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 /ext/mysql/libmysql config-win.h
georg Mon May 9 13:45:51 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/mysql/libmysql config-win.h Log: fix for bug #32116 (mysql compressed connection doesn't work under win) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.896r2=1.1247.2.897ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.896 php-src/NEWS:1.1247.2.897 --- php-src/NEWS:1.1247.2.896 Sun May 8 12:06:24 2005 +++ php-src/NEWSMon May 9 13:45:49 2005 @@ -36,6 +36,8 @@ (Moriyoshi) - Fixed bug #32245 (xml_parser_free() in a function assigned to the xml parser gives a segfault). (Rob) +- Fixed bug #32116 (mysql compressed connection doesn't work under windows) + (Georg) - Fixed bug #31887 (ISAPI: Custom 5xx error does not return correct HTTP response message). (Jani) - Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance mode). http://cvs.php.net/diff.php/php-src/ext/mysql/libmysql/config-win.h?r1=1.8.4.1r2=1.8.4.2ty=u Index: php-src/ext/mysql/libmysql/config-win.h diff -u php-src/ext/mysql/libmysql/config-win.h:1.8.4.1 php-src/ext/mysql/libmysql/config-win.h:1.8.4.2 --- php-src/ext/mysql/libmysql/config-win.h:1.8.4.1 Thu Mar 27 08:29:59 2003 +++ php-src/ext/mysql/libmysql/config-win.h Mon May 9 13:45:50 2005 @@ -239,7 +239,7 @@ #define HAVE_ALLOCA #define HAVE_STRPBRK #define HAVE_STRSTR -/* #define HAVE_COMPRESS -- not with PHP, please */ +#define HAVE_COMPRESS #ifdef NOT_USED #define HAVE_SNPRINTF /* Gave link error */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/mysql/libmysql config-win.h
Just curious..why was it disabled..? :) --Jani On Mon, 9 May 2005, Georg Richter wrote: georg Mon May 9 13:45:51 2005 EDT Modified files: (Branch: PHP_4_3) /php-src NEWS /php-src/ext/mysql/libmysql config-win.h Log: fix for bug #32116 (mysql compressed connection doesn't work under win) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.896r2=1.1247.2.897ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.896 php-src/NEWS:1.1247.2.897 --- php-src/NEWS:1.1247.2.896 Sun May 8 12:06:24 2005 +++ php-src/NEWSMon May 9 13:45:49 2005 @@ -36,6 +36,8 @@ (Moriyoshi) - Fixed bug #32245 (xml_parser_free() in a function assigned to the xml parser gives a segfault). (Rob) +- Fixed bug #32116 (mysql compressed connection doesn't work under windows) + (Georg) - Fixed bug #31887 (ISAPI: Custom 5xx error does not return correct HTTP response message). (Jani) - Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance mode). http://cvs.php.net/diff.php/php-src/ext/mysql/libmysql/config-win.h?r1=1.8.4.1r2=1.8.4.2ty=u Index: php-src/ext/mysql/libmysql/config-win.h diff -u php-src/ext/mysql/libmysql/config-win.h:1.8.4.1 php-src/ext/mysql/libmysql/config-win.h:1.8.4.2 --- php-src/ext/mysql/libmysql/config-win.h:1.8.4.1 Thu Mar 27 08:29:59 2003 +++ php-src/ext/mysql/libmysql/config-win.h Mon May 9 13:45:50 2005 @@ -239,7 +239,7 @@ #define HAVE_ALLOCA #define HAVE_STRPBRK #define HAVE_STRSTR -/* #define HAVE_COMPRESS -- not with PHP, please */ +#define HAVE_COMPRESS #ifdef NOT_USED #define HAVE_SNPRINTF /* Gave link error */ -- Donate @ http://pecl.php.net/wishlist.php/sniper -- 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 /ext/ldap config.m4 ldap.c php_ldap.h
sniper Sun May 8 12:06:25 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/ldap config.m4 ldap.c php_ldap.h Log: MFH: - Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer) # also partial sync with HEAD (just some ws/cs changes) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.895r2=1.1247.2.896ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.895 php-src/NEWS:1.1247.2.896 --- php-src/NEWS:1.1247.2.895 Sat May 7 10:55:39 2005 +++ php-src/NEWSSun May 8 12:06:24 2005 @@ -9,6 +9,7 @@ low level IO. (Uwe) - Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez) - Fixed bug #32936 (http redirects URLs are not checked for control chars). (Ilia) +- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani) - Fixed bug #32813 (parse_url() does not handle scheme-only urls properly). (Ilia) - Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia) - Fixed bug #32730 (ext/crack.c fails to compile with cracklib-2.8.3). (Jani) http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.26.2.7r2=1.26.2.8ty=u Index: php-src/ext/ldap/config.m4 diff -u php-src/ext/ldap/config.m4:1.26.2.7 php-src/ext/ldap/config.m4:1.26.2.8 --- php-src/ext/ldap/config.m4:1.26.2.7 Thu Dec 30 02:02:17 2004 +++ php-src/ext/ldap/config.m4 Sun May 8 12:06:24 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.26.2.7 2004/12/30 07:02:17 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.8 2005/05/08 16:06:24 sniper Exp $ dnl AC_DEFUN([PHP_LDAP_CHECKS], [ @@ -99,7 +99,9 @@ elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_ORALDAP,1,[ ]) - +if test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then + AC_DEFINE(HAVE_ORALDAP_10,1,[ ]) +fi else AC_MSG_ERROR(Cannot find ldap libraries in $LDAP_LIBDIR.) fi @@ -112,8 +114,6 @@ _SAVE_CPPFLAGS=$CPPFLAGS _SAVE_LDFLAGS=$LDFLAGS CPPFLAGS=$CPPFLAGS -I$LDAP_INCDIR - LDFLAGS=$LDFLAGS $LDAP_SHARED_LIBADD - AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc, [AC_TRY_COMPILE([#include ldap.h], [ldap_set_rebind_proc(0,0,0)], ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)]) @@ -124,6 +124,16 @@ dnl Solaris 2.8 claims to be 2004 API, but doesn't have dnl ldap_parse_reference() nor ldap_start_tls_s() - AC_CHECK_FUNCS([ldap_parse_reference ldap_start_tls_s]) + AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s]) + LDFLAGS=$_SAVE_LDFLAGS + + dnl + dnl Sanity check + dnl + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS=$LDFLAGS $LDAP_SHARED_LIBADD + AC_CHECK_FUNC(ldap_bind_s, [], [ +AC_MSG_ERROR([LDAP build check failed. Please check config.log for more information.]) + ]) LDFLAGS=$_SAVE_LDFLAGS fi http://cvs.php.net/diff.php/php-src/ext/ldap/ldap.c?r1=1.130.2.12r2=1.130.2.13ty=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.130.2.12 php-src/ext/ldap/ldap.c:1.130.2.13 --- php-src/ext/ldap/ldap.c:1.130.2.12 Tue Apr 5 16:32:01 2005 +++ php-src/ext/ldap/ldap.c Sun May 8 12:06:24 2005 @@ -22,7 +22,7 @@ +--+ */ -/* $Id: ldap.c,v 1.130.2.12 2005/04/05 20:32:01 tony2001 Exp $ */ +/* $Id: ldap.c,v 1.130.2.13 2005/05/08 16:06:24 sniper Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -121,16 +121,18 @@ PHP_FE(ldap_compare, NULL) PHP_FE(ldap_sort, NULL) -#if (LDAP_API_VERSION 2000) || HAVE_NSLDAP +#if (LDAP_API_VERSION 2000) || HAVE_NSLDAP || HAVE_ORALDAP_10 + PHP_FE(ldap_rename, NULL) PHP_FE(ldap_get_option, third_argument_force_ref) PHP_FE(ldap_set_option, NULL) - PHP_FE(ldap_parse_result, arg3to6of6_force_ref) PHP_FE(ldap_first_reference, NULL) PHP_FE(ldap_next_reference, NULL) #ifdef HAVE_LDAP_PARSE_REFERENCE PHP_FE(ldap_parse_reference,third_argument_force_ref) #endif - PHP_FE(ldap_rename, NULL) +#ifdef HAVE_LDAP_PARSE_RESULT + PHP_FE(ldap_parse_result, arg3to6of6_force_ref) +#endif #ifdef HAVE_LDAP_START_TLS_S PHP_FE(ldap_start_tls, NULL) #endif @@ -223,7 +225,7 @@ REGISTER_LONG_CONSTANT(LDAP_DEREF_FINDING, LDAP_DEREF_FINDING, CONST_PERSISTENT | CONST_CS);
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/pcntl pcntl.c php_pcntl.h test-pcntl.php
wez Sat May 7 10:55:40 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/pcntl pcntl.c php_pcntl.h test-pcntl.php
Log:
Fix #32974
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.894r2=1.1247.2.895ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.894 php-src/NEWS:1.1247.2.895
--- php-src/NEWS:1.1247.2.894 Thu May 5 22:19:03 2005
+++ php-src/NEWSSat May 7 10:55:39 2005
@@ -7,6 +7,7 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez)
- Fixed bug #32936 (http redirects URLs are not checked for control chars).
(Ilia)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/pcntl/pcntl.c?r1=1.28.4.5r2=1.28.4.6ty=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.28.4.5 php-src/ext/pcntl/pcntl.c:1.28.4.6
--- php-src/ext/pcntl/pcntl.c:1.28.4.5 Tue Jun 29 21:12:09 2004
+++ php-src/ext/pcntl/pcntl.c Sat May 7 10:55:39 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pcntl.c,v 1.28.4.5 2004/06/30 01:12:09 iliaa Exp $ */
+/* $Id: pcntl.c,v 1.28.4.6 2005/05/07 14:55:39 wez Exp $ */
#define PCNTL_DEBUG 0
@@ -139,17 +139,13 @@
static void php_pcntl_init_globals(zend_pcntl_globals *pcntl_globals)
{
- /* Just in case ... */
-
memset(pcntl_globals-php_signal_queue,0,sizeof(pcntl_globals-php_signal_queue));
-
- zend_llist_init(pcntl_globals-php_signal_queue, sizeof (long), NULL,
1);
- pcntl_globals-signal_queue_ready = 0;
- pcntl_globals-processing_signal_queue = 0;
+ memset(pcntl_globals, 0, sizeof(*pcntl_globals));
}
PHP_RINIT_FUNCTION(pcntl)
{
- zend_hash_init(PCNTL_G(php_signal_table), 16, NULL, ZVAL_PTR_DTOR, 1);
+ zend_hash_init(PCNTL_G(php_signal_table), 16, NULL, ZVAL_PTR_DTOR, 0);
+ PCNTL_G(head) = PCNTL_G(tail) = PCNTL_G(spares) = NULL;
return SUCCESS;
}
@@ -164,13 +160,26 @@
PHP_MSHUTDOWN_FUNCTION(pcntl)
{
- zend_llist_destroy(PCNTL_G(php_signal_queue));
return SUCCESS;
}
PHP_RSHUTDOWN_FUNCTION(pcntl)
{
+ struct php_pcntl_pending_signal *sig;
+
+ /* FIXME: if a signal is delivered after this point, things will go
pear shaped;
+* need to remove signal handlers */
zend_hash_destroy(PCNTL_G(php_signal_table));
+ while (PCNTL_G(head)) {
+ sig = PCNTL_G(head);
+ PCNTL_G(head) = sig-next;
+ efree(sig);
+ }
+ while (PCNTL_G(spares)) {
+ sig = PCNTL_G(spares);
+ PCNTL_G(spares) = sig-next;
+ efree(sig);
+ }
return SUCCESS;
}
@@ -467,6 +476,19 @@
return;
}
+ if (!PCNTL_G(spares)) {
+ /* since calling malloc() from within a signal handler is not
portable,
+* pre-allocate a few records for recording signals */
+ int i;
+ for (i = 0; i 32; i++) {
+ struct php_pcntl_pending_signal *psig;
+
+ psig = emalloc(sizeof(*psig));
+ psig-next = PCNTL_G(spares);
+ PCNTL_G(spares) = psig;
+ }
+ }
+
/* Special long value case for SIG_DFL and SIG_IGN */
if (Z_TYPE_P(handle)==IS_LONG) {
if (Z_LVAL_P(handle)!= (long) SIG_DFL Z_LVAL_P(handle) !=
(long) SIG_IGN) {
@@ -501,57 +523,63 @@
/* Our custom signal handler that calls the appropriate php_function */
static void pcntl_signal_handler(int signo)
{
- long signal_num = signo;
+ struct php_pcntl_pending_signal *psig;
TSRMLS_FETCH();
- IF_DEBUG(DEBUG_OUT(Caught signo %d\n, signo));
- if (! PCNTL_G(processing_signal_queue)) {
- zend_llist_add_element(PCNTL_G(php_signal_queue), signal_num);
- PCNTL_G(signal_queue_ready) = 1;
- IF_DEBUG(DEBUG_OUT(Added queue entry\n));
+ psig = PCNTL_G(spares);
+ if (!psig) {
+ /* oops, too many signals for us to track, so we'll forget
about this one */
+ return;
}
- return;
+ PCNTL_G(spares) = psig-next;
+
+ psig-signo = signo;
+ psig-next = NULL;
+
+ /* the head check is important, as the tick handler cannot atomically
clear both
+* the head and tail */
+ if (PCNTL_G(head) PCNTL_G(tail)) {
+ PCNTL_G(tail)-next = psig;
+ } else {
+ PCNTL_G(head) = psig;
+ }
+ PCNTL_G(tail) = psig;
}
void pcntl_tick_handler()
{
- zend_llist_element *element;
zval
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard http_fopen_wrapper.c
iliaa Thu May 5 22:19:04 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard http_fopen_wrapper.c
Log:
MFH: Fixed bug #32936 (http redirects URLs are not checked for control chars).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.893r2=1.1247.2.894ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.893 php-src/NEWS:1.1247.2.894
--- php-src/NEWS:1.1247.2.893 Mon May 2 21:30:19 2005
+++ php-src/NEWSThu May 5 22:19:03 2005
@@ -7,6 +7,7 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed bug #32936 (http redirects URLs are not checked for control chars).
(Ilia)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bug #32730 (ext/crack.c fails to compile with cracklib-2.8.3). (Jani)
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.19r2=1.53.2.20ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.19
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.19 Fri May 28 09:38:19 2004
+++ php-src/ext/standard/http_fopen_wrapper.c Thu May 5 22:19:04 2005
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.53.2.19 2004/05/28 13:38:19 sesser Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.53.2.20 2005/05/06 02:19:04 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -494,6 +494,34 @@
} else {
strlcpy(new_path, location, sizeof(new_path));
}
+
+ php_url_free(resource);
+ /* check for invalid redirection URLs */
+ if ((resource = php_url_parse(new_path)) == NULL) {
+ php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, Invalid redirect url! %s, new_path);
+ goto out;
+ }
+
+#define CHECK_FOR_CNTRL_CHARS(val) { \
+ if (val) { \
+ unsigned char *s, *e; \
+ int l; \
+ l = php_url_decode(val, strlen(val)); \
+ s = val; e = s + l; \
+ while (s e) { \
+ if (iscntrl(*s)) { \
+ php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, Invalid redirect url! %s, new_path); \
+ goto out; \
+ } \
+ s++;\
+ } \
+ } \
+} \
+ /* check for control characters in login, password
path */
+ CHECK_FOR_CNTRL_CHARS(resource-user)
+ CHECK_FOR_CNTRL_CHARS(resource-pass)
+ CHECK_FOR_CNTRL_CHARS(resource-path)
+
stream = php_stream_url_wrap_http_ex(NULL, new_path,
mode, options, opened_path, context, --redirect_max, 0 STREAMS_CC TSRMLS_CC);
if (stream stream-wrapperdata) {
entryp = entry;
@@ -518,7 +546,9 @@
efree(http_header_line);
if (scratch)
efree(scratch);
- php_url_free(resource);
+ if (resource) {
+ php_url_free(resource);
+ }
if (stream) {
if (header_init) {
--
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 configure.in /scripts Makefile.frag /scripts/man1 php-config.1.in phpize.1.in
sniper Sat Apr 30 00:28:24 2005 EDT Added files: (Branch: PHP_4_3) /php-src/scripts/man1 php-config.1.in phpize.1.in Modified files: /php-srcNEWS configure.in /php-src/scriptsMakefile.frag Log: MFH: - Added man pages for phpize and php-config scripts. (Jakub Vrana) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.891r2=1.1247.2.892ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.891 php-src/NEWS:1.1247.2.892 --- php-src/NEWS:1.1247.2.891 Thu Apr 28 08:20:13 2005 +++ php-src/NEWSSat Apr 30 00:28:23 2005 @@ -1,6 +1,7 @@ PHP 4 NEWS ||| ?? ??? 20??, Version 4.?.? +- Added man pages for phpize and php-config scripts. (Jakub Vrana) - Added support for .cc files in extensions. (Brian) - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes them sort based on the current locale. (Derick) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.162r2=1.396.2.163ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.162 php-src/configure.in:1.396.2.163 --- php-src/configure.in:1.396.2.162Fri Apr 8 09:37:53 2005 +++ php-src/configure.inSat Apr 30 00:28:23 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.162 2005/04/08 13:37:53 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.163 2005/04/30 04:28:23 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1275,9 +1275,11 @@ $php_shtool mkdir -p pear/scripts $php_shtool mkdir -p scripts +$php_shtool mkdir -p scripts/man1 ALL_OUTPUT_FILES=php4.spec main/build-defs.h \ -scripts/phpize scripts/php-config \ +scripts/phpize scripts/man1/phpize.1 \ +scripts/php-config scripts/man1/php-config.1 \ $PHP_OUTPUT_FILES AC_OUTPUT($ALL_OUTPUT_FILES, [], [ http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.1.2.10r2=1.1.2.11ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.1.2.10 php-src/scripts/Makefile.frag:1.1.2.11 --- php-src/scripts/Makefile.frag:1.1.2.10 Fri Apr 29 23:02:09 2005 +++ php-src/scripts/Makefile.frag Sat Apr 30 00:28:24 2005 @@ -67,7 +67,13 @@ echo program: $(program_prefix)$$prog$(program_suffix); \ $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done - + @echo Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/ + @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 + @for page in $(man_PAGES); do \ + echo page: $$page; \ + $(INSTALL_DATA) $(builddir)/man1/$$page $(INSTALL_ROOT)$(mandir)/man1/$$page; \ + done + $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) http://cvs.php.net/co.php/php-src/scripts/man1/php-config.1.in?r=1.1p=1 Index: php-src/scripts/man1/php-config.1.in +++ php-src/scripts/man1/php-config.1.in../ +--+../ | PHP Version 5|../ +--+../ | Copyright (c) 1997-2004 The PHP Group|../ +--+../ | This source file is subject to version 3.0 of the PHP license, |../ | that is bundled with this package in the file LICENSE, and is|../ | available through the world-wide-web at the following url: |../ | http://www.php.net/license/3_0.txt. |../ | If you did not receive a copy of the PHP license and are unable to |../ | obtain it through the world-wide-web, please send a note to |../ | [EMAIL PROTECTED] so we can mail you a copy immediately. |../ +--+../ | Author: Jakub Vrana [EMAIL PROTECTED] |../ +--+../ ../ $Id: php-config.1.in,v 1.1 2005/04/30 04:27:23 sniper Exp $../ ..TH php\-config 1 Apr 2005 The PHP Group Scripting Language..SH NAME..TP 15..B php\-config Get information about PHP configuration..SH SYNOPSIS..B php\-config [options]..LP..SH DESCRIPTION..B php\-config is a simple shell script for obtaining information about installed PHP configuration...SH OPTIONS..TP 15..PD 0..B \-\-prefix Directory prefix where PHP is installed, e.g. /usr/local..TP..PD 0..B \-\-includes List of \-I options with all include files..TP..PD 0..B \-\-ldflags LD
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
rrichards Thu Apr 28 08:20:16 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.890r2=1.1247.2.891ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.890 php-src/NEWS:1.1247.2.891 --- php-src/NEWS:1.1247.2.890 Mon Apr 25 19:49:27 2005 +++ php-src/NEWSThu Apr 28 08:20:13 2005 @@ -29,6 +29,8 @@ (Uwe Schindler) - Fixed bug #32311 (mb_encode_mimeheader() does not properly escape characters). (Moriyoshi) +- Fixed bug #32245 (xml_parser_free() in a function assigned to the xml parser + gives a segfault). (Rob) - Fixed bug #31887 (ISAPI: Custom 5xx error does not return correct HTTP response message). (Jani) - Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance mode). -- 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 /tests/lang bug29944.phpt
dmitry Mon Apr 25 06:51:41 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/tests/lang bug29944.phpt
/php-srcNEWS
Log:
Test case fnd news entriey for bug #29944
http://cvs.php.net/diff.php/php-src/tests/lang/bug29944.phpt?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/tests/lang/bug29944.phpt
diff -u php-src/tests/lang/bug29944.phpt:1.1.2.1
php-src/tests/lang/bug29944.phpt:1.1.2.2
--- php-src/tests/lang/bug29944.phpt:1.1.2.1Thu Sep 2 02:34:12 2004
+++ php-src/tests/lang/bug29944.phptMon Apr 25 06:51:39 2005
@@ -1,20 +1,16 @@
---TEST--
-Bug #29944 (function defined in switch crashes PHP)
---FILE--
-?PHP
-$a = 1;
-$b = 1;
-switch ($a) {
- case 1:
- function foo($bar) {
- if (preg_match('/\d/', $bar)) return true;
- return false;
- }
- echo foo($b);
-}
-?
-
-===DONE===
---EXPECT--
-1
-===DONE===
+--TEST--
+Bug #29944 (Function defined in switch, crashes)
+--FILE--
+?php
+$a = 1;
+switch ($a) {
+ case 1:
+function foo($a) {
+ return ok\n;
+}
+echo foo($a);
+}
+?
+--EXPECT--
+ok
+
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.886r2=1.1247.2.887ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.886 php-src/NEWS:1.1247.2.887
--- php-src/NEWS:1.1247.2.886 Sun Apr 24 14:10:29 2005
+++ php-src/NEWSMon Apr 25 06:51:39 2005
@@ -33,6 +33,7 @@
response message). (Jani)
- Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance
mode).
(mike at php dot net)
+- Fixed bug #29944 (Function defined in switch, crashes). (Dmitry)
31 Mar 2005, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
--
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
stasMon Apr 25 08:03:55 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: fix for #32773 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.887r2=1.1247.2.888ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.887 php-src/NEWS:1.1247.2.888 --- php-src/NEWS:1.1247.2.887 Mon Apr 25 06:51:39 2005 +++ php-src/NEWSMon Apr 25 08:03:53 2005 @@ -34,6 +34,8 @@ - Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance mode). (mike at php dot net) - Fixed bug #29944 (Function defined in switch, crashes). (Dmitry) +- Fixed bug #32773 (GMP fincs break when second parameter is 0) and made right + fix for GMP FPEs (Stas) 31 Mar 2005, Version 4.3.11 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) -- 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 php_variables.c
sniper Mon Apr 25 17:22:49 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/main php_variables.c Log: MFH: Revert. Nokia didn't pay me enough. :) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.888r2=1.1247.2.889ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.888 php-src/NEWS:1.1247.2.889 --- php-src/NEWS:1.1247.2.888 Mon Apr 25 08:03:53 2005 +++ php-src/NEWSMon Apr 25 17:22:47 2005 @@ -28,7 +28,6 @@ (Uwe Schindler) - Fixed bug #32311 (mb_encode_mimeheader() does not properly escape characters). (Moriyoshi) -- Fixed bug #32111 (Cookies can also be separated by comma). (Jani) - Fixed bug #31887 (ISAPI: Custom 5xx error does not return correct HTTP response message). (Jani) - Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance mode). http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.45.2.10r2=1.45.2.11ty=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.45.2.10 php-src/main/php_variables.c:1.45.2.11 --- php-src/main/php_variables.c:1.45.2.10 Sun Apr 24 14:10:30 2005 +++ php-src/main/php_variables.cMon Apr 25 17:22:48 2005 @@ -16,7 +16,7 @@ | Zeev Suraski [EMAIL PROTECTED]| +--+ */ -/* $Id: php_variables.c,v 1.45.2.10 2005/04/24 18:10:30 iliaa Exp $ */ +/* $Id: php_variables.c,v 1.45.2.11 2005/04/25 21:22:48 sniper Exp $ */ #include stdio.h #include php.h @@ -301,7 +301,7 @@ separator = (char *) estrdup(PG(arg_separator).input); break; case PARSE_COOKIE: - separator = ;,\0; /* Cookies can be separated with , or ; */ + separator = ;\0; break; } -- 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 /ext/standard url.c /ext/standard/tests/strings url_t.phpt
iliaa Mon Apr 25 19:49:29 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/strings url_t.phpt
/php-src/ext/standard url.c
/php-srcNEWS
Log:
MFH: Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/url_t.phpt?r1=1.3.2.6r2=1.3.2.7ty=u
Index: php-src/ext/standard/tests/strings/url_t.phpt
diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.6
php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.7
--- php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.6 Thu Jan 27
11:38:30 2005
+++ php-src/ext/standard/tests/strings/url_t.phpt Mon Apr 25 19:49:27 2005
@@ -69,7 +69,8 @@
'file://path/to/file',
'file:/path/to/file',
'http://1.2.3.4:/abc.asp?a=1b=2',
-'http://foo.com#bar'
+'http://foo.com#bar',
+'scheme:'
);
foreach ($sample_urls as $url) {
@@ -659,3 +660,7 @@
[fragment]=
string(3) bar
}
+array(1) {
+ [scheme]=
+ string(6) scheme
+}
http://cvs.php.net/diff.php/php-src/ext/standard/url.c?r1=1.58.2.19r2=1.58.2.20ty=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.58.2.19
php-src/ext/standard/url.c:1.58.2.20
--- php-src/ext/standard/url.c:1.58.2.19Thu Jan 27 11:38:30 2005
+++ php-src/ext/standard/url.c Mon Apr 25 19:49:27 2005
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]
|
+--+
*/
-/* $Id: url.c,v 1.58.2.19 2005/01/27 16:38:30 iliaa Exp $ */
+/* $Id: url.c,v 1.58.2.20 2005/04/25 23:49:27 iliaa Exp $ */
#include stdlib.h
#include string.h
@@ -104,6 +104,12 @@
/* parse scheme */
if ((e = memchr(s, ':', length)) (e - s)) {
+ if (*(e + 1) == '\0') { /* only scheme is available */
+ ret-scheme = estrndup(s, (e - s));
+ php_replace_controlchars_ex(ret-scheme, (e - s));
+ goto end;
+ }
+
/*
* certain schemas like mailto: and zlib: may not have any /
after them
* this check ensures we support those.
@@ -297,7 +303,7 @@
ret-path = estrndup(s, (ue-s));
php_replace_controlchars_ex(ret-path, (ue - s));
}
-
+end:
return ret;
}
/* }}} */
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.889r2=1.1247.2.890ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.889 php-src/NEWS:1.1247.2.890
--- php-src/NEWS:1.1247.2.889 Mon Apr 25 17:22:47 2005
+++ php-src/NEWSMon Apr 25 19:49:27 2005
@@ -6,6 +6,7 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bug #32730 (ext/crack.c fails to compile with cracklib-2.8.3). (Jani)
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
--
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 php_variables.c
iliaa Sun Apr 24 14:10:30 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main php_variables.c
Log:
MFH: Fixed bug #32802 (General cookie overrides more specific cookie).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.885r2=1.1247.2.886ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.885 php-src/NEWS:1.1247.2.886
--- php-src/NEWS:1.1247.2.885 Sat Apr 23 19:57:40 2005
+++ php-src/NEWSSun Apr 24 14:10:29 2005
@@ -6,6 +6,7 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bug #32730 (ext/crack.c fails to compile with cracklib-2.8.3). (Jani)
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
(Derick)
http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.45.2.9r2=1.45.2.10ty=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.45.2.9
php-src/main/php_variables.c:1.45.2.10
--- php-src/main/php_variables.c:1.45.2.9 Sat Apr 23 16:34:15 2005
+++ php-src/main/php_variables.cSun Apr 24 14:10:30 2005
@@ -16,7 +16,7 @@
| Zeev Suraski [EMAIL PROTECTED]|
+--+
*/
-/* $Id: php_variables.c,v 1.45.2.9 2005/04/23 20:34:15 sniper Exp $ */
+/* $Id: php_variables.c,v 1.45.2.10 2005/04/24 18:10:30 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -63,7 +63,7 @@
char *ip; /* index pointer */
char *index;
int var_len, index_len;
- zval *gpc_element, **gpc_element_p;
+ zval *gpc_element, **gpc_element_p, *tmp;
zend_bool is_array;
HashTable *symtable1=NULL;
@@ -184,9 +184,20 @@
} else {
if (PG(magic_quotes_gpc) (index!=var)) {
char *escaped_index =
php_addslashes(index, index_len, index_len, 0 TSRMLS_CC);
+ /*
+* According to rfc2965, more specific
paths are listed above the less specific ones.
+* If we encounter a duplicate cookie
name, we should skip it, since it is not possible
+* to have the same (plain text) cookie
name for the same path and we should not overwrite
+* more specific cookies with the less
specific ones.
+*/
+ if (PG(http_globals)[TRACK_VARS_COOKIE]
symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE])
+
zend_hash_find(symtable1, escaped_index, index_len+1, (void **) tmp) !=
FAILURE) {
+ efree(escaped_index);
+ break;
+ }
zend_hash_update(symtable1,
escaped_index, index_len+1, gpc_element, sizeof(zval *), (void **)
gpc_element_p);
efree(escaped_index);
- } else {
+ } else if (!PG(http_globals)[TRACK_VARS_COOKIE]
|| symtable1 != Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) ||
zend_hash_find(symtable1, index, index_len+1, (void **) tmp) == FAILURE) {
zend_hash_update(symtable1, index,
index_len+1, gpc_element, sizeof(zval *), (void **) gpc_element_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) / NEWS
sniper Sat Apr 23 19:57:42 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: typo http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.884r2=1.1247.2.885ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.884 php-src/NEWS:1.1247.2.885 --- php-src/NEWS:1.1247.2.884 Sat Apr 23 16:34:14 2005 +++ php-src/NEWSSat Apr 23 19:57:40 2005 @@ -27,7 +27,7 @@ (Uwe Schindler) - Fixed bug #32311 (mb_encode_mimeheader() does not properly escape characters). (Moriyoshi) -- Fixed bug #32111 (Cookies can also be separated by colon). (Jani) +- Fixed bug #32111 (Cookies can also be separated by comma). (Jani) - Fixed bug #31887 (ISAPI: Custom 5xx error does not return correct HTTP response message). (Jani) - Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance mode). -- 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 /ext/standard basic_functions.c
sniper Thu Apr 21 10:47:15 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard basic_functions.c
/php-srcNEWS
Log:
MFH: - Fixed bug #32647 (Using register_shutdown_function() with invalid
callback can crash PHP)
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.543.2.47r2=1.543.2.48ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.543.2.47
php-src/ext/standard/basic_functions.c:1.543.2.48
--- php-src/ext/standard/basic_functions.c:1.543.2.47 Tue Jan 18 06:01:20 2005
+++ php-src/ext/standard/basic_functions.c Thu Apr 21 10:47:10 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.543.2.47 2005/01/18 11:01:20 sniper Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.48 2005/04/21 14:47:10 sniper Exp $ */
#include php.h
#include php_streams.h
@@ -2089,17 +2089,21 @@
static int user_shutdown_function_call(php_shutdown_function_entry
*shutdown_function_entry TSRMLS_DC)
{
zval retval;
+ char *function_name = NULL;
- if (call_user_function( EG(function_table), NULL,
-
shutdown_function_entry-arguments[0],
- retval,
-
shutdown_function_entry-arg_count - 1,
-
shutdown_function_entry-arguments + 1
- TSRMLS_CC ) == SUCCESS
) {
+ if (!zend_is_callable(shutdown_function_entry-arguments[0], 0,
function_name)) {
+ php_error(E_WARNING, (Registered shutdown functions) Unable to
call %s() - function does not exist, function_name);
+ } else if (call_user_function(EG(function_table), NULL,
+
shutdown_function_entry-arguments[0],
+ retval,
+
shutdown_function_entry-arg_count - 1,
+
shutdown_function_entry-arguments + 1
+ TSRMLS_CC ) ==
SUCCESS)
+ {
zval_dtor(retval);
-
- } else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to call
%s() - function does not exist,
Z_STRVAL_P(shutdown_function_entry-arguments[0]));
+ }
+ if (function_name) {
+ efree(function_name);
}
return 0;
}
@@ -2192,6 +2196,7 @@
PHP_FUNCTION(register_shutdown_function)
{
php_shutdown_function_entry shutdown_function_entry;
+ char *function_name = NULL;
int i;
shutdown_function_entry.arg_count = ZEND_NUM_ARGS();
@@ -2200,26 +2205,31 @@
WRONG_PARAM_COUNT;
}
- shutdown_function_entry.arguments = (pval **) safe_emalloc(sizeof(pval
*), shutdown_function_entry.arg_count, 0);
+ shutdown_function_entry.arguments = (zval **) safe_emalloc(sizeof(zval
*), shutdown_function_entry.arg_count, 0);
if (zend_get_parameters_array(ht, shutdown_function_entry.arg_count,
shutdown_function_entry.arguments) == FAILURE) {
RETURN_FALSE;
}
- /* Prevent entering of anything but arrays/strings */
- if (Z_TYPE_P(shutdown_function_entry.arguments[0]) != IS_ARRAY) {
- convert_to_string(shutdown_function_entry.arguments[0]);
- }
-
- if (!BG(user_shutdown_function_names)) {
- ALLOC_HASHTABLE(BG(user_shutdown_function_names));
- zend_hash_init(BG(user_shutdown_function_names), 0, NULL, (void
(*)(void *)) user_shutdown_function_dtor, 0);
- }
+ /* Prevent entering of anything but valid callback (syntax check only!)
*/
+ if (!zend_is_callable(shutdown_function_entry.arguments[0], 1,
function_name)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid shutdown
callback '%s' passed, function_name);
+ efree(shutdown_function_entry.arguments);
+ RETVAL_FALSE;
+ } else {
+ if (!BG(user_shutdown_function_names)) {
+ ALLOC_HASHTABLE(BG(user_shutdown_function_names));
+ zend_hash_init(BG(user_shutdown_function_names), 0,
NULL, (void (*)(void *)) user_shutdown_function_dtor, 0);
+ }
- for (i = 0; i shutdown_function_entry.arg_count; i++) {
- shutdown_function_entry.arguments[i]-refcount++;
+ for (i = 0; i shutdown_function_entry.arg_count; i++) {
+ shutdown_function_entry.arguments[i]-refcount++;
+ }
+
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/crack crack.c
sniper Sun Apr 17 09:27:18 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/crack crack.c Log: - Fixed bug #32730 (ext/crack.c fails to compile with cracklib-2.8.3) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.880r2=1.1247.2.881ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.880 php-src/NEWS:1.1247.2.881 --- php-src/NEWS:1.1247.2.880 Sat Apr 16 23:39:38 2005 +++ php-src/NEWSSun Apr 17 09:27:17 2005 @@ -5,6 +5,7 @@ them sort based on the current locale. (Derick) - Changed sha1_file() and md5_file() functions to use streams instead of low level IO. (Uwe) +- Fixed bug #32730 (ext/crack.c fails to compile with cracklib-2.8.3). (Jani) - Fixed bug #32699 (pg_affected_rows() was defined when it was not available). (Derick) - Fixed bug #32682 (ext/mssql: Error on module shutdown when called from http://cvs.php.net/diff.php/php-src/ext/crack/crack.c?r1=1.18.8.4r2=1.18.8.5ty=u Index: php-src/ext/crack/crack.c diff -u php-src/ext/crack/crack.c:1.18.8.4 php-src/ext/crack/crack.c:1.18.8.5 --- php-src/ext/crack/crack.c:1.18.8.4 Thu Dec 30 22:16:50 2004 +++ php-src/ext/crack/crack.c Sun Apr 17 09:27:18 2005 @@ -15,7 +15,7 @@ | Authors: Alexander Feldman | +--+ */ -/* $Id: crack.c,v 1.18.8.4 2004/12/31 03:16:50 iliaa Exp $ */ +/* $Id: crack.c,v 1.18.8.5 2005/04/17 13:27:18 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include config.h #endif @@ -29,6 +29,10 @@ #include packer.h +#ifndef STRINGSIZE +#define STRINGSIZE 1024 +#endif + extern char * FascistLook(PWDICT *pwp, char *instring); extern int PWClose(PWDICT *pwp); -- 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 /ext/standard md5.c sha1.c
thetaphiSat Apr 16 05:49:56 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard md5.c sha1.c
Log:
MFH: use streams api for md5_file() and sha1_file()
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.877r2=1.1247.2.878ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.877 php-src/NEWS:1.1247.2.878
--- php-src/NEWS:1.1247.2.877 Thu Apr 14 11:48:38 2005
+++ php-src/NEWSSat Apr 16 05:49:49 2005
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||
?? ??? 20??, Version 4.?.?
+- Changed sha1_file() / md5_file() to use streams instead of low level IO (Uwe)
- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
them sort based on the current locale. (Derick)
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.28.4.4r2=1.28.4.5ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.28.4.4 php-src/ext/standard/md5.c:1.28.4.5
--- php-src/ext/standard/md5.c:1.28.4.4 Fri Apr 15 05:44:45 2005
+++ php-src/ext/standard/md5.c Sat Apr 16 05:49:53 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: md5.c,v 1.28.4.4 2005/04/15 09:44:45 thetaphi Exp $ */
+/* $Id: md5.c,v 1.28.4.5 2005/04/16 09:49:53 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -24,9 +24,6 @@
*/
#include php.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
#include md5.h
PHPAPI void make_digest(char *md5str, unsigned char *digest)
@@ -73,7 +70,8 @@
unsigned char buf[1024];
unsigned char digest[16];
PHP_MD5_CTX context;
- int n,fd;
+ int n;
+ php_stream*stream;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE)
{
WRONG_PARAM_COUNT;
@@ -81,34 +79,25 @@
convert_to_string_ex(arg);
- if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(arg), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(Z_STRVAL_PP(arg) TSRMLS_CC)) {
- RETURN_FALSE;
- }
-
- if ((fd = VCWD_OPEN(Z_STRVAL_PP(arg), O_RDONLY)) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg), rb, REPORT_ERRORS
| ENFORCE_SAFE_MODE, NULL);
+ if (!stream) {
RETURN_FALSE;
}
PHP_MD5Init(context);
- while ((n = read(fd, buf, sizeof(buf))) 0) {
+ while ((n = php_stream_read(stream, buf, sizeof(buf))) 0) {
PHP_MD5Update(context, buf, n);
}
PHP_MD5Final(digest, context);
+ php_stream_close(stream);
+
if (n0) {
- close(fd);
RETURN_FALSE;
}
- close(fd);
-
make_digest(md5str, digest);
RETVAL_STRING(md5str, 1);
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.3.4.3r2=1.3.4.4ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.3.4.3 php-src/ext/standard/sha1.c:1.3.4.4
--- php-src/ext/standard/sha1.c:1.3.4.3 Fri Apr 15 05:24:45 2005
+++ php-src/ext/standard/sha1.c Sat Apr 16 05:49:53 2005
@@ -16,12 +16,9 @@
+--+
*/
-/* $Id: sha1.c,v 1.3.4.3 2005/04/15 09:24:45 thetaphi Exp $ */
+/* $Id: sha1.c,v 1.3.4.4 2005/04/16 09:49:53 thetaphi Exp $ */
#include php.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
/* This code is heavily based on the PHP md5 implementation */
@@ -72,7 +69,8 @@
unsigned char buf[1024];
unsigned char digest[20];
PHP_SHA1_CTX context;
- int n, fd;
+ int n;
+ php_stream*stream;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE)
{
WRONG_PARAM_COUNT;
@@ -80,34 +78,25 @@
convert_to_string_ex(arg);
- if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(arg), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(Z_STRVAL_PP(arg) TSRMLS_CC)) {
- RETURN_FALSE;
- }
-
- if ((fd = VCWD_OPEN(Z_STRVAL_PP(arg), O_RDONLY)) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg), rb, REPORT_ERRORS
| ENFORCE_SAFE_MODE, NULL);
+ if (!stream) {
RETURN_FALSE;
}
PHP_SHA1Init(context);
- while ((n = read(fd, buf, sizeof(buf))) 0) {
+ while ((n = php_stream_read(stream, buf, sizeof(buf))) 0) {
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
sniper Sat Apr 16 08:25:37 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: retype http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.878r2=1.1247.2.879ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.878 php-src/NEWS:1.1247.2.879 --- php-src/NEWS:1.1247.2.878 Sat Apr 16 05:49:49 2005 +++ php-src/NEWSSat Apr 16 08:25:36 2005 @@ -1,9 +1,10 @@ PHP 4 NEWS ||| ?? ??? 20??, Version 4.?.? -- Changed sha1_file() / md5_file() to use streams instead of low level IO (Uwe) - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes them sort based on the current locale. (Derick) +- Changed sha1_file() and md5_file() functions to use streams instead of + low level IO. (Uwe) - Fixed bug #32699 (pg_affected_rows() was defined when it was not available). (Derick) - Fixed bug #32682 (ext/mssql: Error on module shutdown when called from -- 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 /sapi/isapi php4isapi.c
sniper Sat Apr 16 23:39:40 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/sapi/isapi php4isapi.c
Log:
MFH: - Fixed bug #31887 (ISAPI: Custom 5xx error does not return correct HTTP
response message)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.879r2=1.1247.2.880ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.879 php-src/NEWS:1.1247.2.880
--- php-src/NEWS:1.1247.2.879 Sat Apr 16 08:25:36 2005
+++ php-src/NEWSSat Apr 16 23:39:38 2005
@@ -23,6 +23,8 @@
(Uwe Schindler)
- Fixed bug #32311 (mb_encode_mimeheader() does not properly escape
characters).
(Moriyoshi)
+- Fixed bug #31887 (ISAPI: Custom 5xx error does not return correct HTTP
+ response message). (Jani)
- Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance
mode).
(mike at php dot net)
http://cvs.php.net/diff.php/php-src/sapi/isapi/php4isapi.c?r1=1.92.2.12r2=1.92.2.13ty=u
Index: php-src/sapi/isapi/php4isapi.c
diff -u php-src/sapi/isapi/php4isapi.c:1.92.2.12
php-src/sapi/isapi/php4isapi.c:1.92.2.13
--- php-src/sapi/isapi/php4isapi.c:1.92.2.12Fri Dec 17 22:56:11 2004
+++ php-src/sapi/isapi/php4isapi.c Sat Apr 16 23:39:39 2005
@@ -16,7 +16,7 @@
| Ben Mansell [EMAIL PROTECTED] (Zeus Support)
|
+--+
*/
-/* $Id: php4isapi.c,v 1.92.2.12 2004/12/18 03:56:11 sniper Exp $ */
+/* $Id: php4isapi.c,v 1.92.2.13 2005/04/17 03:39:39 sniper Exp $ */
#ifdef PHP_WIN32
# include windows.h
@@ -57,7 +57,7 @@
#endif
*/
-#define MAX_STATUS_LENGTH sizeof( LONGEST STATUS DESCRIPTION)
+#define MAX_STATUS_LENGTH sizeof( LONGEST POSSIBLE STATUS DESCRIPTION)
#define ISAPI_SERVER_VAR_BUF_SIZE 1024
#define ISAPI_POST_DATA_BUF 1024
@@ -245,8 +245,8 @@
char *combined_headers, *combined_headers_ptr;
LPEXTENSION_CONTROL_BLOCK lpECB = (LPEXTENSION_CONTROL_BLOCK)
SG(server_context);
HSE_SEND_HEADER_EX_INFO header_info;
- char status_buf[MAX_STATUS_LENGTH];
sapi_header_struct default_content_type;
+ char *status_buf = NULL;
/* Obtain headers length */
if (SG(sapi_headers).send_default_content_type) {
@@ -277,10 +277,21 @@
case 401:
header_info.pszStatus = 401 Authorization Required;
break;
- default:
- snprintf(status_buf, MAX_STATUS_LENGTH, %d
Undescribed, SG(sapi_headers).http_response_code);
+ default: {
+ const char *sline = SG(sapi_headers).http_status_line;
+
+ status_buf = emalloc(MAX_STATUS_LENGTH + 1);
+
+ /* httpd requires that r-status_line is set to the
first digit of
+* the status-code: */
+ if (sline strlen(sline) 12 strncmp(sline,
HTTP/1., 7) == 0 sline[8] == ' ') {
+ status_buf = estrndup(sline + 9,
MAX_STATUS_LENGTH);
+ } else {
+ snprintf(status_buf, MAX_STATUS_LENGTH, %d
Undescribed, SG(sapi_headers).http_response_code);
+ }
header_info.pszStatus = status_buf;
break;
+ }
}
header_info.cchStatus = strlen(header_info.pszStatus);
header_info.pszHeader = combined_headers;
@@ -291,6 +302,9 @@
lpECB-ServerSupportFunction(lpECB-ConnID,
HSE_REQ_SEND_RESPONSE_HEADER_EX, header_info, NULL, NULL);
efree(combined_headers);
+ if (status_buf) {
+ efree(status_buf);
+ }
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
@@ -306,7 +320,6 @@
}
-
static int sapi_isapi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
LPEXTENSION_CONTROL_BLOCK lpECB = (LPEXTENSION_CONTROL_BLOCK)
SG(server_context);
--
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 /ext/standard datetime.c
iliaa Thu Apr 14 09:30:27 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard datetime.c
Log:
Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance
mode).
Patch by: mike at php dot net
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.875r2=1.1247.2.876ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.875 php-src/NEWS:1.1247.2.876
--- php-src/NEWS:1.1247.2.875 Wed Apr 13 17:27:32 2005
+++ php-src/NEWSThu Apr 14 09:30:23 2005
@@ -19,6 +19,8 @@
(Uwe Schindler)
- Fixed bug #32311 (mb_encode_mimeheader() does not properly escape
characters).
(Moriyoshi)
+- Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance
mode).
+ (mike at php dot net)
31 Mar 2005, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.96.2.18r2=1.96.2.19ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.96.2.18
php-src/ext/standard/datetime.c:1.96.2.19
--- php-src/ext/standard/datetime.c:1.96.2.18 Fri Feb 4 08:09:24 2005
+++ php-src/ext/standard/datetime.c Thu Apr 14 09:30:27 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: datetime.c,v 1.96.2.18 2005/02/04 13:09:24 sniper Exp $ */
+/* $Id: datetime.c,v 1.96.2.19 2005/04/14 13:30:27 iliaa Exp $ */
#include php.h
#include zend_operators.h
@@ -781,7 +781,7 @@
tm1-tm_hour, tm1-tm_min, tm1-tm_sec);
} else {
snprintf(str, 80, %s, %02d-%s-%02d %02d:%02d:%02d GMT,
- day_short_names[tm1-tm_wday],
+ day_full_names[tm1-tm_wday],
tm1-tm_mday,
mon_short_names[tm1-tm_mon],
((tm1-tm_year) % 100),
--
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
sniper Thu Apr 14 11:48:41 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.876r2=1.1247.2.877ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.876 php-src/NEWS:1.1247.2.877 --- php-src/NEWS:1.1247.2.876 Thu Apr 14 09:30:23 2005 +++ php-src/NEWSThu Apr 14 11:48:38 2005 @@ -5,6 +5,8 @@ them sort based on the current locale. (Derick) - Fixed bug #32699 (pg_affected_rows() was defined when it was not available). (Derick) +- Fixed bug #32682 (ext/mssql: Error on module shutdown when called from + activescript). (Frank) - Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani) - Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets). (Ilia) -- 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 /ext/mbstring/libmbfl/mbfl mbfilter.c
moriyoshi Wed Apr 13 04:08:29 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
- MFH: commit the pending patch (bug #32311).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.873r2=1.1247.2.874ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.873 php-src/NEWS:1.1247.2.874
--- php-src/NEWS:1.1247.2.873 Fri Apr 8 16:35:01 2005
+++ php-src/NEWSWed Apr 13 04:08:25 2005
@@ -15,6 +15,8 @@
longer then the original string). (Ilia)
- Fixed bug #32491 (File upload error - unable to create a temporary file).
(Uwe Schindler)
+- Fixed bug #32311 (mb_encode_mimeheader() does not properly escape
characters).
+ (Moriyoshi)
31 Mar 2005, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.1.2.5r2=1.1.2.6ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.5
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.6
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.5Wed Mar 23
18:57:42 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cWed Apr 13 04:08:28 2005
@@ -1960,6 +1960,25 @@
static int
mime_header_encoder_collector(int c, void *data)
{
+ static int qp_table[256] = {
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */
+ 0, 0, 0, 0, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 1, 0, 1, /* 0x10 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 0x50 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x60 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 0x70 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x80 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x90 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xA0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xB0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xC0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xD0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xE0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* 0xF0 */
+ };
+
int n;
struct mime_header_encoder_data *pe = (struct mime_header_encoder_data
*)data;
@@ -1969,7 +1988,7 @@
break;
default:/* ASCII */
- if (c = 0x21 c 0x7f) {/* ASCII exclude SPACE and CTLs
*/
+ if (!qp_table[(c 0xff)]) { /* ordinary characters */
mbfl_memory_device_output(c, pe-tmpdev);
pe-status1 = 1;
} else if (pe-status1 == 0 c == 0x20) { /* repeat SPACE
*/
--
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 /ext/pgsql pgsql.c php_pgsql.h
derick Wed Apr 13 17:27:36 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/pgsql pgsql.c php_pgsql.h
Log:
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.874r2=1.1247.2.875ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.874 php-src/NEWS:1.1247.2.875
--- php-src/NEWS:1.1247.2.874 Wed Apr 13 04:08:25 2005
+++ php-src/NEWSWed Apr 13 17:27:32 2005
@@ -3,6 +3,8 @@
?? ??? 20??, Version 4.?.?
- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
them sort based on the current locale. (Derick)
+- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
+ (Derick)
- Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani)
- Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
(Ilia)
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.244.2.36r2=1.244.2.37ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.36
php-src/ext/pgsql/pgsql.c:1.244.2.37
--- php-src/ext/pgsql/pgsql.c:1.244.2.36Wed May 12 12:49:56 2004
+++ php-src/ext/pgsql/pgsql.c Wed Apr 13 17:27:34 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.244.2.36 2004/05/12 16:49:56 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.244.2.37 2005/04/13 21:27:34 derick Exp $ */
#include stdlib.h
@@ -100,7 +100,9 @@
PHP_FE(pg_fetch_array, NULL)
PHP_FE(pg_fetch_object, NULL)
PHP_FE(pg_fetch_all,NULL)
+#if HAVE_PQCMDTUPLES
PHP_FE(pg_affected_rows,NULL)
+#endif
PHP_FE(pg_get_result, NULL)
PHP_FE(pg_result_seek, NULL)
PHP_FE(pg_result_status,NULL)
@@ -1077,6 +1079,7 @@
}
/* }}} */
+#if HAVE_PQCMDTUPLES
/* {{{ proto int pg_affected_rows(resource result)
Returns the number of affected tuples */
PHP_FUNCTION(pg_affected_rows)
@@ -1084,6 +1087,7 @@
php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_CMD_TUPLES);
}
/* }}} */
+#endif
/* {{{ proto string pg_last_notice(resource connection)
Returns the last notice set by the backend */
http://cvs.php.net/diff.php/php-src/ext/pgsql/php_pgsql.h?r1=1.56.2.3r2=1.56.2.4ty=u
Index: php-src/ext/pgsql/php_pgsql.h
diff -u php-src/ext/pgsql/php_pgsql.h:1.56.2.3
php-src/ext/pgsql/php_pgsql.h:1.56.2.4
--- php-src/ext/pgsql/php_pgsql.h:1.56.2.3 Sat May 31 08:59:19 2003
+++ php-src/ext/pgsql/php_pgsql.h Wed Apr 13 17:27:35 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_pgsql.h,v 1.56.2.3 2003/05/31 12:59:19 helly Exp $ */
+/* $Id: php_pgsql.h,v 1.56.2.4 2005/04/13 21:27:35 derick Exp $ */
#ifndef PHP_PGSQL_H
#define PHP_PGSQL_H
@@ -83,7 +83,9 @@
PHP_FUNCTION(pg_fetch_result);
PHP_FUNCTION(pg_fetch_row);
PHP_FUNCTION(pg_fetch_all);
+#if HAVE_PQCMDTUPLES
PHP_FUNCTION(pg_affected_rows);
+#endif
PHP_FUNCTION(pg_get_result);
PHP_FUNCTION(pg_result_seek);
PHP_FUNCTION(pg_result_status);
--
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 /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c
sniper Fri Apr 8 16:35:02 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/sapi/apache2filter sapi_apache2.c
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH: - Fixed bug #32587 (Apache2: errors sent to error_log do not include
timestamps)
# Also nuked the deprecated APLOG_NOERRNO's
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.872r2=1.1247.2.873ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.872 php-src/NEWS:1.1247.2.873
--- php-src/NEWS:1.1247.2.872 Thu Apr 7 18:24:21 2005
+++ php-src/NEWSFri Apr 8 16:35:01 2005
@@ -6,6 +6,8 @@
- Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani)
- Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
(Ilia)
+- Fixed bug #32587 (Apache2: errors sent to error_log do not include
+ timestamps). (Jani)
- Fixed bug #32567 (ext/gmp fails to compile in threadsafe mode). (Tony)
- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer).
(adam dot greenfield at gmail dot com)
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.91.2.26r2=1.91.2.27ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.26
php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.27
--- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.26 Fri Jan 7 01:28:36 2005
+++ php-src/sapi/apache2filter/sapi_apache2.c Fri Apr 8 16:35:02 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.91.2.26 2005/01/07 06:28:36 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.27 2005/04/08 20:35:02 sniper Exp $ */
#include fcntl.h
@@ -267,18 +267,11 @@
ctx = SG(server_context);
- /* We use APLOG_STARTUP because it keeps us from printing the
-* data and time information at the beginning of the error log
-* line. Not sure if this is correct, but it mirrors what happens
-* with Apache 1.3 -- rbb
-*/
if (ctx == NULL) { /* we haven't initialized our ctx yet, oh well */
- ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO |
APLOG_STARTUP,
-0, NULL, %s, msg);
+ ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, NULL,
%s, msg);
}
else {
- ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO |
APLOG_STARTUP,
-0, ctx-r-server, %s, msg);
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctx-r-server, %s,
msg);
}
}
@@ -356,7 +349,7 @@
ctx = SG(server_context);
if (ctx == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, f-r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f-r,
php failed to get server context);
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -467,7 +460,7 @@
ctx = SG(server_context);
if (ctx == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, f-r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f-r,
php failed to get server context);
zend_try {
zend_ini_deactivate(TSRMLS_C);
@@ -627,7 +620,7 @@
/* for those who still have Set*Filter PHP configured */
while (f) {
if (strcmp(f-frec-name, PHP) == 0) {
- ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
+ ap_log_error(APLOG_MARK, APLOG_WARNING,
0, r-server,
\Set%sFilter PHP\ already configured
for %s,
output ? Output : Input, r-uri);
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.39r2=1.1.2.40ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.39
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.39 Thu Mar 10 06:39:04 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Apr 8 16:35:02 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.39 2005/03/10 11:39:04 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40 2005/04/08 20:35:02 sniper Exp $ */
#include fcntl.h
@@ -268,23 +268,18 @@
TSRMLS_FETCH();
ctx = SG(server_context);
-
- /* We use APLOG_STARTUP because it keeps us from printing the
-* data and time information at the beginning of the error log
-* line. Not sure if this is correct, but it mirrors what happens
-* with Apache 1.3 -- rbb
-*/
+
if (ctx == NULL) { /*
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
sniper Thu Apr 7 18:24:23 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.871r2=1.1247.2.872ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.871 php-src/NEWS:1.1247.2.872 --- php-src/NEWS:1.1247.2.871 Tue Apr 5 10:49:09 2005 +++ php-src/NEWSThu Apr 7 18:24:21 2005 @@ -3,6 +3,7 @@ ?? ??? 20??, Version 4.?.? - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes them sort based on the current locale. (Derick) +- Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani) - Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets). (Ilia) - Fixed bug #32567 (ext/gmp fails to compile in threadsafe mode). (Tony) -- 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 /ext/imap php_imap.c
iliaa Tue Apr 5 10:49:11 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/imap php_imap.c
Log:
MFH: Fixed bug #32589 (Possible crash inside imap_mail_compose, with
charsets).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.870r2=1.1247.2.871ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.870 php-src/NEWS:1.1247.2.871
--- php-src/NEWS:1.1247.2.870 Mon Apr 4 12:30:41 2005
+++ php-src/NEWSTue Apr 5 10:49:09 2005
@@ -3,6 +3,8 @@
?? ??? 20??, Version 4.?.?
- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
them sort based on the current locale. (Derick)
+- Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
+ (Ilia)
- Fixed bug #32567 (ext/gmp fails to compile in threadsafe mode). (Tony)
- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer).
(adam dot greenfield at gmail dot com)
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.42r2=1.142.2.43ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.42
php-src/ext/imap/php_imap.c:1.142.2.43
--- php-src/ext/imap/php_imap.c:1.142.2.42 Tue Jan 25 09:23:37 2005
+++ php-src/ext/imap/php_imap.c Tue Apr 5 10:49:10 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.142.2.42 2005/01/25 14:23:37 tony2001 Exp $ */
+/* $Id: php_imap.c,v 1.142.2.43 2005/04/05 14:49:10 iliaa Exp $ */
#define IMAP41
@@ -3015,7 +3015,8 @@
if (zend_hash_find(Z_ARRVAL_PP(data), charset,
sizeof(charset), (void **) pvalue)== SUCCESS) {
convert_to_string_ex(pvalue);
tmp_param = mail_newbody_parameter();
- tmp_param-value = cpystr(Z_STRVAL_PP(pvalue));
+ tmp_param-value = (char *)
fs_get(Z_STRLEN_PP(pvalue) + 1);
+ memcpy(disp_param-value, Z_STRVAL_PP(pvalue),
Z_STRLEN_PP(pvalue) + 1);
tmp_param-attribute = CHARSET;
tmp_param-next = bod-parameter;
bod-parameter = tmp_param;
--
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 rfc1867.c
thetaphiMon Apr 4 10:59:58 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main rfc1867.c
Log:
Bug #32491 (File upload error - unable to create a temporary file) - Changing
file upload from stdio to posix
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.868r2=1.1247.2.869ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.868 php-src/NEWS:1.1247.2.869
--- php-src/NEWS:1.1247.2.868 Sun Apr 3 14:09:55 2005
+++ php-src/NEWSMon Apr 4 10:59:56 2005
@@ -7,6 +7,8 @@
(adam dot greenfield at gmail dot com)
- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is
longer then the original string). (Ilia)
+- Fixed bug #32491 (File upload error - unable to create a temporary file).
+ (Uwe Schindler)
31 Mar 2005, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.122.2.33r2=1.122.2.34ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.33 php-src/main/rfc1867.c:1.122.2.34
--- php-src/main/rfc1867.c:1.122.2.33 Mon Feb 14 19:28:39 2005
+++ php-src/main/rfc1867.c Mon Apr 4 10:59:58 2005
@@ -16,7 +16,7 @@
| Jani Taskinen [EMAIL PROTECTED] |
+--+
*/
-/* $Id: rfc1867.c,v 1.122.2.33 2005/02/15 00:28:39 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.34 2005/04/04 14:59:58 thetaphi Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -779,7 +779,7 @@
zend_bool magic_quotes_gpc;
multipart_buffer *mbuff;
zval *array_ptr = (zval *) arg;
- FILE *fp;
+ int fd=-1;
zend_llist header;
if (SG(request_info).content_length SG(post_max_size)) {
@@ -962,8 +962,8 @@
if (!skip_upload) {
/* Handle file */
- fp =
php_open_temporary_file(PG(upload_tmp_dir), php, temp_filename TSRMLS_CC);
- if (!fp) {
+ fd = php_open_temporary_fd(PG(upload_tmp_dir),
php, temp_filename TSRMLS_CC);
+ if (fd==-1) {
sapi_module.sapi_error(E_WARNING, File
upload error - unable to create a temporary file);
cancel_upload = UPLOAD_ERROR_E;
}
@@ -990,7 +990,7 @@
sapi_module.sapi_error(E_WARNING,
MAX_FILE_SIZE of %ld bytes exceeded - file [%s=%s] not saved, max_file_size,
param, filename);
cancel_upload = UPLOAD_ERROR_B;
} else if (blen 0) {
- wlen = fwrite(buff, 1, blen, fp);
+ wlen = write(fd, buff, blen);
if (wlen blen) {
sapi_module.sapi_error(E_WARNING, Only %d bytes were written, expected to
write %d, wlen, blen);
@@ -1000,8 +1000,8 @@
}
}
}
- if (fp) {
- fclose(fp);
+ if (fd!=-1) {
+ close(fd);
}
#ifdef DEBUG_FILE_UPLOAD
--
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 /ext/gmp gmp.c
tony2001Mon Apr 4 12:30:42 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/gmpgmp.c
Log:
fix #32567 (ext/gmp fails to compile with thread safety enabled)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.869r2=1.1247.2.870ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.869 php-src/NEWS:1.1247.2.870
--- php-src/NEWS:1.1247.2.869 Mon Apr 4 10:59:56 2005
+++ php-src/NEWSMon Apr 4 12:30:41 2005
@@ -3,6 +3,7 @@
?? ??? 20??, Version 4.?.?
- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
them sort based on the current locale. (Derick)
+- Fixed bug #32567 (ext/gmp fails to compile in threadsafe mode). (Tony)
- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer).
(adam dot greenfield at gmail dot com)
- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is
http://cvs.php.net/diff.php/php-src/ext/gmp/gmp.c?r1=1.29.4.12r2=1.29.4.13ty=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.29.4.12 php-src/ext/gmp/gmp.c:1.29.4.13
--- php-src/ext/gmp/gmp.c:1.29.4.12 Tue Mar 1 08:18:31 2005
+++ php-src/ext/gmp/gmp.c Mon Apr 4 12:30:42 2005
@@ -205,7 +205,7 @@
if(Z_TYPE_PP(zval) == IS_RESOURCE) { \
ZEND_FETCH_RESOURCE(gmpnumber, mpz_t *, zval, -1, GMP_RESOURCE_NAME,
le_gmp);\
} else {\
- if(convert_to_gmp(gmpnumber, zval, 0) == FAILURE) {\
+ if(convert_to_gmp(gmpnumber, zval, 0 TSRMLS_CC) == FAILURE) {\
RETURN_FALSE;\
}\
ZEND_REGISTER_RESOURCE(NULL, gmpnumber, le_gmp);\
@@ -217,7 +217,7 @@
/* {{{ convert_to_gmp
* Convert zval to be gmp number */
-static int convert_to_gmp(mpz_t * *gmpnumber, zval **val, int base)
+static int convert_to_gmp(mpz_t * *gmpnumber, zval **val, int base TSRMLS_DC)
{
int ret = 0;
int skip_lead = 0;
@@ -509,7 +509,7 @@
}
}
- if(convert_to_gmp(gmpnumber, number_arg, base) == FAILURE) {
+ if(convert_to_gmp(gmpnumber, number_arg, base TSRMLS_CC) == FAILURE) {
RETURN_FALSE;
}
--
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 /ext/standard string.c /ext/standard/tests/strings chunk_split.phpt
iliaa Sun Apr 3 14:09:57 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings chunk_split.phpt
/php-srcNEWS
Log:
MFH: Fixed bug #32530 (chunk_split() does not append endstr if chunklen is
longer then the original string).
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.333.2.48r2=1.333.2.49ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.48
php-src/ext/standard/string.c:1.333.2.49
--- php-src/ext/standard/string.c:1.333.2.48Thu Jan 20 12:57:41 2005
+++ php-src/ext/standard/string.c Sun Apr 3 14:09:54 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.333.2.48 2005/01/20 17:57:41 iliaa Exp $ */
+/* $Id: string.c,v 1.333.2.49 2005/04/03 18:09:54 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1576,7 +1576,13 @@
}
if (chunklen Z_STRLEN_PP(p_str)) {
- RETURN_STRINGL(Z_STRVAL_PP(p_str), Z_STRLEN_PP(p_str), 1);
+ /* to maintain BC, we must return original string + ending */
+ result_len = endlen + Z_STRLEN_PP(p_str);
+ result = emalloc(result_len + 1);
+ memcpy(result, Z_STRVAL_PP(p_str), Z_STRLEN_PP(p_str));
+ memcpy(result + Z_STRLEN_PP(p_str), end, endlen);
+ result[result_len] = '\0';
+ RETURN_STRINGL(result, result_len, 0);
}
if (!Z_STRLEN_PP(p_str)) {
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/chunk_split.phpt?r1=1.1r2=1.1.2.1ty=u
Index: php-src/ext/standard/tests/strings/chunk_split.phpt
diff -u php-src/ext/standard/tests/strings/chunk_split.phpt:1.1
php-src/ext/standard/tests/strings/chunk_split.phpt:1.1.2.1
--- php-src/ext/standard/tests/strings/chunk_split.phpt:1.1 Sun Oct 6
15:12:22 2002
+++ php-src/ext/standard/tests/strings/chunk_split.phpt Sun Apr 3 14:09:55 2005
@@ -7,6 +7,7 @@
echo chunk_split('abc', 1, '-').\n;
echo chunk_split('f', 5).\n;
echo chunk_split(str_repeat('X', 2*76)).\n;
+echo chunk_split(test, 10, |end) . \n;
?
--EXPECT--
a-b-c-
@@ -17,3 +18,5 @@
+
+test|end
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.867r2=1.1247.2.868ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.867 php-src/NEWS:1.1247.2.868
--- php-src/NEWS:1.1247.2.867 Sat Apr 2 01:03:12 2005
+++ php-src/NEWSSun Apr 3 14:09:55 2005
@@ -5,6 +5,8 @@
them sort based on the current locale. (Derick)
- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer).
(adam dot greenfield at gmail dot com)
+- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is
+ longer then the original string). (Ilia)
31 Mar 2005, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
--
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 /ext/swf swf.c
sniper Sat Apr 2 01:03:15 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/swfswf.c
Log:
- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.866r2=1.1247.2.867ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.866 php-src/NEWS:1.1247.2.867
--- php-src/NEWS:1.1247.2.866 Thu Mar 31 03:18:39 2005
+++ php-src/NEWSSat Apr 2 01:03:12 2005
@@ -3,6 +3,8 @@
?? ??? 20??, Version 4.?.?
- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
them sort based on the current locale. (Derick)
+- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer).
+ (adam dot greenfield at gmail dot com)
31 Mar 2005, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
http://cvs.php.net/diff.php/php-src/ext/swf/swf.c?r1=1.46.2.4r2=1.46.2.5ty=u
Index: php-src/ext/swf/swf.c
diff -u php-src/ext/swf/swf.c:1.46.2.4 php-src/ext/swf/swf.c:1.46.2.5
--- php-src/ext/swf/swf.c:1.46.2.4 Thu Dec 23 13:29:36 2004
+++ php-src/ext/swf/swf.c Sat Apr 2 01:03:14 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: swf.c,v 1.46.2.4 2004/12/23 18:29:36 iliaa Exp $ */
+/* $Id: swf.c,v 1.46.2.5 2005/04/02 06:03:14 sniper Exp $ */
#ifdef HAVE_CONFIG_H
@@ -240,7 +240,10 @@
na = tmpna;
#endif
if (php_check_open_basedir(na TSRMLS_CC) || (PG(safe_mode)
!php_checkuid(na, wb+, CHECKUID_CHECK_MODE_PARAM))) {
- goto err;
+#ifdef VIRTUAL_DIR
+ free(na);
+#endif
+ return;
}
if (!SWFG(use_file))
@@ -249,10 +252,6 @@
swf_openfile(na,(float)Z_DVAL_PP(sizeX), (float)Z_DVAL_PP(sizeY),
(float)Z_DVAL_PP(frameRate), (float)Z_DVAL_PP(r),
(float)Z_DVAL_PP(g), (float)Z_DVAL_PP(b));
-err:
-#ifdef VIRTUAL_DIR
- free(na);
-#endif
}
/* }}} */
--
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 /ext/standard array.c Zend zend_config.w32.h zend_operators.c zend_operators.h
sniper Thu Mar 31 03:18:41 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/Zend zend_config.w32.h zend_operators.c zend_operators.h
/php-src/ext/standard array.c
Log:
MFH: Added SORT_LOCALE_STRING for array sorting
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.865r2=1.1247.2.866ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.865 php-src/NEWS:1.1247.2.866
--- php-src/NEWS:1.1247.2.865 Wed Mar 30 09:18:36 2005
+++ php-src/NEWSThu Mar 31 03:18:39 2005
@@ -1,5 +1,9 @@
PHP 4 NEWS
|||
+?? ??? 20??, Version 4.?.?
+- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
+ them sort based on the current locale. (Derick)
+
31 Mar 2005, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
- Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem()
http://cvs.php.net/diff.php/Zend/zend_config.w32.h?r1=1.26.4.3r2=1.26.4.4ty=u
Index: Zend/zend_config.w32.h
diff -u Zend/zend_config.w32.h:1.26.4.3 Zend/zend_config.w32.h:1.26.4.4
--- Zend/zend_config.w32.h:1.26.4.3 Mon Mar 24 17:56:29 2003
+++ Zend/zend_config.w32.h Thu Mar 31 03:18:39 2005
@@ -45,6 +45,7 @@
#define HAVE_STDARG_H 1
#define HAVE_SNPRINTF 1
#define HAVE_VSNPRINTF 1
+#define HAVE_STRCOLL 1
#define snprintf _snprintf
#define strcasecmp(s1, s2) stricmp(s1, s2)
http://cvs.php.net/diff.php/Zend/zend_operators.c?r1=1.129.2.9r2=1.129.2.10ty=u
Index: Zend/zend_operators.c
diff -u Zend/zend_operators.c:1.129.2.9 Zend/zend_operators.c:1.129.2.10
--- Zend/zend_operators.c:1.129.2.9 Mon Nov 29 04:15:28 2004
+++ Zend/zend_operators.c Thu Mar 31 03:18:39 2005
@@ -1108,6 +1108,35 @@
return SUCCESS;
}
+#if HAVE_STRCOLL
+ZEND_API int string_locale_compare_function(zval *result, zval *op1, zval *op2
TSRMLS_DC)
+{
+ zval op1_copy, op2_copy;
+ int use_copy1, use_copy2;
+
+ zend_make_printable_zval(op1, op1_copy, use_copy1);
+ zend_make_printable_zval(op2, op2_copy, use_copy2);
+
+ if (use_copy1) {
+ op1 = op1_copy;
+ }
+ if (use_copy2) {
+ op2 = op2_copy;
+ }
+
+ result-value.lval = strcoll(op1-value.str.val, op2-value.str.val);
+ result-type = IS_LONG;
+
+ if (use_copy1) {
+ zval_dtor(op1);
+ }
+ if (use_copy2) {
+ zval_dtor(op2);
+ }
+ return SUCCESS;
+}
+#endif
+
ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2
TSRMLS_DC)
{
zval op1_copy, op2_copy;
http://cvs.php.net/diff.php/Zend/zend_operators.h?r1=1.55.2.6r2=1.55.2.7ty=u
Index: Zend/zend_operators.h
diff -u Zend/zend_operators.h:1.55.2.6 Zend/zend_operators.h:1.55.2.7
--- Zend/zend_operators.h:1.55.2.6 Tue Mar 15 10:49:29 2005
+++ Zend/zend_operators.h Thu Mar 31 03:18:40 2005
@@ -169,6 +169,9 @@
ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2
TSRMLS_DC);
ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2
TSRMLS_DC);
+#if HAVE_STRCOLL
+ZEND_API int string_locale_compare_function(zval *result, zval *op1, zval *op2
TSRMLS_DC);
+#endif
ZEND_API void zend_str_tolower(char *str, unsigned int length);
ZEND_API int zend_binary_zval_strcmp(zval *s1, zval *s2);
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.199.2.42r2=1.199.2.43ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.199.2.42
php-src/ext/standard/array.c:1.199.2.43
--- php-src/ext/standard/array.c:1.199.2.42 Thu Dec 23 11:40:03 2004
+++ php-src/ext/standard/array.cThu Mar 31 03:18:40 2005
@@ -22,7 +22,7 @@
*/
-/* $Id: array.c,v 1.199.2.42 2004/12/23 16:40:03 tony2001 Exp $ */
+/* $Id: array.c,v 1.199.2.43 2005/03/31 08:18:40 sniper Exp $ */
#include php.h
#include php_ini.h
@@ -66,6 +66,7 @@
#define SORT_REGULAR 0
#define SORT_NUMERIC 1
#defineSORT_STRING 2
+#defineSORT_LOCALE_STRING 5
#define SORT_DESC 3
#define SORT_ASC 4
@@ -103,6 +104,8 @@
REGISTER_LONG_CONSTANT(SORT_REGULAR, SORT_REGULAR, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SORT_NUMERIC, SORT_NUMERIC, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SORT_STRING, SORT_STRING, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(SORT_LOCALE_STRING, SORT_LOCALE_STRING,
CONST_CS | CONST_PERSISTENT);
+
REGISTER_LONG_CONSTANT(CASE_LOWER, CASE_LOWER, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(CASE_UPPER, CASE_UPPER, CONST_CS |
CONST_PERSISTENT);
@@
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS configure.in /main php_version.h
iliaa Wed Mar 30 09:18:39 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS configure.in
/php-src/main php_version.h
Log:
Tag 4.3.11
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.864r2=1.1247.2.865ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.864 php-src/NEWS:1.1247.2.865
--- php-src/NEWS:1.1247.2.864 Tue Mar 29 12:32:18 2005
+++ php-src/NEWSWed Mar 30 09:18:36 2005
@@ -1,17 +1,11 @@
PHP 4 NEWS
|||
-13 Mar 2005, Version 4.3.11RC1
+31 Mar 2005, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
- Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem()
and gmp_fact() to prevent SIGFPE. (Tony)
- Changed phpize not to require libtool. (Jani)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
- Fixed bugs:
- . Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
- . Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
- . Bug #30573 (compiler warnings in libmbfl due to invalid type cast)
- . Bug #30549 (incorrect character translations for some ISO8859 charsets)
- . Bug #28220 (mb_strwidth() returns wrong width values for some hangul chars)
- Fixed several leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed several leaks in ext/filepro. (Tony)
- Fixed build system to always use bundled libtool files. (Jani)
@@ -22,9 +16,13 @@
- Fixed bug #32200 (Prevent using both --with-apxs2 and --with-apxs2filter).
(Jani)
- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
+- Fixed bug #32063 (mb_convert_encoding ignores named entity 'alpha').
+ (Moriyoshi)
- Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns
with NULL values). (Daniel Convissor)
- Fixed bug #31936 (set_h_errno() is redefined incompatibly). (Jani)
+- Fixed bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes).
+ (Moriyoshi)
- Fixed bug #31858 (--disable-cli does not force --without-pear). (Jani)
- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
(Jani)
@@ -81,6 +79,10 @@
path of the request URI). (kameshj at fastmail dot fm)
- Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia)
- Fixed bug #30609 (cURL functions bypass open_basedir). (Jani)
+- Fixed bug #30573 (compiler warnings in libmbfl due to invalid type cast).
+ (Moriyoshi)
+- Fixed bug #30549 (incorrect character translations for some ISO8859
charsets).
+ (Moriyoshi)
- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence)
- Fixed bug #30430 (odbc_next_result() doesn't bind values and that results
in segfault). (pdan-php at esync dot org, Tony)
@@ -99,6 +101,7 @@
because of fflush() called on already closed filedescriptor). (Tony)
- Fixed bug #28451 (corupt EXIF headers have unlimited recursive IFD directory
entries). (Andrei)
+- Fixed bug #28220 (mb_strwidth() returns wrong width values for some hangul
chars). (Moriyoshi)
- Fixed bug #28086 (crash inside overload() function). (Tony)
- Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
(chris at ex-parrot dot com)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.159r2=1.396.2.160ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.159 php-src/configure.in:1.396.2.160
--- php-src/configure.in:1.396.2.159Wed Mar 23 16:33:53 2005
+++ php-src/configure.inWed Mar 30 09:18:36 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.159 2005/03/23 21:33:53 iliaa Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.396.2.160 2005/03/30 14:18:36 iliaa Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -41,7 +41,7 @@
MAJOR_VERSION=4
MINOR_VERSION=3
RELEASE_VERSION=11
-EXTRA_VERSION=RC2-dev
+EXTRA_VERSION=
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.79r2=1.66.2.80ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.66.2.79
php-src/main/php_version.h:1.66.2.80
--- php-src/main/php_version.h:1.66.2.79Wed Mar 23 16:33:56 2005
+++ php-src/main/php_version.h Wed Mar 30 09:18:37 2005
@@ -3,5 +3,5 @@
#define PHP_MAJOR_VERSION 4
#define PHP_MINOR_VERSION 3
#define PHP_RELEASE_VERSION 11
-#define PHP_EXTRA_VERSION RC2-dev
-#define PHP_VERSION 4.3.11RC2-dev
+#define PHP_EXTRA_VERSION
+#define PHP_VERSION 4.3.11
--
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
iliaa Tue Mar 29 12:32:20 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: patch was reverted. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.863r2=1.1247.2.864ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.863 php-src/NEWS:1.1247.2.864 --- php-src/NEWS:1.1247.2.863 Wed Mar 23 18:57:41 2005 +++ php-src/NEWSTue Mar 29 12:32:18 2005 @@ -21,8 +21,6 @@ - Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob) - Fixed bug #32200 (Prevent using both --with-apxs2 and --with-apxs2filter). (Jani) -- Fixed bug #32160 (file truncation in copy() when source destination are - the same). (Ilia) - Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob) - Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns with NULL values). (Daniel Convissor) -- 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 /ext/mbstring/libmbfl/mbfl mbfilter.c
moriyoshi Wed Mar 23 18:30:19 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
- MFH: fix bug #32311 (mb_encode_mimeheader() does not properly escape
characters).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.860r2=1.1247.2.861ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.860 php-src/NEWS:1.1247.2.861
--- php-src/NEWS:1.1247.2.860 Tue Mar 22 10:09:35 2005
+++ php-src/NEWSWed Mar 23 18:30:17 2005
@@ -6,16 +6,17 @@
and gmp_fact() to prevent SIGFPE. (Tony)
- Changed phpize not to require libtool. (Jani)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
-- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent
- file). (Tony)
-- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob)
-- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
Fixed bugs:
+ . Bug #32311 (mb_encode_mimeheader() does not properly escape characters)
. Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
. Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
. Bug #30573 (compiler warnings in libmbfl due to invalid type cast)
. Bug #30549 (incorrect character translations for some ISO8859 charsets)
. Bug #28220 (mb_strwidth() returns wrong width values for some hangul chars)
+- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent
+ file). (Tony)
+- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob)
+- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
- Fixed several leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed several leaks in ext/filepro. (Tony)
- Fixed build system to always use bundled libtool files. (Jani)
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.1.2.3r2=1.1.2.4ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.3
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.4
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.3Wed Feb 23
08:36:14 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cWed Mar 23 18:30:18 2005
@@ -1960,6 +1960,25 @@
static int
mime_header_encoder_collector(int c, void *data)
{
+ static int qp_table[256] = {
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */
+ 0, 0, 0, 0, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 1, 0, 1, /* 0x10 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 0x50 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x60 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 0x70 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x80 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x90 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xA0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xB0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xC0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xD0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xE0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* 0xF0 */
+ };
+
int n;
struct mime_header_encoder_data *pe = (struct mime_header_encoder_data
*)data;
@@ -1969,7 +1988,7 @@
break;
default:/* ASCII */
- if (c = 0x21 c 0x7f) {/* ASCII exclude SPACE and CTLs
*/
+ if (!qp_table[(c 0xff)]) { /* ordinary characters */
mbfl_memory_device_output(c, pe-tmpdev);
pe-status1 = 1;
} else if (pe-status1 == 0 c == 0x20) { /* repeat SPACE
*/
--
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
moriyoshi Wed Mar 23 18:32:13 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: - Reorder. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.861r2=1.1247.2.862ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.861 php-src/NEWS:1.1247.2.862 --- php-src/NEWS:1.1247.2.861 Wed Mar 23 18:30:17 2005 +++ php-src/NEWSWed Mar 23 18:32:12 2005 @@ -13,18 +13,18 @@ . Bug #30573 (compiler warnings in libmbfl due to invalid type cast) . Bug #30549 (incorrect character translations for some ISO8859 charsets) . Bug #28220 (mb_strwidth() returns wrong width values for some hangul chars) -- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent - file). (Tony) -- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob) -- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob) - Fixed several leaks in ext/browscap and sapi/embed. (Andrei) - Fixed several leaks in ext/filepro. (Tony) - Fixed build system to always use bundled libtool files. (Jani) - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus) +- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent + file). (Tony) +- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob) - Fixed bug #32200 (Prevent using both --with-apxs2 and --with-apxs2filter). (Jani) - Fixed bug #32160 (file truncation in copy() when source destination are the same). (Ilia) +- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob) - Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns with NULL values). (Daniel Convissor) - Fixed bug #31936 (set_h_errno() is redefined incompatibly). (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/mbstring/libmbfl/mbfl mbfilter.c
Moriyoshi Koizumi wrote: moriyoshi Wed Mar 23 18:30:19 2005 EDT Modified files: (Branch: PHP_4_3) /php-src NEWS /php-src/ext/mbstring/libmbfl/mbfl mbfilter.c Log: - MFH: fix bug #32311 (mb_encode_mimeheader() does not properly escape characters). As Zeev had mentioned earlier on the internals list PHP 5.0.4 and 4.3.11 are now in the very final testing phase prior to the release. As far as I can tell this is not a major fix, so I'd appreciate it if you would revert it and commit it once 4.3.11 and 5.0.4 are released. Thanks, Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/mbstring/libmbfl/mbfl mbfilter.c
On 2005/03/24, at 8:34, Ilia Alshanetsky wrote: Moriyoshi Koizumi wrote: moriyoshi Wed Mar 23 18:30:19 2005 EDT Modified files: (Branch: PHP_4_3) /php-src NEWS /php-src/ext/mbstring/libmbfl/mbfl mbfilter.c Log: - MFH: fix bug #32311 (mb_encode_mimeheader() does not properly escape characters). As Zeev had mentioned earlier on the internals list PHP 5.0.4 and 4.3.11 are now in the very final testing phase prior to the release. As far as I can tell this is not a major fix, so I'd appreciate it if you would revert it and commit it once 4.3.11 and 5.0.4 are released. Okay, no problem. Moriyoshi -- 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 /ext/mbstring/libmbfl/mbfl mbfilter.c
moriyoshi Wed Mar 23 18:57:43 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
- Temporary reversion as per release masters' requests.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.862r2=1.1247.2.863ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.862 php-src/NEWS:1.1247.2.863
--- php-src/NEWS:1.1247.2.862 Wed Mar 23 18:32:12 2005
+++ php-src/NEWSWed Mar 23 18:57:41 2005
@@ -7,7 +7,6 @@
- Changed phpize not to require libtool. (Jani)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
Fixed bugs:
- . Bug #32311 (mb_encode_mimeheader() does not properly escape characters)
. Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
. Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
. Bug #30573 (compiler warnings in libmbfl due to invalid type cast)
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.1.2.4r2=1.1.2.5ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.4
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.5
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.4Wed Mar 23
18:30:18 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cWed Mar 23 18:57:42 2005
@@ -1960,25 +1960,6 @@
static int
mime_header_encoder_collector(int c, void *data)
{
- static int qp_table[256] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */
- 0, 0, 0, 0, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 1, 0, 1, /* 0x10 */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 0x50 */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x60 */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 0x70 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x80 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x90 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xA0 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xB0 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xC0 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xD0 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xE0 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* 0xF0 */
- };
-
int n;
struct mime_header_encoder_data *pe = (struct mime_header_encoder_data
*)data;
@@ -1988,7 +1969,7 @@
break;
default:/* ASCII */
- if (!qp_table[(c 0xff)]) { /* ordinary characters */
+ if (c = 0x21 c 0x7f) {/* ASCII exclude SPACE and CTLs
*/
mbfl_memory_device_output(c, pe-tmpdev);
pe-status1 = 1;
} else if (pe-status1 == 0 c == 0x20) { /* repeat SPACE
*/
--
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 /sapi/cli php_cli.c
tony2001Tue Mar 22 10:09:37 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/sapi/cli php_cli.c
Log:
MFH: fix #28803 (enabled debug causes bailout errors with CLI on AIX
because of fflush() called on already closed filedescriptor)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.859r2=1.1247.2.860ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.859 php-src/NEWS:1.1247.2.860
--- php-src/NEWS:1.1247.2.859 Sat Mar 19 08:56:55 2005
+++ php-src/NEWSTue Mar 22 10:09:35 2005
@@ -97,6 +97,8 @@
(eggert at gnu dot org)
- Fixed bug #28804 (ini-file section parsing pattern is buggy).
(wendland at scan-plus dot de)
+- Fixed bug #28803 (enabled debug causes bailout errors with CLI on AIX
+ because of fflush() called on already closed filedescriptor). (Tony)
- Fixed bug #28451 (corupt EXIF headers have unlimited recursive IFD directory
entries). (Andrei)
- Fixed bug #28086 (crash inside overload() function). (Tony)
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.51.2.36r2=1.51.2.37ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.51.2.36
php-src/sapi/cli/php_cli.c:1.51.2.37
--- php-src/sapi/cli/php_cli.c:1.51.2.36Sat Jan 22 15:36:35 2005
+++ php-src/sapi/cli/php_cli.c Tue Mar 22 10:09:36 2005
@@ -214,7 +214,10 @@
static void sapi_cli_flush(void *server_context)
{
- if (fflush(stdout)==EOF) {
+ /* Ignore EBADF here, it's caused by the fact that STDIN/STDOUT/STDERR
streams
+* are/could be closed before fflush() is called.
+*/
+ if (fflush(stdout)==EOF errno!=EBADF) {
php_handle_aborted_connection();
}
}
--
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 /ext/bz2 bz2.c
tony2001Sat Mar 19 08:56:57 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/bz2bz2.c
Log:
MFH: fix segfault in bzopen()
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.858r2=1.1247.2.859ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.858 php-src/NEWS:1.1247.2.859
--- php-src/NEWS:1.1247.2.858 Thu Mar 17 08:13:08 2005
+++ php-src/NEWSSat Mar 19 08:56:55 2005
@@ -6,6 +6,8 @@
and gmp_fact() to prevent SIGFPE. (Tony)
- Changed phpize not to require libtool. (Jani)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
+- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent
+ file). (Tony)
- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob)
- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
Fixed bugs:
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.1.2.3r2=1.1.2.4ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.1.2.3 php-src/ext/bz2/bz2.c:1.1.2.4
--- php-src/ext/bz2/bz2.c:1.1.2.3 Wed Aug 25 10:22:48 2004
+++ php-src/ext/bz2/bz2.c Sat Mar 19 08:56:56 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.1.2.3 2004/08/25 14:22:48 iliaa Exp $ */
+/* $Id: bz2.c,v 1.1.2.4 2005/03/19 13:56:56 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -196,7 +196,7 @@
/* remove the file created by php_stream_open_wrapper(), it is
not needed since BZ2 functions
* failed.
*/
- if (!bz_file mode[0] == 'w') {
+ if (opened_path !bz_file mode[0] == 'w') {
VCWD_UNLINK(*opened_path);
}
}
--
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
rrichards Thu Mar 17 08:13:09 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.857r2=1.1247.2.858ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.857 php-src/NEWS:1.1247.2.858 --- php-src/NEWS:1.1247.2.857 Mon Mar 14 16:11:44 2005 +++ php-src/NEWSThu Mar 17 08:13:08 2005 @@ -6,6 +6,7 @@ and gmp_fact() to prevent SIGFPE. (Tony) - Changed phpize not to require libtool. (Jani) - Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi) +- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob) - Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob) Fixed bugs: . Bug #32063 (mb_convert_encoding ignores named entity 'alpha') -- 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 /ext/curl curl.c
sniper Mon Mar 14 04:03:11 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/curl curl.c
Log:
MFH: - Fixed bug #30609 (cURL functions bypass open_basedir)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.854r2=1.1247.2.855ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.854 php-src/NEWS:1.1247.2.855
--- php-src/NEWS:1.1247.2.854 Sun Mar 13 15:18:42 2005
+++ php-src/NEWSMon Mar 14 04:03:08 2005
@@ -77,6 +77,7 @@
- Fixed bug #31055 (apache2filter: per request leak proportional to the full
path of the request URI). (kameshj at fastmail dot fm)
- Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia)
+- Fixed bug #30609 (cURL functions bypass open_basedir). (Jani)
- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence)
- Fixed bug #30430 (odbc_next_result() doesn't bind values and that results
in segfault). (pdan-php at esync dot org, Tony)
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.28r2=1.124.2.29ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.28 php-src/ext/curl/curl.c:1.124.2.29
--- php-src/ext/curl/curl.c:1.124.2.28 Thu Jan 6 05:34:03 2005
+++ php-src/ext/curl/curl.c Mon Mar 14 04:03:09 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: curl.c,v 1.124.2.28 2005/01/06 10:34:03 jorton Exp $ */
+/* $Id: curl.c,v 1.124.2.29 2005/03/14 09:03:09 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -50,6 +50,7 @@
#include ext/standard/php_smart_str.h
#include ext/standard/info.h
#include ext/standard/file.h
+#include ext/standard/url.h
#include php_curl.h
static int le_curl;
@@ -64,6 +65,26 @@
#define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v,
1);
#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
+#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len)
\
+ if (PG(open_basedir) *PG(open_basedir)
\
+ strncasecmp(str, file://, sizeof(file://) - 1) == 0)
\
+ {
\
+ php_url *tmp_url;
\
+
\
+ if (!(tmp_url = php_url_parse_ex(str, len))) {
\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid
url '%s', str); \
+ RETURN_FALSE;
\
+ }
\
+
\
+ if (php_check_open_basedir(tmp_url-path TSRMLS_CC) ||
\
+ (PG(safe_mode) !php_checkuid(tmp_url-path, rb+,
CHECKUID_CHECK_MODE_PARAM)) \
+ ) {
\
+ php_url_free(tmp_url);
\
+ RETURN_FALSE;
\
+ }
\
+ php_url_free(tmp_url);
\
+ }
+
/* {{{ curl_functions[]
*/
function_entry curl_functions[] = {
@@ -682,6 +703,11 @@
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/openssl openssl.c
sniper Mon Mar 14 16:01:03 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/opensslopenssl.c
Log:
MFH: - Fixed bug #18613 (Multiple OUs in x509 certificate not handled
properly)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.855r2=1.1247.2.856ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.855 php-src/NEWS:1.1247.2.856
--- php-src/NEWS:1.1247.2.855 Mon Mar 14 04:03:08 2005
+++ php-src/NEWSMon Mar 14 16:01:01 2005
@@ -100,6 +100,7 @@
- Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping). (Derick,
Benjamin Greiner)
- Fixed bug #27633 (Double \r problem on ftp_get in ASCII mode on Win32).
(Ilia)
+- Fixed bug #18613 (Multiple OUs in x509 certificate not handled properly).
(Jani)
- Fixed bug #7782 (Cannot use PATH_INFO fully with php isapi). (Unknown)
15 Dec 2004, Version 4.3.10
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.52.2.20r2=1.52.2.21ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.52.2.20
php-src/ext/openssl/openssl.c:1.52.2.21
--- php-src/ext/openssl/openssl.c:1.52.2.20 Thu Feb 17 04:26:10 2005
+++ php-src/ext/openssl/openssl.c Mon Mar 14 16:01:02 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.52.2.20 2005/02/17 09:26:10 sniper Exp $ */
+/* $Id: openssl.c,v 1.52.2.21 2005/03/14 21:01:02 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -208,9 +208,9 @@
static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int
shortname TSRMLS_DC)
{
- zval * subitem;
- int i;
- char * sn, * ln;
+ zval *subitem, *subentries;
+ int i, j = -1, last = -1, obj_cnt = 0;
+ char *sname;
int nid;
X509_NAME_ENTRY * ne;
ASN1_STRING * str;
@@ -222,14 +222,39 @@
for (i = 0; i X509_NAME_entry_count(name); i++) {
ne = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne);
- str = X509_NAME_ENTRY_get_data(ne);
nid = OBJ_obj2nid(obj);
+ obj_cnt = 0;
+
if (shortname) {
- sn = (char*)OBJ_nid2sn(nid);
- add_assoc_stringl(subitem, sn, str-data, str-length,
1);
+ sname = (char *) OBJ_nid2sn(nid);
+ } else {
+ sname = (char *) OBJ_nid2ln(nid);
+ }
+
+ MAKE_STD_ZVAL(subentries);
+ array_init(subentries);
+
+ last = -1;
+ for (;;) {
+ j = X509_NAME_get_index_by_OBJ(name, obj, last);
+ if (j 0) {
+ if (last != -1) break;
+ } else {
+ obj_cnt++;
+ ne = X509_NAME_get_entry(name, j);
+ str = X509_NAME_ENTRY_get_data(ne);
+ add_next_index_stringl(subentries, str-data,
str-length, 1);
+ }
+ last = j;
+ }
+ i = last;
+
+ if (obj_cnt 1) {
+ add_assoc_zval_ex(subitem, sname, strlen(sname) + 1,
subentries);
} else {
- ln = (char*)OBJ_nid2ln(nid);
- add_assoc_stringl(subitem, ln, str-data, str-length,
1);
+ zval_dtor(subentries);
+ FREE_ZVAL(subentries);
+ add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
}
}
zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void *)subitem,
sizeof(subitem), NULL);
--
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 configure.in
sniper Mon Mar 14 16:11:46 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS configure.in Log: MFH http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.856r2=1.1247.2.857ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.856 php-src/NEWS:1.1247.2.857 --- php-src/NEWS:1.1247.2.856 Mon Mar 14 16:01:01 2005 +++ php-src/NEWSMon Mar 14 16:11:44 2005 @@ -17,6 +17,8 @@ - Fixed several leaks in ext/filepro. (Tony) - Fixed build system to always use bundled libtool files. (Jani) - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus) +- Fixed bug #32200 (Prevent using both --with-apxs2 and --with-apxs2filter). + (Jani) - Fixed bug #32160 (file truncation in copy() when source destination are the same). (Ilia) - Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.154r2=1.396.2.155ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.154 php-src/configure.in:1.396.2.155 --- php-src/configure.in:1.396.2.154Sun Mar 13 16:54:54 2005 +++ php-src/configure.inMon Mar 14 16:11:45 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.154 2005/03/13 21:54:54 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.155 2005/03/14 21:11:45 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -81,6 +81,10 @@ AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together]) fi +if test -n $with_apxs2filter test -n $with_apxs2; then + AC_MSG_ERROR([--with-apxs2filter and --with-apxs2 cannot be used together]) +fi + dnl Settings we want to make before the checks. dnl - -- 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 configure.in /main php_version.h
iliaa Sun Mar 13 15:18:44 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS configure.in /php-src/main php_version.h Log: 4.3.11RC1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.853r2=1.1247.2.854ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.853 php-src/NEWS:1.1247.2.854 --- php-src/NEWS:1.1247.2.853 Wed Mar 9 21:04:17 2005 +++ php-src/NEWSSun Mar 13 15:18:42 2005 @@ -1,6 +1,6 @@ PHP 4 NEWS ||| -?? ??? , Version 4.3.11 +13 Mar 2005, Version 4.3.11RC1 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem() and gmp_fact() to prevent SIGFPE. (Tony) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.152r2=1.396.2.153ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.152 php-src/configure.in:1.396.2.153 --- php-src/configure.in:1.396.2.152Thu Feb 10 17:20:27 2005 +++ php-src/configure.inSun Mar 13 15:18:43 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.152 2005/02/10 22:20:27 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.153 2005/03/13 20:18:43 iliaa Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=3 RELEASE_VERSION=11 -EXTRA_VERSION=-dev +EXTRA_VERSION=RC1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.75r2=1.66.2.76ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.75 php-src/main/php_version.h:1.66.2.76 --- php-src/main/php_version.h:1.66.2.75Wed Dec 15 10:05:11 2004 +++ php-src/main/php_version.h Sun Mar 13 15:18:44 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 11 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 4.3.11-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 4.3.11RC1 -- 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 /ext/standard html.c
derick Wed Mar 9 05:11:16 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard html.c
Log:
- Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
(Derick,
Benjamin Greiner)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.851r2=1.1247.2.852ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.851 php-src/NEWS:1.1247.2.852
--- php-src/NEWS:1.1247.2.851 Mon Mar 7 13:14:41 2005
+++ php-src/NEWSWed Mar 9 05:11:11 2005
@@ -95,6 +95,8 @@
- Fixed bug #28086 (crash inside overload() function). (Tony)
- Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
(chris at ex-parrot dot com)
+- Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping). (Derick,
+ Benjamin Greiner)
- Fixed bug #27633 (Double \r problem on ftp_get in ASCII mode on Win32).
(Ilia)
- Fixed bug #7782 (Cannot use PATH_INFO fully with php isapi). (Unknown)
http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.63.2.22r2=1.63.2.23ty=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.63.2.22
php-src/ext/standard/html.c:1.63.2.23
--- php-src/ext/standard/html.c:1.63.2.22 Tue Jan 11 15:59:27 2005
+++ php-src/ext/standard/html.c Wed Mar 9 05:11:15 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.63.2.22 2005/01/11 20:59:27 moriyoshi Exp $ */
+/* $Id: html.c,v 1.63.2.23 2005/03/09 10:11:15 derick Exp $ */
/*
* HTML entity resources:
@@ -27,6 +27,8 @@
*
http://msdn.microsoft.com/workshop/author/dhtml/reference/charsets/charset3.asp
* http://www.unicode.org/Public/MAPPINGS/OBSOLETE/UNI2SGML.TXT
*
+ * http://www.w3.org/TR/2002/REC-xhtml1-20020801/dtds.html#h-A2
+ *
*/
#include php.h
@@ -109,16 +111,17 @@
NULL, NULL, NULL, NULL,
/* 352 */
Scaron, scaron,
- /* 354 - 375 */
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ /* 354 */
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 376 */
Yuml,
- /* 377 - 401 */
+ /* 377 */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL,
/* 402 */
fnof
};
@@ -145,9 +148,9 @@
sigmaf, sigma, tau, upsilon, phi, chi, psi, omega,
/* 970 - 976 are not mapped */
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- thetasym, ups1h,
+ thetasym, upsih,
NULL, NULL, NULL,
- p1v
+ piv
};
static entity_table_t ent_uni_punct[] = {
@@ -155,7 +158,7 @@
ensp, emsp, NULL, NULL, NULL, NULL, NULL,
thinsp, NULL, NULL, zwnj, zwj, lrm, rlm,
NULL, NULL, NULL, ndash, mdash, NULL, NULL, NULL,
- lsquo, rsquo, sbquo, NULL, ldquo, rdquo, bdquo,
+ lsquo, rsquo, sbquo, NULL, ldquo, rdquo, bdquo, NULL,
dagger, Dagger, bull, NULL, NULL, NULL, hellip,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, permil, NULL,
prime, Prime, NULL, NULL, NULL, NULL, NULL, lsaquo, rsaquo,
@@ -189,7 +192,7 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8624 (0x21b0) */
- NULL, NULL, NULL, NULL, crarr, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, crarr, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8640 (0x21c0) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -204,9 +207,9 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8704 (0x2200) */
forall, comp, part, exist, nexist, empty, NULL, nabla,
- isin, notin, epsis, NULL, ni, bepsi, NULL, prod,
+ isin, notin, epsis, ni, notni, bepsi, NULL, prod,
/* 8720 (0x2210) */
- coprod, sum, minus, mnplus, plusdo, NULL, setmn, NULL,
+ coprod, sum, minus, mnplus, plusdo, NULL, setmn, lowast,
compfn, NULL, radic, NULL, NULL, prop, infin, ang90,
/* 8736 (0x2220) */
ang, angmsd, angsph, mid, nmid, par, npar, and,
@@ -216,7 +219,7 @@
NULL, NULL, NULL, NULL, sim, bsim, NULL, NULL,
/* 8768 (0x2240) */
wreath, nsim, NULL, sime, nsime, cong, NULL, ncong,
- ap, nap, ape, NULL, bcong, asymp, bump, bumpe,
+ asymp, nap, ape, NULL, bcong, asymp, bump, bumpe,
/* 8784 (0x2250) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
--
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
helly Wed Mar 9 21:04:19 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: - BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.852r2=1.1247.2.853ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.852 php-src/NEWS:1.1247.2.853 --- php-src/NEWS:1.1247.2.852 Wed Mar 9 05:11:11 2005 +++ php-src/NEWSWed Mar 9 21:04:17 2005 @@ -48,6 +48,7 @@ non-existent object ref). (Tony) - Fixed bug #31444 (Memory leak in zend_language_scanner.c). (hexer at studentcenter dot org) +- Fixed bug #31442 (unserialize broken on 64-bit systems). (Marcus) - Fixed bug #31440 ($GLOBALS can be overwritten via GPC when register_globals is enabled). (Ilia) - Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms). (Joe) -- 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
sniper Mon Mar 7 13:14:42 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: RBFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.850r2=1.1247.2.851ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.850 php-src/NEWS:1.1247.2.851 --- php-src/NEWS:1.1247.2.850 Sun Mar 6 12:05:40 2005 +++ php-src/NEWSMon Mar 7 13:14:41 2005 @@ -34,8 +34,6 @@ - Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings). (elod at itfais dot com) - Fixed bug #31699 (unserialize() float problem on non-English locales). (Ilia) -- Fixed bug #31672 (/script not used as closing tag after one-line comment). - (Jani) - Fixed bug #31623 (OCILogin does not support password grace period). (daniel dot beet at accuratesoftware dot com, Tony) - Fixed bug #31580 (fgetcsv() problematic with escape sequences). (Ilia) -- 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 /ext/standard image.c
iliaa Sun Mar 6 12:05:42 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/standard image.c Log: MFH: Fixed bug #29424 (width and height inverted for JPEG2000 files). http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.849r2=1.1247.2.850ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.849 php-src/NEWS:1.1247.2.850 --- php-src/NEWS:1.1247.2.849 Wed Mar 2 22:31:57 2005 +++ php-src/NEWSSun Mar 6 12:05:40 2005 @@ -85,6 +85,7 @@ parameters). (Jani) - Fixed bug #29733 (printf() handles repeated placeholders wrong). (bugs dot php dot net at bluetwanger dot de, Ilia) +- Fixed bug #29424 (width and height inverted for JPEG2000 files). (Ilia) - Fixed bug #28976 (mail(): use From: from headers if sendmail_from is empty). (Jani) - Fixed bug #28930 (PHP sources pick wrong header files generated by bison). http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.72.2.17r2=1.72.2.18ty=u Index: php-src/ext/standard/image.c diff -u php-src/ext/standard/image.c:1.72.2.17 php-src/ext/standard/image.c:1.72.2.18 --- php-src/ext/standard/image.c:1.72.2.17 Tue Mar 1 08:53:35 2005 +++ php-src/ext/standard/image.cSun Mar 6 12:05:41 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: image.c,v 1.72.2.17 2005/03/01 13:53:35 sesser Exp $ */ +/* $Id: image.c,v 1.72.2.18 2005/03/06 17:05:41 iliaa Exp $ */ #include php.h #include stdio.h @@ -628,8 +628,8 @@ dummy_short = php_read2(stream TSRMLS_CC); /* Lsiz */ dummy_short = php_read2(stream TSRMLS_CC); /* Rsiz */ - result-height = php_read4(stream TSRMLS_CC); /* Xsiz */ result-width = php_read4(stream TSRMLS_CC); /* Ysiz */ + result-height = php_read4(stream TSRMLS_CC); /* Xsiz */ #if MBO_0 dummy_int = php_read4(stream TSRMLS_CC); /* XOsiz */ -- 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 /ext/standard file.c
iliaa Wed Mar 2 22:32:00 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard file.c
Log:
MFH: Fixed bug #32160 (file truncation in copy() when source destination are
the same).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.848r2=1.1247.2.849ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.848 php-src/NEWS:1.1247.2.849
--- php-src/NEWS:1.1247.2.848 Tue Mar 1 16:34:29 2005
+++ php-src/NEWSWed Mar 2 22:31:57 2005
@@ -17,6 +17,8 @@
- Fixed several leaks in ext/filepro. (Tony)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #32160 (file truncation in copy() when source destination are
+ the same). (Ilia)
- Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns
with NULL values). (Daniel Convissor)
- Fixed bug #31936 (set_h_errno() is redefined incompatibly). (Jani)
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.279.2.68r2=1.279.2.69ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.68
php-src/ext/standard/file.c:1.279.2.69
--- php-src/ext/standard/file.c:1.279.2.68 Mon Jan 17 19:14:56 2005
+++ php-src/ext/standard/file.c Wed Mar 2 22:31:59 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.279.2.68 2005/01/18 00:14:56 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.69 2005/03/03 03:31:59 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2141,6 +2141,12 @@
{
php_stream *srcstream = NULL, *deststream = NULL;
int ret = FAILURE;
+ struct stat src_s, dest_s;
+
+ /* safety check to ensure that source destination files are not the
same file */
+ if (stat(src, src_s) || (stat(dest, dest_s) == 0 src_s.st_ino ==
dest_s.st_ino)) {
+ return ret;
+ }
srcstream = php_stream_open_wrapper(src, rb,
STREAM_DISABLE_OPEN_BASEDIR | REPORT_ERRORS,
--
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 /ext/gmp gmp.c
tony2001Tue Mar 1 08:18:32 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/gmpgmp.c
Log:
MFH: checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem()
and gmp_fact() to prevent SIGFPE
changed zend_error() to php_error_docref()
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.846r2=1.1247.2.847ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.846 php-src/NEWS:1.1247.2.847
--- php-src/NEWS:1.1247.2.846 Mon Feb 28 21:22:41 2005
+++ php-src/NEWSTue Mar 1 08:18:29 2005
@@ -2,6 +2,8 @@
|||
?? ??? , Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
+- Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem()
+ and gmp_fact() to prevent SIGFPE. (Tony)
- Changed phpize not to require libtool. (Jani)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
http://cvs.php.net/diff.php/php-src/ext/gmp/gmp.c?r1=1.29.4.11r2=1.29.4.12ty=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.29.4.11 php-src/ext/gmp/gmp.c:1.29.4.12
--- php-src/ext/gmp/gmp.c:1.29.4.11 Wed Jun 9 10:39:36 2004
+++ php-src/ext/gmp/gmp.c Tue Mar 1 08:18:31 2005
@@ -251,7 +251,7 @@
}
break;
default:
- zend_error(E_WARNING,Unable to convert variable to GMP - wrong
type);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,Unable to convert
variable to GMP - wrong type);
efree(*gmpnumber);
return FAILURE;
}
@@ -504,7 +504,7 @@
convert_to_long_ex(base_arg);
base = Z_LVAL_PP(base_arg);
if(base 2 || base 36) {
- zend_error(E_WARNING, Bad base for conversion: %d
(should be between 2 and 36), base);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Bad base
for conversion: %d (should be between 2 and 36), base);
RETURN_FALSE;
}
}
@@ -566,7 +566,7 @@
}
if(base 2 || base 36) {
- zend_error(E_WARNING, Bad base for conversion: %d, base);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Bad base for
conversion: %d, base);
RETURN_FALSE;
}
@@ -770,7 +770,28 @@
Calculates factorial function */
ZEND_FUNCTION(gmp_fact)
{
- gmp_unary_ui_op(mpz_fac_ui);
+ zval **a_arg;
+ mpz_t *gmpnum_tmp;
+
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, a_arg) ==
FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ if (Z_TYPE_PP(a_arg) == IS_RESOURCE) {
+ FETCH_GMP_ZVAL(gmpnum_tmp, a_arg);
+ if (mpz_sgn(*gmpnum_tmp) 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,Number has
to be greater than or equal to 0);
+ RETURN_FALSE;
+ }
+ } else {
+ convert_to_long_ex(a_arg);
+ if (Z_LVAL_PP(a_arg) 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,Number has
to be greater than or equal to 0);
+ RETURN_FALSE;
+ }
+ }
+
+ gmp_zval_unary_ui_op(return_value, a_arg, mpz_fac_ui);
}
/* }}} */
@@ -795,7 +816,7 @@
convert_to_long_ex(exp_arg);
if(Z_LVAL_PP(exp_arg) 0) {
- zend_error(E_WARNING,Negative exponent not supported);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,Negative exponent
not supported);
RETURN_FALSE;
}
@@ -827,6 +848,10 @@
use_ui=1;
} else {
FETCH_GMP_ZVAL(gmpnum_exp, exp_arg);
+ if (mpz_sgn(*gmpnum_exp) 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,Second
parameter cannot be less than 0);
+ RETURN_FALSE;
+ }
}
FETCH_GMP_ZVAL(gmpnum_mod, mod_arg);
@@ -850,7 +875,24 @@
Takes integer part of square root of a */
ZEND_FUNCTION(gmp_sqrt)
{
- gmp_unary_op(mpz_sqrt);
+ zval **a_arg;
+ mpz_t *gmpnum_a, *gmpnum_result;
+
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, a_arg) ==
FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ FETCH_GMP_ZVAL(gmpnum_a, a_arg);
+
+ if (mpz_sgn(*gmpnum_a) 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,Number has to be
greater than or equal to 0);
+ RETURN_FALSE;
+ }
+
+ INIT_GMP_NUM(gmpnum_result);
+ mpz_sqrt(*gmpnum_result, *gmpnum_a);
+
+ ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp);
}
/* }}} */
@@ -868,6 +910,11 @@
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard microtime.c
iliaa Tue Mar 1 16:34:31 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/standard microtime.c Log: MFH: Fixed bug #31792 (getrusage() does not provide ru_nswap value). http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.847r2=1.1247.2.848ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.847 php-src/NEWS:1.1247.2.848 --- php-src/NEWS:1.1247.2.847 Tue Mar 1 08:18:29 2005 +++ php-src/NEWSTue Mar 1 16:34:29 2005 @@ -26,6 +26,7 @@ - Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia) - Fixed bug #31796 (readline completion handler does not handle empty return values). (Ilia) +- Fixed bug #31792 (getrusage() does not provide ru_nswap value). (Ilia) - Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick) - Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar). (Ilia) - Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings). http://cvs.php.net/diff.php/php-src/ext/standard/microtime.c?r1=1.39.2.1r2=1.39.2.2ty=u Index: php-src/ext/standard/microtime.c diff -u php-src/ext/standard/microtime.c:1.39.2.1 php-src/ext/standard/microtime.c:1.39.2.2 --- php-src/ext/standard/microtime.c:1.39.2.1 Tue Dec 31 11:35:32 2002 +++ php-src/ext/standard/microtime.cTue Mar 1 16:34:30 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: microtime.c,v 1.39.2.1 2002/12/31 16:35:32 sebastian Exp $ */ +/* $Id: microtime.c,v 1.39.2.2 2005/03/01 21:34:30 iliaa Exp $ */ #include php.h @@ -141,6 +141,7 @@ PHP_RUSAGE_PARA(ru_nsignals); PHP_RUSAGE_PARA(ru_nvcsw); PHP_RUSAGE_PARA(ru_nivcsw); + PHP_RUSAGE_PARA(ru_nswap); #endif /*_OSD_POSIX*/ PHP_RUSAGE_PARA(ru_utime.tv_usec); PHP_RUSAGE_PARA(ru_utime.tv_sec); -- 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 /ext/oci8 config.m4
tony2001Fri Feb 25 06:33:25 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/oci8 config.m4 Log: MFH: allow building oci8 as shared http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.843r2=1.1247.2.844ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.843 php-src/NEWS:1.1247.2.844 --- php-src/NEWS:1.1247.2.843 Tue Feb 22 10:00:48 2005 +++ php-src/NEWSFri Feb 25 06:33:23 2005 @@ -152,6 +152,8 @@ - Updated PCRE to provide better error handling in certain cases. (Andrei) - NSAPI: added bucket parameter to list of non-php.ini-keys of php4_execute for doing performance stats without warnings in server-log. (Uwe Schindler) +- Fixed bug preventing from building oci8 as shared. + (stanislav dot voroniy at portavita dot nl, Tony) - Fixed leap year checking with idate(). (Christian Schneider, Derick) - Fixed strip_tags() to correctly handle '\0' characters. (Stefan) - Fixed funny forking effect in FastCGI when PHP_FCGI_CHILDREN was not set. http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.37.2.11r2=1.37.2.12ty=u Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.37.2.11 php-src/ext/oci8/config.m4:1.37.2.12 --- php-src/ext/oci8/config.m4:1.37.2.11Thu Dec 30 02:02:18 2004 +++ php-src/ext/oci8/config.m4 Fri Feb 25 06:33:24 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.37.2.11 2004/12/30 07:02:18 sniper Exp $ +dnl $Id: config.m4,v 1.37.2.12 2005/02/25 11:33:24 tony2001 Exp $ dnl AC_DEFUN([PHP_OCI_IF_DEFINED],[ @@ -64,13 +64,17 @@ [ --with-oci8[=DIR] Include Oracle (OCI8) support using an ORACLE_HOME install. The default DIR is ORACLE_HOME]) -PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle Instant Client, -[ --with-oci8-instant-client[=DIR] +if test $PHP_OCI8 = no; then + PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle Instant Client, + [ --with-oci8-instant-client[=DIR] Include Oracle (OCI8) support using Oracle Instant Client. DIR is the directory with the Instant Client libraries. On Linux it will default to /usr/lib/oracle/most_recent_version/client/lib Other platforms will need to have it explicitly specified.]) +else + PHP_OCI8_INSTANT_CLIENT=no; +fi if test $PHP_OCI8 != no; then -- 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
rrichards Fri Feb 25 17:13:38 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: no message http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.844r2=1.1247.2.845ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.844 php-src/NEWS:1.1247.2.845 --- php-src/NEWS:1.1247.2.844 Fri Feb 25 06:33:23 2005 +++ php-src/NEWSFri Feb 25 17:13:37 2005 @@ -4,6 +4,7 @@ - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Changed phpize not to require libtool. (Jani) - Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi) +- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob) Fixed bugs: . Bug #32063 (mb_convert_encoding ignores named entity 'alpha') . Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes) -- 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 /ext/mbstring/libmbfl/filters html_entities.c
moriyoshi Tue Feb 22 05:09:58 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/mbstring/libmbfl/filters html_entities.c
Log:
- MFH: fix bug #32063 (mb_convert_encoding ignores named entity 'alpha')
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.841r2=1.1247.2.842ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.841 php-src/NEWS:1.1247.2.842
--- php-src/NEWS:1.1247.2.841 Mon Feb 21 05:15:02 2005
+++ php-src/NEWSTue Feb 22 05:09:57 2005
@@ -3,6 +3,13 @@
?? ??? , Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
- Changed phpize not to require libtool. (Jani)
+- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
+ Fixed bugs:
+ . Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
+ . Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
+ . Bug #30573 (compiler warnings in libmbfl due to invalid type cast)
+ . Bug #30549 (incorrect character translations for some ISO8859 charsets)
+ . Bug #28220 (mb_strwidth() returns wrong width values for some hangul chars)
- Fixed several leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed several leaks in ext/filepro. (Tony)
- Fixed build system to always use bundled libtool files. (Jani)
@@ -10,8 +17,6 @@
- Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns
with NULL values). (Daniel Convissor)
- Fixed bug #31936 (set_h_errno() is redefined incompatibly). (Jani)
-- Fixed bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes).
- (Moriyoshi)
- Fixed bug #31858 (--disable-cli does not force --without-pear). (Jani)
- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
(Jani)
@@ -63,10 +68,6 @@
- Fixed bug #31055 (apache2filter: per request leak proportional to the full
path of the request URI). (kameshj at fastmail dot fm)
- Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia)
-- Fixed bug #30573 (compiler warnings in libmbfl due to invalid type cast).
- (Moriyoshi)
-- Fixed bug #30549 (incorrect character translations for some ISO8859
- charsets). (Moriyoshi)
- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence)
- Fixed bug #30430 (odbc_next_result() doesn't bind values and that results
in segfault). (pdan-php at esync dot org, Tony)
@@ -82,8 +83,6 @@
(wendland at scan-plus dot de)
- Fixed bug #28451 (corupt EXIF headers have unlimited recursive IFD directory
entries). (Andrei)
-- Fixed bug #28220 (mb_strwidth() returns wrong width values for some hangul
- characters). (Moriyoshi)
- Fixed bug #28086 (crash inside overload() function). (Tony)
- Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
(chris at ex-parrot dot com)
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/html_entities.c?r1=1.2.2.2r2=1.2.2.3ty=u
Index: php-src/ext/mbstring/libmbfl/filters/html_entities.c
diff -u php-src/ext/mbstring/libmbfl/filters/html_entities.c:1.2.2.2
php-src/ext/mbstring/libmbfl/filters/html_entities.c:1.2.2.3
--- php-src/ext/mbstring/libmbfl/filters/html_entities.c:1.2.2.2Mon Feb
21 02:10:13 2005
+++ php-src/ext/mbstring/libmbfl/filters/html_entities.cTue Feb 22
05:09:58 2005
@@ -167,6 +167,7 @@
{Chi, 935},
{Psi, 936},
{Omega, 937},
+ {alpha, 945},
{beta, 946},
{gamma, 947},
{delta, 948},
--
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 /ext/mysql php_mysql.c
iliaa Tue Feb 22 10:00:50 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/mysql php_mysql.c
Log:
MFH: Fixed bug #31288 (Possible crash in mysql_fetch_field(), if
mysql_list_fields() was not called previously).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.842r2=1.1247.2.843ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.842 php-src/NEWS:1.1247.2.843
--- php-src/NEWS:1.1247.2.842 Tue Feb 22 05:09:57 2005
+++ php-src/NEWSTue Feb 22 10:00:48 2005
@@ -53,6 +53,8 @@
- Fixed bug #31142 (imap_mail_compose() fails to generate correct output).
(Ilia)
- Fixed bug #31398 (When magic_guotes_gpc are enabled filenames with ' get
cutoff).
(Ilia)
+- Fixed bug #31288 (Possible crash in mysql_fetch_field(), if
mysql_list_fields()
+ was not called previously). (Ilia)
- Fixed bug #31120 (mssql_query returns false on successfull inserts and
stored procedures). (Frank)
- Fixed bugs #31107, #31110, #3, #31249 (Compile failure of
zend_strtod.c).
http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.174.2.27r2=1.174.2.28ty=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.174.2.27
php-src/ext/mysql/php_mysql.c:1.174.2.28
--- php-src/ext/mysql/php_mysql.c:1.174.2.27Fri Jun 4 11:27:05 2004
+++ php-src/ext/mysql/php_mysql.c Tue Feb 22 10:00:49 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.174.2.27 2004/06/04 15:27:05 iliaa Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.28 2005/02/22 15:00:49 iliaa Exp $ */
/* TODO:
*
@@ -2213,7 +2213,7 @@
{
zval **result, **field;
MYSQL_RES *mysql_result;
- MYSQL_FIELD *mysql_field;
+ MYSQL_FIELD *mysql_field = {0};
char buf[512];
int len;
--
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 /ext/ftp ftp.c
iliaa Thu Feb 17 10:38:35 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/ftpftp.c
Log:
MFH: Fixed bug #27633 (Double \r problem on ftp_get in ASCII mode on Win32).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.837r2=1.1247.2.838ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.837 php-src/NEWS:1.1247.2.838
--- php-src/NEWS:1.1247.2.837 Wed Feb 16 23:46:52 2005
+++ php-src/NEWSThu Feb 17 10:38:33 2005
@@ -77,6 +77,7 @@
- Fixed bug #28086 (crash inside overload() function). (Tony)
- Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
(chris at ex-parrot dot com)
+- Fixed bug #27633 (Double \r problem on ftp_get in ASCII mode on Win32).
(Ilia)
- Fixed bug #7782 (Cannot use PATH_INFO fully with php isapi). (Unknown)
15 Dec 2004, Version 4.3.10
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.68.2.18r2=1.68.2.19ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.68.2.18 php-src/ext/ftp/ftp.c:1.68.2.19
--- php-src/ext/ftp/ftp.c:1.68.2.18 Tue Oct 5 19:55:21 2004
+++ php-src/ext/ftp/ftp.c Thu Feb 17 10:38:34 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.c,v 1.68.2.18 2004/10/05 23:55:21 iliaa Exp $ */
+/* $Id: ftp.c,v 1.68.2.19 2005/02/17 15:38:34 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -713,16 +713,22 @@
* Everything Else \n
*/
#ifdef PHP_WIN32
- while ((s = strpbrk(ptr, \r\n))) {
- if (*s == '\n') {
- php_stream_putc(outstream, '\r');
- } else if (*s == '\r' *(s + 1) == '\n') {
- s++;
- }
- s++;
+ while ((s = strpbrk(ptr, \r\n)) (s e)) {
php_stream_write(outstream, ptr, (s - ptr));
- if (*(s - 1) == '\r') {
- php_stream_putc(outstream, '\n');
+ php_stream_write(outstream, \r\n,
sizeof(\r\n)-1);
+
+ if (*s == '\r') {
+ *s++;
+ }
+ /* for some reason some servers prefix a \r
before a \n,
+* resulting in a \r\r\n in the buffer when
+* the remote file already has windoze style
line endings.
+*/
+ if (*s == '\r') {
+ *s++;
+ }
+ if (*s == '\n') {
+ *s++;
}
ptr = s;
}
--
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
andiThu Feb 17 17:08:30 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
Log:
- Commit NEWS Entry for:
- Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns
with NULL values). (Daniel Convissor)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.838r2=1.1247.2.839ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.838 php-src/NEWS:1.1247.2.839
--- php-src/NEWS:1.1247.2.838 Thu Feb 17 10:38:33 2005
+++ php-src/NEWSThu Feb 17 17:08:29 2005
@@ -8,6 +8,8 @@
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
- Fixed bug #31936 (set_h_errno() is redefined incompatibly). (Jani)
+- Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns
+ with NULL values). (Daniel Convissor)
- Fixed bug #31858 (--disable-cli does not force --without-pear). (Jani)
- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
(Jani)
--
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 main.c
iliaa Wed Feb 16 23:46:53 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main main.c
Log:
MFH: MFH: Fixed bug #31440 ($GLOBALS can be overwritten via GPC when
register_globals is enabled).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.836r2=1.1247.2.837ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.836 php-src/NEWS:1.1247.2.837
--- php-src/NEWS:1.1247.2.836 Wed Feb 16 23:45:21 2005
+++ php-src/NEWSWed Feb 16 23:46:52 2005
@@ -33,6 +33,8 @@
non-existent object ref). (Tony)
- Fixed bug #31444 (Memory leak in zend_language_scanner.c).
(hexer at studentcenter dot org)
+- Fixed bug #31440 ($GLOBALS can be overwritten via GPC when
+ register_globals is enabled). (Ilia)
- Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms). (Joe)
- Fixed bug #31396 (compile fails with gd 2.0.33 without freetype). (Jani)
- Fixed bug #31371 (highlight_file() trims new line after heredoc). (Ilia)
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.58r2=1.512.2.59ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.58 php-src/main/main.c:1.512.2.59
--- php-src/main/main.c:1.512.2.58 Sun Jan 9 11:30:22 2005
+++ php-src/main/main.c Wed Feb 16 23:46:52 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.58 2005/01/09 16:30:22 sniper Exp $ */
+/* $Id: main.c,v 1.512.2.59 2005/02/17 04:46:52 iliaa Exp $ */
/* {{{ includes
*/
@@ -1342,6 +1342,7 @@
ulong num_key;
HashPosition pos;
int key_type;
+ int globals_check = (PG(register_globals) (dest ==
(EG(symbol_table;
zend_hash_internal_pointer_reset_ex(src, pos);
while (zend_hash_get_current_data_ex(src, (void **)src_entry, pos) ==
SUCCESS) {
@@ -1352,7 +1353,12 @@
|| Z_TYPE_PP(dest_entry) != IS_ARRAY) {
(*src_entry)-refcount++;
if (key_type == HASH_KEY_IS_STRING) {
- zend_hash_update(dest, string_key,
strlen(string_key)+1, src_entry, sizeof(zval *), NULL);
+ /* if register_globals is on and working with
main symbol table, prevent overwriting of GLOBALS */
+ if (!globals_check || string_key_len !=
sizeof(GLOBALS) || memcmp(string_key, GLOBALS, sizeof(GLOBALS) - 1)) {
+ zend_hash_update(dest, string_key,
string_key_len, src_entry, sizeof(zval *), NULL);
+ } else {
+ (*src_entry)-refcount--;
+ }
} else {
zend_hash_index_update(dest, num_key,
src_entry, sizeof(zval *), NULL);
}
--
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 /ext/sockets config.m4 php_sockets_win.h sockets.c
sniper Sat Feb 12 13:16:05 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/socketsconfig.m4 php_sockets_win.h sockets.c
Log:
- Fixed bug #31936 (set_h_errno() is redefined incompatibly)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.834r2=1.1247.2.835ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.834 php-src/NEWS:1.1247.2.835
--- php-src/NEWS:1.1247.2.834 Thu Feb 10 21:12:26 2005
+++ php-src/NEWSSat Feb 12 13:16:03 2005
@@ -7,6 +7,7 @@
- Fixed several leaks in ext/filepro. (Tony)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #31936 (set_h_errno() is redefined incompatibly). (Jani)
- Fixed bug #31858 (--disable-cli does not force --without-pear). (Jani)
- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
(Jani)
http://cvs.php.net/diff.php/php-src/ext/sockets/config.m4?r1=1.11.2.1r2=1.11.2.2ty=u
Index: php-src/ext/sockets/config.m4
diff -u php-src/ext/sockets/config.m4:1.11.2.1
php-src/ext/sockets/config.m4:1.11.2.2
--- php-src/ext/sockets/config.m4:1.11.2.1 Fri Apr 4 13:40:38 2003
+++ php-src/ext/sockets/config.m4 Sat Feb 12 13:16:04 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.11.2.1 2003/04/04 18:40:38 moriyoshi Exp $
+dnl $Id: config.m4,v 1.11.2.2 2005/02/12 18:16:04 sniper Exp $
dnl
PHP_ARG_ENABLE(sockets, whether to enable sockets support,
@@ -18,7 +18,7 @@
AC_DEFINE(HAVE_CMSGHDR,1,[Whether you have struct cmsghdr])
fi
- AC_CHECK_FUNCS([hstrerror])
+ AC_CHECK_FUNCS([hstrerror set_h_errno])
AC_CHECK_HEADERS([netdb.h netinet/tcp.h sys/un.h errno.h])
AC_TRY_COMPILE([
#include sys/types.h
http://cvs.php.net/diff.php/php-src/ext/sockets/php_sockets_win.h?r1=1.5.8.2r2=1.5.8.3ty=u
Index: php-src/ext/sockets/php_sockets_win.h
diff -u php-src/ext/sockets/php_sockets_win.h:1.5.8.2
php-src/ext/sockets/php_sockets_win.h:1.5.8.3
--- php-src/ext/sockets/php_sockets_win.h:1.5.8.2 Sun Jul 20 06:54:03 2003
+++ php-src/ext/sockets/php_sockets_win.h Sat Feb 12 13:16:04 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: php_sockets_win.h,v 1.5.8.2 2003/07/20 10:54:03 sniper Exp $ */
+/* $Id: php_sockets_win.h,v 1.5.8.3 2005/02/12 18:16:04 sniper Exp $ */
#ifdef PHP_WIN32
@@ -41,7 +41,7 @@
#define errno WSAGetLastError()
#define h_errno WSAGetLastError()
#define set_errno(a) WSASetLastError(a)
-#define set_h_errno(a) WSASetLastError(a)
+#define SET_H_ERRNO(a) WSASetLastError(a)
#define close(a) closesocket(a)
#define CMSG_DATA(cmsg) ((cmsg)-cmsg_data)
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.125.2.24r2=1.125.2.25ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.24
php-src/ext/sockets/sockets.c:1.125.2.25
--- php-src/ext/sockets/sockets.c:1.125.2.24Mon Jun 7 00:42:40 2004
+++ php-src/ext/sockets/sockets.c Sat Feb 12 13:16:04 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.125.2.24 2004/06/07 04:42:40 pollita Exp $ */
+/* $Id: sockets.c,v 1.125.2.25 2005/02/12 18:16:04 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -57,7 +57,11 @@
# include sys/uio.h
# define IS_INVALID_SOCKET(a) (a-bsd_socket 0)
# define set_errno(a) (errno = a)
-# define set_h_errno(a) (h_errno = a)
+# ifdef HAVE_SET_H_ERRNO
+# define SET_H_ERRNO(newval) set_h_errno(newval)
+# else
+# define SET_H_ERRNO(newval) h_errno = (newval)
+# endif
#else /* windows */
# include php_sockets.h
# include php_sockets_win.h
@@ -1762,7 +1766,7 @@
struct msghdr hdr;
struct sockaddr_in *sin = (struct sockaddr_in
*) sa;
- set_h_errno(0);
+ SET_H_ERRNO(0);
set_errno(0);
memset(hdr, 0, sizeof(hdr));
--
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 /sapi/cgi cgi_main.c
sniper Thu Feb 10 21:12:31 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/sapi/cgi cgi_main.c
Log:
Revert broken patch
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.833r2=1.1247.2.834ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.833 php-src/NEWS:1.1247.2.834
--- php-src/NEWS:1.1247.2.833 Mon Feb 7 17:32:31 2005
+++ php-src/NEWSThu Feb 10 21:12:26 2005
@@ -70,8 +70,6 @@
(wendland at scan-plus dot de)
- Fixed bug #28451 (corupt EXIF headers have unlimited recursive IFD directory
entries). (Andrei)
-- Fixed bug #28227 (PHP CGI depends upon non-standard SCRIPT_FILENAME).
- (lukem at NetBSD dot org)
- Fixed bug #28086 (crash inside overload() function). (Tony)
- Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
(chris at ex-parrot dot com)
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.65r2=1.190.2.66ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.65
php-src/sapi/cgi/cgi_main.c:1.190.2.66
--- php-src/sapi/cgi/cgi_main.c:1.190.2.65 Fri Feb 4 05:42:01 2005
+++ php-src/sapi/cgi/cgi_main.c Thu Feb 10 21:12:30 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.190.2.65 2005/02/04 10:42:01 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.66 2005/02/11 02:12:30 sniper Exp $ */
#include php.h
#include php_globals.h
@@ -687,19 +687,8 @@
{
char *env_script_filename = sapi_cgibin_getenv(SCRIPT_FILENAME,0
TSRMLS_CC);
char *env_path_translated = sapi_cgibin_getenv(PATH_TRANSLATED,0
TSRMLS_CC);
- char *env_script_name = sapi_cgibin_getenv(SCRIPT_NAME, 0 TSRMLS_CC);
char *script_path_translated = env_script_filename;
- /*
-* CGI/1.1, as documented at: http://cgi-spec.golux.com/
-* mentions SCRIPT_NAME but not SCRIPT_FILENAME.
-*/
- if (!script_path_translated env_script_name *env_script_name ==
'/') {
- env_script_filename =
_sapi_cgibin_putenv(SCRIPT_FILENAME,(env_script_name + 1) TSRMLS_CC);
-
- script_path_translated = env_script_filename;
- }
-
#if !DISCARD_PATH
/* some broken servers do not have script_filename or argv0
an example, IIS configured in some ways. then they do more
@@ -727,6 +716,7 @@
char *content_length = sapi_cgibin_getenv(CONTENT_LENGTH,0
TSRMLS_CC);
char *content_type = sapi_cgibin_getenv(CONTENT_TYPE,0
TSRMLS_CC);
char *env_path_info = sapi_cgibin_getenv(PATH_INFO,0
TSRMLS_CC);
+ char *env_script_name = sapi_cgibin_getenv(SCRIPT_NAME,0
TSRMLS_CC);
#if ENABLE_PATHINFO_CHECK
struct stat st;
char *env_redirect_url = sapi_cgibin_getenv(REDIRECT_URL,0
TSRMLS_CC);
--
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 configure.in
sniper Mon Feb 7 07:51:53 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS configure.in
Log:
MFH: - Fixed bug #31858 (--disable-cli does not force --without-pear)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.830r2=1.1247.2.831ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.830 php-src/NEWS:1.1247.2.831
--- php-src/NEWS:1.1247.2.830 Fri Feb 4 09:29:20 2005
+++ php-src/NEWSMon Feb 7 07:51:52 2005
@@ -6,6 +6,7 @@
- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #31858 (--disable-cli does not force --without-pear). (Jani)
- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
(Jani)
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.150r2=1.396.2.151ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.150 php-src/configure.in:1.396.2.151
--- php-src/configure.in:1.396.2.150Wed Jan 19 20:46:57 2005
+++ php-src/configure.inMon Feb 7 07:51:52 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.150 2005/01/20 01:46:57 sniper Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.396.2.151 2005/02/07 12:51:52 sniper Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -872,6 +872,11 @@
with_pear=no
fi
+# If CLI is disabled - disable PEAR
+if test $PHP_SAPI_CLI = no; then
+ with_pear=no
+fi
+
PHP_ARG_WITH(pear, [whether to install PEAR],
[ --with-pear=DIR Install PEAR in DIR (default PREFIX/lib/php)
--without-pear Do not install PEAR], DEFAULT, yes)
@@ -881,17 +886,13 @@
dnl
dnl PEAR dependancies
dnl
- if test $PHP_SAPI_CLI = no; then
-pear_error_msg=$pear_error_msg
-PEAR requires CLI to be enabled. Add --enable-cli to
the configure line. (or --disable-pear)
- fi
if test $PHP_PCRE_REGEX = no; then
pear_error_msg=$pear_error_msg
-PEAR requires PCRE to be enabled.Add --with-pcre-regex
to the configure line. (or --disable-pear)
+PEAR requires PCRE to be enabled.Add --with-pcre-regex
to the configure line. (or --without-pear)
fi
if test $PHP_XML = no; then
pear_error_msg=$pear_error_msg
-PEAR requires XML to be enabled. Add --enable-xml to
the configure line. (or --disable-pear)
+PEAR requires XML to be enabled. Add --enable-xml to
the configure line. (or --without-pear)
fi
dnl
@@ -899,7 +900,7 @@
dnl
dnl if test $PHP_XMLRPC = no; then
dnlpear_error_msg=$pear_error_msg
-dnlPEAR requires XML-RPC to be enabled. Add --with-xmlrpc
to the configure line. (or --disable-pear)
+dnlPEAR requires XML-RPC to be enabled. Add --with-xmlrpc
to the configure line. (or --without-pear)
dnl fi
dnl
@@ -916,6 +917,8 @@
*) PEAR_INSTALLDIR=$libdir/php;;
esac
fi
+
+
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
fi
@@ -1259,7 +1262,6 @@
PHP_ADD_BUILD_DIR(Zend)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts)
-PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
PHP_GEN_BUILD_DIRS
--
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 /ext/filepro filepro.c php_filepro.h
tony2001Mon Feb 7 08:33:05 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/fileprofilepro.c php_filepro.h
Log:
MFH: fix leaks in ext/filepro
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.831r2=1.1247.2.832ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.831 php-src/NEWS:1.1247.2.832
--- php-src/NEWS:1.1247.2.831 Mon Feb 7 07:51:52 2005
+++ php-src/NEWSMon Feb 7 08:33:04 2005
@@ -4,6 +4,7 @@
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
- Changed phpize not to require libtool. (Jani)
- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei)
+- Fixed several leaks in ext/filepro. (Tony)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
- Fixed bug #31858 (--disable-cli does not force --without-pear). (Jani)
http://cvs.php.net/diff.php/php-src/ext/filepro/filepro.c?r1=1.47.2.2r2=1.47.2.3ty=u
Index: php-src/ext/filepro/filepro.c
diff -u php-src/ext/filepro/filepro.c:1.47.2.2
php-src/ext/filepro/filepro.c:1.47.2.3
--- php-src/ext/filepro/filepro.c:1.47.2.2 Thu Aug 28 16:01:26 2003
+++ php-src/ext/filepro/filepro.c Mon Feb 7 08:33:04 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filepro.c,v 1.47.2.2 2003/08/28 20:01:26 iliaa Exp $ */
+/* $Id: filepro.c,v 1.47.2.3 2005/02/07 13:33:04 tony2001 Exp $ */
/*
filePro 4.x support developed by Chad Robinson, [EMAIL PROTECTED]
@@ -98,11 +98,43 @@
fp_globals = (fp_global_struct *) LocalAlloc(LPTR,
sizeof(fp_global_struct));
TlsSetValue(FPTls, (void *) fp_globals);
#endif
+
+ return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_RINIT_FUNCTION
+ */
+PHP_RINIT_FUNCTION(filepro)
+{
FP_GLOBAL(fp_database)=NULL;
FP_GLOBAL(fp_fcount)=-1;
FP_GLOBAL(fp_keysize)=-1;
FP_GLOBAL(fp_fieldlist)=NULL;
+
+ return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_RSHUTDOWN_FUNCTION
+ */
+PHP_RSHUTDOWN_FUNCTION(filepro)
+{
+ FP_FIELD *tmp, *next;
+ if (FP_GLOBAL(fp_database)) {
+ efree(FP_GLOBAL(fp_database));
+ }
+
+ if (FP_GLOBAL(fp_fieldlist)) {
+ for (tmp = FP_GLOBAL(fp_fieldlist); tmp;) {
+ efree(tmp-name);
+ efree(tmp-format);
+ next = tmp-next;
+ efree(tmp);
+ tmp=next;
+ }
+ }
return SUCCESS;
}
/* }}} */
@@ -145,7 +177,15 @@
zend_module_entry filepro_module_entry = {
STANDARD_MODULE_HEADER,
- filepro, filepro_functions, PHP_MINIT(filepro),
PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
+ filepro,
+ filepro_functions,
+ PHP_MINIT(filepro),
+ PHP_MSHUTDOWN(filepro),
+ PHP_RINIT(filepro),
+ PHP_RSHUTDOWN(filepro),
+ NULL,
+ NO_VERSION_YET,
+ STANDARD_MODULE_PROPERTIES
};
@@ -216,6 +256,8 @@
tmp = FP_GLOBAL(fp_fieldlist);
while (tmp != NULL) {
next = tmp-next;
+ efree(tmp-name);
+ efree(tmp-format);
efree(tmp);
tmp = next;
}
http://cvs.php.net/diff.php/php-src/ext/filepro/php_filepro.h?r1=1.9.8.1r2=1.9.8.2ty=u
Index: php-src/ext/filepro/php_filepro.h
diff -u php-src/ext/filepro/php_filepro.h:1.9.8.1
php-src/ext/filepro/php_filepro.h:1.9.8.2
--- php-src/ext/filepro/php_filepro.h:1.9.8.1 Tue Dec 31 11:34:33 2002
+++ php-src/ext/filepro/php_filepro.h Mon Feb 7 08:33:04 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_filepro.h,v 1.9.8.1 2002/12/31 16:34:33 sebastian Exp $ */
+/* $Id: php_filepro.h,v 1.9.8.2 2005/02/07 13:33:04 tony2001 Exp $ */
/*
filePro 4.x support developed by Chad Robinson, [EMAIL PROTECTED]
@@ -41,6 +41,8 @@
PHP_FUNCTION(filepro_retrieve);
PHP_MINIT_FUNCTION(filepro);
+PHP_RINIT_FUNCTION(filepro);
+PHP_RSHUTDOWN_FUNCTION(filepro);
PHP_MSHUTDOWN_FUNCTION(filepro);
#else
#define phpext_filepro_ptr NULL
--
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 /ext/sysvmsg sysvmsg.c
iliaa Mon Feb 7 17:32:31 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/sysvmsgsysvmsg.c
/php-srcNEWS
Log:
MFH: Fixed bug #31527 (crash in msg_send() when non-string is stored without
being serialized).
http://cvs.php.net/diff.php/php-src/ext/sysvmsg/sysvmsg.c?r1=1.4.2.4r2=1.4.2.5ty=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.4.2.4
php-src/ext/sysvmsg/sysvmsg.c:1.4.2.5
--- php-src/ext/sysvmsg/sysvmsg.c:1.4.2.4 Mon Jan 24 09:23:36 2005
+++ php-src/ext/sysvmsg/sysvmsg.c Mon Feb 7 17:32:30 2005
@@ -15,7 +15,7 @@
| Authors: Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: sysvmsg.c,v 1.4.2.4 2005/01/24 14:23:36 tony2001 Exp $ */
+/* $Id: sysvmsg.c,v 1.4.2.5 2005/02/07 22:32:30 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -120,7 +120,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, sysvmsg support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.4.2.4 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.4.2.5 $);
php_info_print_table_end();
}
/* }}} */
@@ -367,10 +367,33 @@
message_len = msg_var.len;
smart_str_free(msg_var);
} else {
- convert_to_string_ex(message);
- messagebuffer = emalloc(sizeof(struct php_msgbuf) +
Z_STRLEN_P(message));
- memcpy(messagebuffer-mtext, Z_STRVAL_P(message),
Z_STRLEN_P(message) + 1);
- message_len = Z_STRLEN_P(message);
+ char *p;
+ switch (Z_TYPE_P(message)) {
+ case IS_STRING:
+ p = Z_STRVAL_P(message);
+ message_len = Z_STRLEN_P(message);
+ break;
+
+ case IS_LONG:
+ case IS_BOOL:
+ message_len = spprintf(p, 0, %ld,
Z_LVAL_P(message));
+ break;
+
+ case IS_DOUBLE:
+ message_len = spprintf(p, 0, %f,
Z_DVAL_P(message));
+ break;
+
+ default:
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Message parameter must be either a string or a number.);
+ RETURN_FALSE;
+ }
+
+ messagebuffer = emalloc(sizeof(struct php_msgbuf) +
message_len);
+ memcpy(messagebuffer-mtext, p, message_len + 1);
+
+ if (Z_TYPE_P(message) != IS_STRING) {
+ efree(p);
+ }
}
/* set the message type */
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.832r2=1.1247.2.833ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.832 php-src/NEWS:1.1247.2.833
--- php-src/NEWS:1.1247.2.832 Mon Feb 7 08:33:04 2005
+++ php-src/NEWSMon Feb 7 17:32:31 2005
@@ -21,6 +21,8 @@
- Fixed bug #31623 (OCILogin does not support password grace period).
(daniel dot beet at accuratesoftware dot com, Tony)
- Fixed bug #31580 (fgetcsv() problematic with escape sequences). (Ilia)
+- Fixed bug #31527 (crash in msg_send() when non-string is stored without
+ being serialized). (Ilia)
- Fixed bug #31514 (open_basedir uses path_translated rather then cwd for .
translation). (Ilia)
- Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia)
--
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 /ext/standard datetime.c
sniper Fri Feb 4 08:09:25 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard datetime.c
Log:
MFH: Fixed bug #31842 (*date('r') does not return RFC2822 conforming date
string).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.828r2=1.1247.2.829ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.828 php-src/NEWS:1.1247.2.829
--- php-src/NEWS:1.1247.2.828 Fri Feb 4 05:42:00 2005
+++ php-src/NEWSFri Feb 4 08:09:24 2005
@@ -6,6 +6,8 @@
- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
+ (Jani)
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
- Fixed bug #31796 (readline completion handler does not handle empty return
values). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.96.2.17r2=1.96.2.18ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.96.2.17
php-src/ext/standard/datetime.c:1.96.2.18
--- php-src/ext/standard/datetime.c:1.96.2.17 Wed Dec 15 19:10:55 2004
+++ php-src/ext/standard/datetime.c Fri Feb 4 08:09:24 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: datetime.c,v 1.96.2.17 2004/12/16 00:10:55 iliaa Exp $ */
+/* $Id: datetime.c,v 1.96.2.18 2005/02/04 13:09:24 sniper Exp $ */
#include php.h
#include zend_operators.h
@@ -579,7 +579,7 @@
break;
case 'r':
#if HAVE_TM_GMTOFF
- sprintf(tmp_buff, %3s, %2d %3s %04d
%02d:%02d:%02d %c%02d%02d,
+ sprintf(tmp_buff, %3s, %02d %3s %04d
%02d:%02d:%02d %c%02d%02d,
day_short_names[ta-tm_wday],
ta-tm_mday,
mon_short_names[ta-tm_mon],
@@ -592,7 +592,7 @@
abs( (ta-tm_gmtoff % 3600) / 60 )
);
#else
- sprintf(tmp_buff, %3s, %2d %3s %04d
%02d:%02d:%02d %c%02d%02d,
+ sprintf(tmp_buff, %3s, %02d %3s %04d
%02d:%02d:%02d %c%02d%02d,
day_short_names[ta-tm_wday],
ta-tm_mday,
mon_short_names[ta-tm_mon],
--
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 /ext/dbase dbase.c /ext/dbase/tests bug31754.phpt
derick Fri Feb 4 09:29:21 2005 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/dbase/testsbug31754.phpt
Modified files:
/php-srcNEWS
/php-src/ext/dbase dbase.c
Log:
- MFH: Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.829r2=1.1247.2.830ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.829 php-src/NEWS:1.1247.2.830
--- php-src/NEWS:1.1247.2.829 Fri Feb 4 08:09:24 2005
+++ php-src/NEWSFri Feb 4 09:29:20 2005
@@ -11,6 +11,7 @@
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
- Fixed bug #31796 (readline completion handler does not handle empty return
values). (Ilia)
+- Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick)
- Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar). (Ilia)
- Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
(elod at itfais dot com)
http://cvs.php.net/diff.php/php-src/ext/dbase/dbase.c?r1=1.60.2.3r2=1.60.2.4ty=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.60.2.3 php-src/ext/dbase/dbase.c:1.60.2.4
--- php-src/ext/dbase/dbase.c:1.60.2.3 Tue Nov 4 01:09:19 2003
+++ php-src/ext/dbase/dbase.c Fri Feb 4 09:29:20 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dbase.c,v 1.60.2.3 2003/11/04 06:09:19 sniper Exp $ */
+/* $Id: dbase.c,v 1.60.2.4 2005/02/04 14:29:20 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -129,6 +129,11 @@
convert_to_string(dbf_name);
convert_to_long(options);
+ if (Z_LVAL_P(options) == 1) {
+ php_error(E_WARNING, Cannot open %s in write-only mode,
Z_STRVAL_P(dbf_name));
+ RETURN_FALSE;
+ }
+
if (PG(safe_mode) (!php_checkuid(Z_STRVAL_P(dbf_name), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
}
http://cvs.php.net/co.php/php-src/ext/dbase/tests/bug31754.phpt?r=1.1p=1
Index: php-src/ext/dbase/tests/bug31754.phpt
+++ php-src/ext/dbase/tests/bug31754.phpt
--TEST--
Bug #31754: (dbase_open() fails for mode = 1)
--SKIPIF--
?php
if (!extension_loaded('dbase')) {
die('skip dbase extension not available');
}
?
--FILE--
?php
// database definition
$def = array(
array(foo, L)
);
// creation
$dbh = dbase_create('/tmp/bug31754.dbf', array(array('foo', 'L')));
dbase_close($dbh);
$dbh = dbase_open('/tmp/bug31754.dbf', 1);
unlink('/tmp/bug31754.dbf');
?
--EXPECTF--
Warning: dbase_open(): Cannot open /tmp/bug31754.dbf in write-only mode in
%sbug31754.php on line %d
--
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 /ext/readline readline.c
iliaa Thu Feb 3 17:46:55 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/readline readline.c
Log:
MFH: Fixed bug #31796 (readline completion handler does not handle empty
return values).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.826r2=1.1247.2.827ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.826 php-src/NEWS:1.1247.2.827
--- php-src/NEWS:1.1247.2.826 Wed Feb 2 22:02:07 2005
+++ php-src/NEWSThu Feb 3 17:46:54 2005
@@ -7,6 +7,8 @@
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
+- Fixed bug #31796 (readline completion handler does not handle empty return
+ values). (Ilia)
- Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar). (Ilia)
- Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
(elod at itfais dot com)
http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.31.2.1r2=1.31.2.2ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.31.2.1
php-src/ext/readline/readline.c:1.31.2.2
--- php-src/ext/readline/readline.c:1.31.2.1Tue Dec 31 11:35:15 2002
+++ php-src/ext/readline/readline.c Thu Feb 3 17:46:55 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: readline.c,v 1.31.2.1 2002/12/31 16:35:15 sebastian Exp $ */
+/* $Id: readline.c,v 1.31.2.2 2005/02/03 22:46:55 iliaa Exp $ */
/* {{{ includes prototypes */
@@ -354,7 +354,7 @@
}
}
- return NULL;
+ return strdup();
}
static zval *_readline_string_zval(const char *str)
--
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 /ext/standard url.c /ext/standard/tests/strings url_t.phpt
iliaa Thu Jan 27 11:38:31 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard url.c
/php-src/ext/standard/tests/strings url_t.phpt
Log:
MFH: Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.822r2=1.1247.2.823ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.822 php-src/NEWS:1.1247.2.823
--- php-src/NEWS:1.1247.2.822 Wed Jan 26 11:56:14 2005
+++ php-src/NEWSThu Jan 27 11:38:29 2005
@@ -6,6 +6,7 @@
- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar). (Ilia)
- Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
(elod at itfais dot com)
- Fixed bug #31699 (unserialize() float problem on non-English locales). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/standard/url.c?r1=1.58.2.18r2=1.58.2.19ty=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.58.2.18
php-src/ext/standard/url.c:1.58.2.19
--- php-src/ext/standard/url.c:1.58.2.18Mon Dec 20 14:29:38 2004
+++ php-src/ext/standard/url.c Thu Jan 27 11:38:30 2005
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]
|
+--+
*/
-/* $Id: url.c,v 1.58.2.18 2004/12/20 19:29:38 iliaa Exp $ */
+/* $Id: url.c,v 1.58.2.19 2005/01/27 16:38:30 iliaa Exp $ */
#include stdlib.h
#include string.h
@@ -176,6 +176,8 @@
if (!(p = memchr(s, '/', (ue - s {
if ((p = memchr(s, '?', (ue - s {
e = p;
+ } else if ((p = memchr(s, '#', (ue - s {
+ e = p;
}
} else {
e = p;
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/url_t.phpt?r1=1.3.2.5r2=1.3.2.6ty=u
Index: php-src/ext/standard/tests/strings/url_t.phpt
diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.5
php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.6
--- php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.5 Mon Oct 13
00:28:32 2003
+++ php-src/ext/standard/tests/strings/url_t.phpt Thu Jan 27 11:38:30 2005
@@ -68,7 +68,8 @@
'file:///path/to/file',
'file://path/to/file',
'file:/path/to/file',
-'http://1.2.3.4:/abc.asp?a=1b=2'
+'http://1.2.3.4:/abc.asp?a=1b=2',
+'http://foo.com#bar'
);
foreach ($sample_urls as $url) {
@@ -650,3 +651,11 @@
[query]=
string(7) a=1b=2
}
+array(3) {
+ [scheme]=
+ string(4) http
+ [host]=
+ string(7) foo.com
+ [fragment]=
+ string(3) bar
+}
--
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 /ext/standard var_unserializer.c var_unserializer.re
iliaa Wed Jan 26 11:56:15 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard var_unserializer.c var_unserializer.re
/php-srcNEWS
Log:
MFH: Fixed bug #31699 (unserialize() float problem on non-English locales).
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.18.4.18r2=1.18.4.19ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.18.4.18
php-src/ext/standard/var_unserializer.c:1.18.4.19
--- php-src/ext/standard/var_unserializer.c:1.18.4.18 Tue Jan 18 06:08:20 2005
+++ php-src/ext/standard/var_unserializer.c Wed Jan 26 11:56:14 2005
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.9.2 on Tue Jan 18 13:06:25 2005 */
-#line 1 var_unserializer.re
+/* Generated by re2c 0.9.3 on Wed Jan 26 11:07:03 2005 */
+#line 1 /home/rei/php_dev/php4/ext/standard/var_unserializer.re
/*
+--+
| PHP Version 4|
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var_unserializer.c,v 1.18.4.18 2005/01/18 11:08:20 sniper Exp $ */
+/* $Id: var_unserializer.c,v 1.18.4.19 2005/01/26 16:56:14 iliaa Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -147,7 +147,7 @@
#define YYMARKER marker
-#line 154 var_unserializer.re
+#line 154 /home/rei/php_dev/php4/ext/standard/var_unserializer.re
@@ -339,7 +339,7 @@
-#line 7 re2c-output.c
+#line 7 stdout
{
YYCTYPE yych;
unsigned int yyaccept;
@@ -432,9 +432,9 @@
if(yych == ':') goto yy87;
goto yy4;
yy4:
-#line 576 var_unserializer.re
+#line 576 /home/rei/php_dev/php4/ext/standard/var_unserializer.re
{ return 0; }
-#line 102 re2c-output.c
+#line 102 stdout
yy5: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy81;
@@ -470,16 +470,16 @@
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy17;
goto yy4;
-yy14: yych = *++YYCURSOR;
+yy14: ++YYCURSOR;
goto yy15;
yy15:
-#line 570 var_unserializer.re
+#line 570 /home/rei/php_dev/php4/ext/standard/var_unserializer.re
{
/* this is the case where we have less data than planned */
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unexpected end of
serialized data);
return 0; /* not sure if it should be 0 or 1 here? */
}
-#line 147 re2c-output.c
+#line 147 stdout
yy16: yych = *++YYCURSOR;
goto yy4;
yy17: yych = *++YYCURSOR;
@@ -499,10 +499,10 @@
yy21: yych = *++YYCURSOR;
if(yych != '') goto yy2;
goto yy22;
-yy22: yych = *++YYCURSOR;
+yy22: ++YYCURSOR;
goto yy23;
yy23:
-#line 489 var_unserializer.re
+#line 489 /home/rei/php_dev/php4/ext/standard/var_unserializer.re
{
size_t len, len2, maxlen;
int elements;
@@ -583,7 +583,7 @@
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
-#line 251 re2c-output.c
+#line 252 stdout
yy24: yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -609,10 +609,10 @@
yy28: yych = *++YYCURSOR;
if(yych != '') goto yy2;
goto yy29;
-yy29: yych = *++YYCURSOR;
+yy29: ++YYCURSOR;
goto yy30;
yy30:
-#line 481 var_unserializer.re
+#line 481 /home/rei/php_dev/php4/ext/standard/var_unserializer.re
{
INIT_PZVAL(*rval);
@@ -620,7 +620,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU,
ZEND_STANDARD_CLASS_DEF_PTR));
}
-#line 288 re2c-output.c
+#line 290 stdout
yy31: yych = *++YYCURSOR;
if(yych == '+') goto yy32;
if(yych = '/') goto yy2;
@@ -641,10 +641,10 @@
yy35: yych = *++YYCURSOR;
if(yych != '{') goto yy2;
goto yy36;
-yy36: yych = *++YYCURSOR;
+yy36: ++YYCURSOR;
goto yy37;
yy37:
-#line 463 var_unserializer.re
+#line 463 /home/rei/php_dev/php4/ext/standard/var_unserializer.re
{
int elements = parse_iv(start + 2);
@@ -662,7 +662,7 @@
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-#line 330 re2c-output.c
+#line 333 stdout
yy38: yych = *++YYCURSOR;
if(yych == '+') goto yy39;
if(yych = '/') goto yy2;
@@ -683,10 +683,10 @@
yy42: yych = *++YYCURSOR;
if(yych != '') goto yy2;
goto yy43;
-yy43: yych = *++YYCURSOR;
+yy43: ++YYCURSOR;
goto yy44;
yy44:
-#line 435 var_unserializer.re
+#line 435 /home/rei/php_dev/php4/ext/standard/var_unserializer.re
{
size_t len, maxlen;
char *str;
@@ -714,7 +714,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
}
-#line 382 re2c-output.c
+#line 386 stdout
yy45: yych = *++YYCURSOR;
if(yych = '/'){
if(yych = ','){
@@ -800,17 +800,17 @@
goto yy2;
}
}
-yy55: yych = *++YYCURSOR;
+yy55:
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /scripts phpize.in
sniper Tue Jan 25 07:55:56 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/scriptsphpize.in
Log:
MFH: - Return of the automake requirement
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.815r2=1.1247.2.816ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.815 php-src/NEWS:1.1247.2.816
--- php-src/NEWS:1.1247.2.815 Fri Jan 21 20:19:48 2005
+++ php-src/NEWSTue Jan 25 07:55:55 2005
@@ -2,7 +2,7 @@
|||
?? ??? , Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
-- Changed phpize not to require automake and libtool. (Jani)
+- Changed phpize not to require libtool. (Jani)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
- Fixed bug #31623 (OCILogin does not support password grace period).
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.1.2.12r2=1.1.2.13ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.1.2.12 php-src/scripts/phpize.in:1.1.2.13
--- php-src/scripts/phpize.in:1.1.2.12 Sat Jan 22 15:30:15 2005
+++ php-src/scripts/phpize.in Tue Jan 25 07:55:55 2005
@@ -90,6 +90,7 @@
(cd $phpdir cp $FILES_BUILD $builddir/build)
(cd $phpdir cp $FILES $builddir)
+ (cd $builddir cat ./build/libtool.m4 acinclude.m4)
}
phpize_replace_prefix()
@@ -101,7 +102,7 @@
phpize_autotools()
{
- cat acinclude.m4 ./build/libtool.m4 aclocal.m4 || exit 1
+ aclocal|| exit 1
autoconf || exit 1
autoheader || exit 1
}
--
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 /ext/dio dio.c
sniper Tue Jan 25 08:43:37 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/diodio.c Log: MFH: - Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.816r2=1.1247.2.817ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.816 php-src/NEWS:1.1247.2.817 --- php-src/NEWS:1.1247.2.816 Tue Jan 25 07:55:55 2005 +++ php-src/NEWSTue Jan 25 08:43:36 2005 @@ -5,6 +5,8 @@ - Changed phpize not to require libtool. (Jani) - Fixed build system to always use bundled libtool files. (Jani) - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus) +- Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings). + (elod at itfais dot com) - Fixed bug #31623 (OCILogin does not support password grace period). (daniel dot beet at accuratesoftware dot com, Tony) - Fixed bug #31580 (fgetcsv() problematic with escape sequences). (Ilia) http://cvs.php.net/diff.php/php-src/ext/dio/dio.c?r1=1.21.2.11r2=1.21.2.12ty=u Index: php-src/ext/dio/dio.c diff -u php-src/ext/dio/dio.c:1.21.2.11 php-src/ext/dio/dio.c:1.21.2.12 --- php-src/ext/dio/dio.c:1.21.2.11 Wed Nov 17 18:43:31 2004 +++ php-src/ext/dio/dio.c Tue Jan 25 08:43:37 2005 @@ -596,6 +596,8 @@ RETURN_FALSE; } + memset(newtio, 0, sizeof(newtio)); + tcgetattr(f-fd, newtio); newtio.c_cflag = BAUD | CRTSCTS | DATABITS | STOPBITS | PARITYON | PARITY | CLOCAL | CREAD; newtio.c_iflag = IGNPAR; newtio.c_oflag = 0; -- 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 /ext/standard browscap.c /sapi/embed php_embed.c
andrei Tue Jan 25 16:26:43 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard browscap.c
/php-src/sapi/embed php_embed.c
Log:
Fix several egregious leaks in ext/browscap and sapi/embed.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.817r2=1.1247.2.818ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.817 php-src/NEWS:1.1247.2.818
--- php-src/NEWS:1.1247.2.817 Tue Jan 25 08:43:36 2005
+++ php-src/NEWSTue Jan 25 16:26:40 2005
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||
?? ??? , Version 4.3.11
+- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei)
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
- Changed phpize not to require libtool. (Jani)
- Fixed build system to always use bundled libtool files. (Jani)
http://cvs.php.net/diff.php/php-src/ext/standard/browscap.c?r1=1.60.2.17r2=1.60.2.18ty=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.60.2.17
php-src/ext/standard/browscap.c:1.60.2.18
--- php-src/ext/standard/browscap.c:1.60.2.17 Mon Mar 15 16:27:01 2004
+++ php-src/ext/standard/browscap.c Tue Jan 25 16:26:42 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: browscap.c,v 1.60.2.17 2004/03/15 21:27:01 jay Exp $ */
+/* $Id: browscap.c,v 1.60.2.18 2005/01/25 21:26:42 andrei Exp $ */
#include php.h
#include php_regex.h
@@ -33,12 +33,17 @@
/* OBJECTS_FIXME: This whole extension needs going through. The use of objects
looks pretty broken here */
-static void browscap_entry_dtor(zval *pvalue)
+static void browscap_entry_dtor(zval **pvalue)
{
- if (Z_TYPE_P(pvalue) == IS_ARRAY) {
- zend_hash_destroy(Z_ARRVAL_P(pvalue));
- free(Z_ARRVAL_P(pvalue));
+ if (Z_TYPE_PP(pvalue) == IS_ARRAY) {
+ zend_hash_destroy(Z_ARRVAL_PP(pvalue));
+ free(Z_ARRVAL_PP(pvalue));
+ } else if (Z_TYPE_PP(pvalue) == IS_STRING) {
+ if (Z_STRVAL_PP(pvalue) Z_STRVAL_PP(pvalue) != empty_string)
{
+ free(Z_STRVAL_PP(pvalue));
+ }
}
+ free(*pvalue);
}
/* {{{ convert_browscap_pattern
@@ -97,7 +102,7 @@
new_property = (zval *) malloc(sizeof(zval));
INIT_PZVAL(new_property);
- Z_STRVAL_P(new_property) =
Z_STRLEN_P(arg2)?zend_strndup(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2)):;
+ Z_STRVAL_P(new_property) =
Z_STRLEN_P(arg2)?zend_strndup(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2)):empty_string;
Z_STRLEN_P(new_property) = Z_STRLEN_P(arg2);
Z_TYPE_P(new_property) = IS_STRING;
@@ -123,6 +128,7 @@
section_properties = (HashTable *)
malloc(sizeof(HashTable));
zend_hash_init(section_properties, 0, NULL,
(dtor_func_t) browscap_entry_dtor, 1);
current_section-value.ht = section_properties;
+ current_section-type = IS_ARRAY;
zend_hash_update(browser_hash,
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, (void *) current_section, sizeof(zval
*), NULL);
Z_STRVAL_P(processed) = Z_STRVAL_P(arg1);
http://cvs.php.net/diff.php/php-src/sapi/embed/php_embed.c?r1=1.1.2.4r2=1.1.2.5ty=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.1.2.4
php-src/sapi/embed/php_embed.c:1.1.2.5
--- php-src/sapi/embed/php_embed.c:1.1.2.4 Wed Jan 29 10:42:43 2003
+++ php-src/sapi/embed/php_embed.c Tue Jan 25 16:26:42 2005
@@ -15,7 +15,7 @@
| Author: Edin Kadribasic [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_embed.c,v 1.1.2.4 2003/01/29 15:42:43 edink Exp $ */
+/* $Id: php_embed.c,v 1.1.2.5 2005/01/25 21:26:42 andrei Exp $ */
#include php_embed.h
@@ -213,6 +213,7 @@
{
php_request_shutdown((void *) 0);
php_module_shutdown(TSRMLS_C);
+ sapi_shutdown();
#ifdef ZTS
tsrm_shutdown();
#endif
--
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 /ext/standard pack.c
iliaa Tue Jan 25 17:52:19 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard pack.c
Log:
MFH: Fixed bug #31465 (False warning in unpack() when working with *).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.818r2=1.1247.2.819ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.818 php-src/NEWS:1.1247.2.819
--- php-src/NEWS:1.1247.2.818 Tue Jan 25 16:26:40 2005
+++ php-src/NEWSTue Jan 25 17:52:18 2005
@@ -13,6 +13,7 @@
- Fixed bug #31580 (fgetcsv() problematic with escape sequences). (Ilia)
- Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia)
- Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen strlen).
(Ilia)
+- Fixed bug #31465 (False warning in unpack() when working with *). (Ilia)
- Fixed bug #31454 (session_set_save_handler crashes PHP when supplied
non-existent object ref). (Tony)
- Fixed bug #31444 (Memory leak in zend_language_scanner.c).
http://cvs.php.net/diff.php/php-src/ext/standard/pack.c?r1=1.40.2.6r2=1.40.2.7ty=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.40.2.6
php-src/ext/standard/pack.c:1.40.2.7
--- php-src/ext/standard/pack.c:1.40.2.6Sun Nov 28 07:44:56 2004
+++ php-src/ext/standard/pack.c Tue Jan 25 17:52:19 2005
@@ -15,7 +15,7 @@
| Author: Chris Schneider [EMAIL PROTECTED] |
+--+
*/
-/* $Id: pack.c,v 1.40.2.6 2004/11/28 12:44:56 sesser Exp $ */
+/* $Id: pack.c,v 1.40.2.7 2005/01/25 22:52:19 iliaa Exp $ */
#include php.h
@@ -833,7 +833,9 @@
inputpos += size;
if (inputpos 0) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, Type %c: outside of string, type);
+ if (size != -1) { /* only print warning
if not working with * */
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, Type %c: outside of string, type);
+ }
inputpos = 0;
}
} else if (arg 0) {
--
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
sniper Tue Jan 25 18:42:40 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: massage http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.819r2=1.1247.2.820ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.819 php-src/NEWS:1.1247.2.820 --- php-src/NEWS:1.1247.2.819 Tue Jan 25 17:52:18 2005 +++ php-src/NEWSTue Jan 25 18:42:38 2005 @@ -1,9 +1,9 @@ PHP 4 NEWS ||| ?? ??? , Version 4.3.11 -- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei) - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Changed phpize not to require libtool. (Jani) +- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei) - Fixed build system to always use bundled libtool files. (Jani) - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus) - Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings). -- 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 /ext/standard formatted_print.c
iliaa Tue Jan 25 19:03:20 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard formatted_print.c
Log:
MFH: Fixed bug #29733 (printf() handles repeated placeholders wrong).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.820r2=1.1247.2.821ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.820 php-src/NEWS:1.1247.2.821
--- php-src/NEWS:1.1247.2.820 Tue Jan 25 18:42:38 2005
+++ php-src/NEWSTue Jan 25 19:03:17 2005
@@ -46,6 +46,8 @@
in segfault). (pdan-php at esync dot org, Tony)
- Fixed bug #30120 (imagettftext() and imagettfbbox() accept too many
parameters). (Jani)
+- Fixed bug #29733 (printf() handles repeated placeholders wrong).
+ (bugs dot php dot net at bluetwanger dot de, Ilia)
- Fixed bug #28976 (mail(): use From: from headers if sendmail_from is
empty).
(Jani)
- Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
http://cvs.php.net/diff.php/php-src/ext/standard/formatted_print.c?r1=1.59.2.14r2=1.59.2.15ty=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.59.2.14
php-src/ext/standard/formatted_print.c:1.59.2.15
--- php-src/ext/standard/formatted_print.c:1.59.2.14Mon Nov 15 08:40:31 2004
+++ php-src/ext/standard/formatted_print.c Tue Jan 25 19:03:19 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: formatted_print.c,v 1.59.2.14 2004/11/15 13:40:31 derick Exp $ */
+/* $Id: formatted_print.c,v 1.59.2.15 2005/01/26 00:03:19 iliaa Exp $ */
#include math.h /* modf() */
#include php.h
@@ -536,12 +536,6 @@
php_sprintf_appendchar(result, outpos, size, '%'
TSRMLS_CC);
inpos += 2;
} else {
- if (currarg = argc format[inpos + 1] != '%') {
- efree(result);
- efree(args);
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
Too few arguments);
- return NULL;
- }
/* starting a new format specifier, reset variables */
alignment = ALIGN_RIGHT;
adjusting = 0;
@@ -570,12 +564,6 @@
} else {
argnum = currarg++;
}
- if (argnum = argc) {
- efree(result);
- efree(args);
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, Too few arguments);
- return NULL;
- }
/* after argnum comes modifiers */
PRINTF_DEBUG((sprintf: looking for modifiers\n
@@ -631,6 +619,13 @@
argnum = currarg++;
}
+ if (argnum = argc) {
+ efree(result);
+ efree(args);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Too few arguments);
+ return NULL;
+ }
+
if (format[inpos] == 'l') {
inpos++;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard string.c /main rfc1867.c
On 2005/01/22, at 4:50, Ilia Alshanetsky wrote: Moriyoshi Koizumi wrote: Right, but the browsers send filenames in its particular form, whose path delimiter could be '\\'. Isn't this causing another problem on a *NIX system where '\\' isn't regarded as a delimiter by php_basename()? No, browsers send filenames however they like, we cannot assume anything since ultimately someone could doctor a request. On *NIX, \ would be ignored and continue being part of the filename. In effect keeping the original supplied file name in play. While the above statement is perfectly valid, yet it cannot be a reason to use php_basename() there, because the function also makes an inappropriate assumption that given pathes are all in a platform specific form (not saying that php_basename() itself works wrongly but is abused here). What if the server is running on a *nix and the submitted filename is somewhat like c:\windows\system32\what_is_this?? Resulting filename was always the last component of the path on every system prior to your fix. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard string.c /main rfc1867.c
On 2005/01/21, at 2:57, Ilia Alshanetsky wrote:
iliaa Thu Jan 20 12:57:42 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/main rfc1867.c
/php-src/ext/standard string.c
Log:
MFH: Fixed bug #31398 (When magic_guotes_gpc are enabled filenames
with '
get cutoff).
http://cvs.php.net/diff.php/php-src/NEWS?
r1=1.1247.2.810r2=1.1247.2.811ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.810 php-src/NEWS:1.1247.2.811
--- php-src/NEWS:1.1247.2.810 Wed Jan 19 20:43:19 2005
+++ php-src/NEWS Thu Jan 20 12:57:40 2005
@@ -19,6 +19,8 @@
- Fixed bug #31174 (compile warning in url.c). (Ilia, lukem at NetBSD
dot org)
- Fixed bug #31159 (COM object access is not working). (Wez)
- Fixed bug #31142 (imap_mail_compose() fails to generate correct
output). (Ilia)
+- Fixed bug #31398 (When magic_guotes_gpc are enabled filenames with
' get cutoff).
+ (Ilia)
- Fixed bug #31120 (mssql_query returns false on successfull inserts
and
stored procedures). (Frank)
- Fixed bugs #31107, #31110, #3 (Compile failure of
zend_strtod.c). (Jani)
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?
r1=1.122.2.28r2=1.122.2.29ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.28
php-src/main/rfc1867.c:1.122.2.29
--- php-src/main/rfc1867.c:1.122.2.28 Sat Nov 20 15:16:44 2004
+++ php-src/main/rfc1867.c Thu Jan 20 12:57:41 2005
@@ -16,7 +16,7 @@
| Jani Taskinen [EMAIL PROTECTED]
|
+--
+
*/
-/* $Id: rfc1867.c,v 1.122.2.28 2004/11/20 20:16:44 sesser Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.29 2005/01/20 17:57:41 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -31,6 +31,7 @@
#include php_globals.h
#include php_variables.h
#include rfc1867.h
+#include ext/standard/php_string.h
#undef DEBUG_FILE_UPLOAD
@@ -842,7 +843,7 @@
while (!multipart_buffer_eof(mbuff TSRMLS_CC))
{
char buff[FILLUNIT];
- char *cd=NULL,*param=NULL,*filename=NULL, *tmp=NULL;
+ char *cd=NULL,*param=NULL,*filename=NULL;
int blen=0, wlen=0;
zend_llist_clean(header);
@@ -1064,30 +1065,13 @@
str_len = strlen(filename);
php_mb_gpc_encoding_converter(filename, str_len, 1, NULL, NULL
TSRMLS_CC);
}
-s = php_mb_strrchr(filename, '\\' TSRMLS_CC);
-if ((tmp = php_mb_strrchr(filename, '/' TSRMLS_CC)) s) {
- s = tmp;
-}
num_vars--;
- } else {
-s = strrchr(filename, '\\');
-if ((tmp = strrchr(filename, '/')) s) {
- s = tmp;
-}
- }
-#else
- s = strrchr(filename, '\\');
- if ((tmp = strrchr(filename, '/')) s) {
-s = tmp;
}
#endif
- if (PG(magic_quotes_gpc)) {
-s = s ? s : filename;
-tmp = strrchr(s, '\'');
-s = tmp s ? tmp : s;
-tmp = strrchr(s, '');
-s = tmp s ? tmp : s;
- }
+ /* ensure that the uploaded file name only contains the path */
+ s = php_basename(filename, strlen(filename), NULL, 0);
+ efree(filename);
+ filename = s;
Are you really sure how the removed part of code would work?
Obviously you broke something. Please clarify.
Moriyoshi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard string.c /main rfc1867.c
Uhm yes. The purpose of the code is to trim characters from the filename
that could be interpreted as a path consequently leading to all sorts of
interesting vulnerabilities. Given that we have a function for this very
purpose called php_basename() it would only seem logic to use it,
instead of duplicating it's functionality (incorrectly I might add).
Ilia
Moriyoshi Koizumi wrote:
On 2005/01/21, at 2:57, Ilia Alshanetsky wrote:
iliaaThu Jan 20 12:57:42 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/mainrfc1867.c
/php-src/ext/standardstring.c
Log:
MFH: Fixed bug #31398 (When magic_guotes_gpc are enabled filenames
with '
get cutoff).
http://cvs.php.net/diff.php/php-src/NEWS?
r1=1.1247.2.810r2=1.1247.2.811ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.810 php-src/NEWS:1.1247.2.811
--- php-src/NEWS:1.1247.2.810Wed Jan 19 20:43:19 2005
+++ php-src/NEWSThu Jan 20 12:57:40 2005
@@ -19,6 +19,8 @@
- Fixed bug #31174 (compile warning in url.c). (Ilia, lukem at
NetBSD dot org)
- Fixed bug #31159 (COM object access is not working). (Wez)
- Fixed bug #31142 (imap_mail_compose() fails to generate correct
output). (Ilia)
+- Fixed bug #31398 (When magic_guotes_gpc are enabled filenames with
' get cutoff).
+ (Ilia)
- Fixed bug #31120 (mssql_query returns false on successfull inserts
and
stored procedures). (Frank)
- Fixed bugs #31107, #31110, #3 (Compile failure of
zend_strtod.c). (Jani)
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?
r1=1.122.2.28r2=1.122.2.29ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.28
php-src/main/rfc1867.c:1.122.2.29
--- php-src/main/rfc1867.c:1.122.2.28Sat Nov 20 15:16:44 2004
+++ php-src/main/rfc1867.cThu Jan 20 12:57:41 2005
@@ -16,7 +16,7 @@
| Jani Taskinen
[EMAIL PROTECTED] |
+-- +
*/
-/* $Id: rfc1867.c,v 1.122.2.28 2004/11/20 20:16:44 sesser Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.29 2005/01/20 17:57:41 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -31,6 +31,7 @@
#include php_globals.h
#include php_variables.h
#include rfc1867.h
+#include ext/standard/php_string.h
#undef DEBUG_FILE_UPLOAD
@@ -842,7 +843,7 @@
while (!multipart_buffer_eof(mbuff TSRMLS_CC))
{
char buff[FILLUNIT];
-char *cd=NULL,*param=NULL,*filename=NULL, *tmp=NULL;
+char *cd=NULL,*param=NULL,*filename=NULL;
int blen=0, wlen=0;
zend_llist_clean(header);
@@ -1064,30 +1065,13 @@
str_len = strlen(filename);
php_mb_gpc_encoding_converter(filename,
str_len, 1, NULL, NULL TSRMLS_CC);
}
-s = php_mb_strrchr(filename, '\\' TSRMLS_CC);
-if ((tmp = php_mb_strrchr(filename, '/' TSRMLS_CC))
s) {
-s = tmp;
-}
num_vars--;
-} else {
-s = strrchr(filename, '\\');
-if ((tmp = strrchr(filename, '/')) s) {
-s = tmp;
-}
-}
-#else
-s = strrchr(filename, '\\');
-if ((tmp = strrchr(filename, '/')) s) {
-s = tmp;
}
#endif
-if (PG(magic_quotes_gpc)) {
-s = s ? s : filename;
-tmp = strrchr(s, '\'');
-s = tmp s ? tmp : s;
-tmp = strrchr(s, '');
-s = tmp s ? tmp : s;
-}
+/* ensure that the uploaded file name only contains the
path */
+s = php_basename(filename, strlen(filename), NULL, 0);
+efree(filename);
+filename = s;
Are you really sure how the removed part of code would work?
Obviously you broke something. Please clarify.
Moriyoshi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard string.c /main rfc1867.c
On 2005/01/22, at 0:02, Ilia Alshanetsky wrote:
Uhm yes. The purpose of the code is to trim characters from the
filename that could be interpreted as a path consequently leading to
all sorts of interesting vulnerabilities. Given that we have a
function for this very purpose called php_basename() it would only
seem logic to use it, instead of duplicating it's functionality
(incorrectly I might add).
What is really confusing around this stuff, is that php_basename() is
all but designed to work on the filesystem where the script is running,
while the filename coming from the outside isn't necessarily given in
the same scheme. For example, php_basename() is unlikely to handle a
filename encoded in a different encoding than the system's. In fact,
'\\' (0x5c) appears in the second byte of a Shift_JIS sequence, which
is the most commonly used multibyte encoding in Japan.
It's not just about a reinvention of the automobiles :)
Moriyoshi
Ilia
Moriyoshi Koizumi wrote:
On 2005/01/21, at 2:57, Ilia Alshanetsky wrote:
iliaaThu Jan 20 12:57:42 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/mainrfc1867.c
/php-src/ext/standardstring.c
Log:
MFH: Fixed bug #31398 (When magic_guotes_gpc are enabled filenames
with '
get cutoff).
http://cvs.php.net/diff.php/php-src/NEWS?
r1=1.1247.2.810r2=1.1247.2.811ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.810 php-src/NEWS:1.1247.2.811
--- php-src/NEWS:1.1247.2.810Wed Jan 19 20:43:19 2005
+++ php-src/NEWSThu Jan 20 12:57:40 2005
@@ -19,6 +19,8 @@
- Fixed bug #31174 (compile warning in url.c). (Ilia, lukem at
NetBSD dot org)
- Fixed bug #31159 (COM object access is not working). (Wez)
- Fixed bug #31142 (imap_mail_compose() fails to generate correct
output). (Ilia)
+- Fixed bug #31398 (When magic_guotes_gpc are enabled filenames
with ' get cutoff).
+ (Ilia)
- Fixed bug #31120 (mssql_query returns false on successfull
inserts and
stored procedures). (Frank)
- Fixed bugs #31107, #31110, #3 (Compile failure of
zend_strtod.c). (Jani)
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?
r1=1.122.2.28r2=1.122.2.29ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.28
php-src/main/rfc1867.c:1.122.2.29
--- php-src/main/rfc1867.c:1.122.2.28Sat Nov 20 15:16:44 2004
+++ php-src/main/rfc1867.cThu Jan 20 12:57:41 2005
@@ -16,7 +16,7 @@
| Jani Taskinen [EMAIL PROTECTED]
|
+
-- +
*/
-/* $Id: rfc1867.c,v 1.122.2.28 2004/11/20 20:16:44 sesser Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.29 2005/01/20 17:57:41 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -31,6 +31,7 @@
#include php_globals.h
#include php_variables.h
#include rfc1867.h
+#include ext/standard/php_string.h
#undef DEBUG_FILE_UPLOAD
@@ -842,7 +843,7 @@
while (!multipart_buffer_eof(mbuff TSRMLS_CC))
{
char buff[FILLUNIT];
-char *cd=NULL,*param=NULL,*filename=NULL, *tmp=NULL;
+char *cd=NULL,*param=NULL,*filename=NULL;
int blen=0, wlen=0;
zend_llist_clean(header);
@@ -1064,30 +1065,13 @@
str_len = strlen(filename);
php_mb_gpc_encoding_converter(filename,
str_len, 1, NULL, NULL TSRMLS_CC);
}
-s = php_mb_strrchr(filename, '' TSRMLS_CC);
-if ((tmp = php_mb_strrchr(filename, '/' TSRMLS_CC))
s) {
-s = tmp;
-}
num_vars--;
-} else {
-s = strrchr(filename, '');
-if ((tmp = strrchr(filename, '/')) s) {
-s = tmp;
-}
-}
-#else
-s = strrchr(filename, '');
-if ((tmp = strrchr(filename, '/')) s) {
-s = tmp;
}
#endif
-if (PG(magic_quotes_gpc)) {
-s = s ? s : filename;
-tmp = strrchr(s, ''');
-s = tmp s ? tmp : s;
-tmp = strrchr(s, '');
-s = tmp s ? tmp : s;
-}
+/* ensure that the uploaded file name only contains the
path */
+s = php_basename(filename, strlen(filename), NULL, 0);
+efree(filename);
+filename = s;
Are you really sure how the removed part of code would work?
Obviously you broke something. Please clarify.
Moriyoshi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard string.c /main rfc1867.c
Moriyoshi Koizumi wrote: What is really confusing around this stuff, is that php_basename() is all but designed to work on the filesystem where the script is running, while the filename coming from the outside isn't necessarily given in the same scheme. For example, php_basename() is unlikely to handle a filename encoded in a different encoding than the system's. In fact, '\\' (0x5c) appears in the second byte of a Shift_JIS sequence, which is the most commonly used multibyte encoding in Japan. Well, there are several problems with this. On a *NIX system it is perfectly valid to have a file name with \ characters in it. They cause no problems for the system or the upload code. However, if things like s = strrchr(filename, '\\'); are done the filename is trimmed. In addition that older variant of the code would still have problem with multibyte languages unless mbstring extension was compiled enabled. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard string.c /main rfc1867.c
On 2005/01/22, at 1:12, Ilia Alshanetsky wrote:
Moriyoshi Koizumi wrote:
What is really confusing around this stuff, is that php_basename() is
all but designed to work on the filesystem where the script is
running,
while the filename coming from the outside isn't necessarily given in
the same scheme. For example, php_basename() is unlikely to handle a
filename encoded in a different encoding than the system's. In fact,
'\\' (0x5c) appears in the second byte of a Shift_JIS sequence, which
is the most commonly used multibyte encoding in Japan.
Well, there are several problems with this. On a *NIX system it is
perfectly valid to have a file name with \ characters in it. They cause
no problems for the system or the upload code. However, if things like
s = strrchr(filename, '\\'); are done the filename is trimmed. In
addition that older variant of the code would still have problem with
multibyte languages unless mbstring extension was compiled enabled.
Right, but the browsers send filenames in its particular form, whose
path delimiter could be '\\'. Isn't this causing another problem on
a *NIX system where '\\' isn't regarded as a delimiter by
php_basename()?
BTW,
- if (PG(magic_quotes_gpc)) {
- s = s ? s : filename;
- tmp = strrchr(s, ''');
- s = tmp s ? tmp : s;
- tmp = strrchr(s, '');
- s = tmp s ? tmp : s;
- }
I think this portion is just the unwanted one. The rest should be kept
either way.
Moriyoshi
Ilia
--
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
