[PHP-CVS] I cannot forget you!
your big love, ;-) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Private document
I cannot believe that. -- 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) /main rfc1867.c
iliaa Mon Jan 31 21:33:25 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/main rfc1867.c Log: MFH: Final version of filename upload handling. http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.122.2.31&r2=1.122.2.32&ty=u Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.122.2.31 php-src/main/rfc1867.c:1.122.2.32 --- php-src/main/rfc1867.c:1.122.2.31 Mon Jan 24 18:52:27 2005 +++ php-src/main/rfc1867.c Mon Jan 31 21:33:25 2005 @@ -16,7 +16,7 @@ | Jani Taskinen <[EMAIL PROTECTED]> | +--+ */ -/* $Id: rfc1867.c,v 1.122.2.31 2005/01/24 23:52:27 iliaa Exp $ */ +/* $Id: rfc1867.c,v 1.122.2.32 2005/02/01 02:33:25 iliaa Exp $ */ /* * This product includes software developed by the Apache Group @@ -31,7 +31,6 @@ #include "php_globals.h" #include "php_variables.h" #include "rfc1867.h" -#include "ext/standard/php_string.h" #undef DEBUG_FILE_UPLOAD @@ -1065,7 +1064,11 @@ str_len = strlen(filename); php_mb_gpc_encoding_converter(&filename, &str_len, 1, NULL, NULL TSRMLS_CC); } +#ifdef PHP_WIN32 s = php_mb_strrchr(filename, '\\' TSRMLS_CC); +#else + s = filename; +#endif if ((tmp = php_mb_strrchr(filename, '/' TSRMLS_CC)) > s) { s = tmp; } @@ -1073,11 +1076,24 @@ goto filedone; } #endif +#ifdef PHP_WIN32 + s = strrchr(filename, '\\'); +#else + s = filename; +#endif + if ((tmp = strrchr(filename, '/')) > s) { + s = tmp; + } +#ifdef PHP_WIN32 + 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; + } +#endif - /* ensure that the uploaded file name only contains the path */ - s = php_basename(filename, strlen(filename), NULL, 0); - efree(filename); - filename = s; #if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING) filedone: #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /main rfc1867.c
iliaa Mon Jan 31 21:33:17 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/main rfc1867.c Log: MFH: Final version of filename upload handling. http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.159.2.9&r2=1.159.2.10&ty=u Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.159.2.9 php-src/main/rfc1867.c:1.159.2.10 --- php-src/main/rfc1867.c:1.159.2.9Mon Jan 24 17:41:41 2005 +++ php-src/main/rfc1867.c Mon Jan 31 21:33:17 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: rfc1867.c,v 1.159.2.9 2005/01/24 22:41:41 iliaa Exp $ */ +/* $Id: rfc1867.c,v 1.159.2.10 2005/02/01 02:33:17 iliaa Exp $ */ /* * This product includes software developed by the Apache Group @@ -32,7 +32,6 @@ #include "php_globals.h" #include "php_variables.h" #include "rfc1867.h" -#include "ext/standard/php_string.h" #define DEBUG_FILE_UPLOAD ZEND_DEBUG @@ -1078,7 +1077,11 @@ str_len = strlen(filename); php_mb_gpc_encoding_converter(&filename, &str_len, 1, NULL, NULL TSRMLS_CC); } +#ifdef PHP_WIN32 s = php_mb_strrchr(filename, '\\' TSRMLS_CC); +#else + s = filename; +#endif if ((tmp = php_mb_strrchr(filename, '/' TSRMLS_CC)) > s) { s = tmp; } @@ -1087,10 +1090,23 @@ } #endif - /* ensure that the uploaded file name only contains the path */ - php_basename(filename, strlen(filename), NULL, 0, &s, NULL TSRMLS_CC); - efree(filename); - filename = s; +#ifdef PHP_WIN32 + s = strrchr(filename, '\\'); +#else + s = filename; +#endif + if ((tmp = strrchr(filename, '/')) > s) { + s = tmp; + } +#ifdef PHP_WIN32 + 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; + } +#endif #if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING) filedone: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main rfc1867.c
iliaa Mon Jan 31 21:33:07 2005 EDT Modified files: /php-src/main rfc1867.c Log: Final version of filename upload handling. http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.168&r2=1.169&ty=u Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.168 php-src/main/rfc1867.c:1.169 --- php-src/main/rfc1867.c:1.168Mon Jan 24 17:35:23 2005 +++ php-src/main/rfc1867.c Mon Jan 31 21:33:07 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: rfc1867.c,v 1.168 2005/01/24 22:35:23 iliaa Exp $ */ +/* $Id: rfc1867.c,v 1.169 2005/02/01 02:33:07 iliaa Exp $ */ /* * This product includes software developed by the Apache Group @@ -32,7 +32,6 @@ #include "php_globals.h" #include "php_variables.h" #include "rfc1867.h" -#include "ext/standard/php_string.h" #define DEBUG_FILE_UPLOAD ZEND_DEBUG @@ -1078,7 +1077,11 @@ str_len = strlen(filename); php_mb_gpc_encoding_converter(&filename, &str_len, 1, NULL, NULL TSRMLS_CC); } +#ifdef PHP_WIN32 s = php_mb_strrchr(filename, '\\' TSRMLS_CC); +#else + s = filename; +#endif if ((tmp = php_mb_strrchr(filename, '/' TSRMLS_CC)) > s) { s = tmp; } @@ -1086,9 +1089,25 @@ goto filedone; } #endif - php_basename(filename, strlen(filename), NULL, 0, &s, NULL TSRMLS_CC); - efree(filename); - filename = s; + +#ifdef PHP_WIN32 + s = strrchr(filename, '\\'); +#else + s = filename; +#endif + if ((tmp = strrchr(filename, '/')) > s) { + s = tmp; + } +#ifdef PHP_WIN32 + 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; + } +#endif + #if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING) filedone: #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Hello
Important textfile! -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/soap php_sdl.c
dmitry Mon Jan 31 10:08:37 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/soap php_sdl.c Log: Fixed SIGSEGV when restoring WSDL without functions from cache http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.70.2.5&r2=1.70.2.6&ty=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.70.2.5 php-src/ext/soap/php_sdl.c:1.70.2.6 --- php-src/ext/soap/php_sdl.c:1.70.2.5 Tue Nov 9 03:13:04 2004 +++ php-src/ext/soap/php_sdl.c Mon Jan 31 10:08:36 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_sdl.c,v 1.70.2.5 2004/11/09 08:13:04 dmitry Exp $ */ +/* $Id: php_sdl.c,v 1.70.2.6 2005/01/31 15:08:36 dmitry Exp $ */ #include "php_soap.h" #include "ext/libxml/php_libxml.h" @@ -1507,8 +1507,8 @@ /* deserialize functions */ WSDL_CACHE_GET_INT(num_func, &in); + zend_hash_init(&sdl->functions, num_func, NULL, delete_function, 0); if (num_func > 0) { - zend_hash_init(&sdl->functions, num_func, NULL, delete_function, 0); functions = emalloc(num_func*sizeof(sdlFunctionPtr)); for (i = 0; i < num_func; i++) { int binding_num, num_faults; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c
dmitry Mon Jan 31 10:08:25 2005 EDT Modified files: /php-src/ext/soap php_sdl.c Log: Fixed SIGSEGV when restoring WSDL without functions from cache http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.76&r2=1.77&ty=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.76 php-src/ext/soap/php_sdl.c:1.77 --- php-src/ext/soap/php_sdl.c:1.76 Tue Nov 9 03:13:35 2004 +++ php-src/ext/soap/php_sdl.c Mon Jan 31 10:08:24 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_sdl.c,v 1.76 2004/11/09 08:13:35 dmitry Exp $ */ +/* $Id: php_sdl.c,v 1.77 2005/01/31 15:08:24 dmitry Exp $ */ #include "php_soap.h" #include "ext/libxml/php_libxml.h" @@ -1506,8 +1506,8 @@ /* deserialize functions */ WSDL_CACHE_GET_INT(num_func, &in); + zend_hash_init(&sdl->functions, num_func, NULL, delete_function, 0); if (num_func > 0) { - zend_hash_init(&sdl->functions, num_func, NULL, delete_function, 0); functions = emalloc(num_func*sizeof(sdlFunctionPtr)); for (i = 0; i < num_func; i++) { int binding_num, num_faults; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/soap soap.c
dmitry Mon Jan 31 09:26:25 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/soap soap.c Log: Empty "detail" was removed from SoapFault object. http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.21&r2=1.110.2.22&ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.110.2.21 php-src/ext/soap/soap.c:1.110.2.22 --- php-src/ext/soap/soap.c:1.110.2.21 Mon Jan 31 09:03:51 2005 +++ php-src/ext/soap/soap.c Mon Jan 31 09:26:24 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: soap.c,v 1.110.2.21 2005/01/31 14:03:51 dmitry Exp $ */ +/* $Id: soap.c,v 1.110.2.22 2005/01/31 14:26:24 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1865,7 +1865,6 @@ zval *outbuf = NULL; zval outbuflen; - ALLOC_INIT_ZVAL(outbuf); INIT_ZVAL(outbuflen); buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c
dmitry Mon Jan 31 09:26:08 2005 EDT Modified files: /php-src/ext/soap soap.c Log: Empty "detail" was removed from SoapFault object. http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.133&r2=1.134&ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.133 php-src/ext/soap/soap.c:1.134 --- php-src/ext/soap/soap.c:1.133 Mon Jan 31 09:02:19 2005 +++ php-src/ext/soap/soap.c Mon Jan 31 09:26:06 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: soap.c,v 1.133 2005/01/31 14:02:19 dmitry Exp $ */ +/* $Id: soap.c,v 1.134 2005/01/31 14:26:06 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1865,7 +1865,6 @@ zval *outbuf = NULL; zval outbuflen; - ALLOC_INIT_ZVAL(outbuf); INIT_ZVAL(outbuflen); buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/soap soap.c
dmitry Mon Jan 31 09:03:51 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/soap soap.c Log: Fixed memory allocation bug. http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.20&r2=1.110.2.21&ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.110.2.20 php-src/ext/soap/soap.c:1.110.2.21 --- php-src/ext/soap/soap.c:1.110.2.20 Fri Jan 28 05:33:33 2005 +++ php-src/ext/soap/soap.c Mon Jan 31 09:03:51 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: soap.c,v 1.110.2.20 2005/01/28 10:33:33 dmitry Exp $ */ +/* $Id: soap.c,v 1.110.2.21 2005/01/31 14:03:51 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1862,9 +1862,10 @@ char* code = SOAP_GLOBAL(error_code); char buffer[1024]; int buffer_len; - zval outbuf, outbuflen; + zval *outbuf = NULL; + zval outbuflen; - INIT_ZVAL(outbuf); + ALLOC_INIT_ZVAL(outbuf); INIT_ZVAL(outbuflen); buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args); @@ -1878,12 +1879,13 @@ } /* Get output buffer and send as fault detials */ if (php_ob_get_length(&outbuflen TSRMLS_CC) != FAILURE && Z_LVAL(outbuflen) != 0) { - php_ob_get_buffer(&outbuf TSRMLS_CC); + ALLOC_INIT_ZVAL(outbuf); + php_ob_get_buffer(outbuf TSRMLS_CC); } php_end_ob_buffer(0, 0 TSRMLS_CC); INIT_ZVAL(fault_obj); - set_soap_fault(&fault_obj, code, buffer, NULL, &outbuf, NULL TSRMLS_CC); + set_soap_fault(&fault_obj, code, buffer, NULL, outbuf, NULL TSRMLS_CC); fault = 1; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c
dmitry Mon Jan 31 09:02:21 2005 EDT Modified files: /php-src/ext/soap soap.c Log: Fixed memory allocation bug http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.132&r2=1.133&ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.132 php-src/ext/soap/soap.c:1.133 --- php-src/ext/soap/soap.c:1.132 Fri Jan 28 05:33:46 2005 +++ php-src/ext/soap/soap.c Mon Jan 31 09:02:19 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: soap.c,v 1.132 2005/01/28 10:33:46 dmitry Exp $ */ +/* $Id: soap.c,v 1.133 2005/01/31 14:02:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1862,9 +1862,10 @@ char* code = SOAP_GLOBAL(error_code); char buffer[1024]; int buffer_len; - zval outbuf, outbuflen; + zval *outbuf = NULL; + zval outbuflen; - INIT_ZVAL(outbuf); + ALLOC_INIT_ZVAL(outbuf); INIT_ZVAL(outbuflen); buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args); @@ -1878,12 +1879,13 @@ } /* Get output buffer and send as fault detials */ if (php_ob_get_length(&outbuflen TSRMLS_CC) != FAILURE && Z_LVAL(outbuflen) != 0) { - php_ob_get_buffer(&outbuf TSRMLS_CC); + ALLOC_INIT_ZVAL(outbuf); + php_ob_get_buffer(outbuf TSRMLS_CC); } php_end_ob_buffer(0, 0 TSRMLS_CC); INIT_ZVAL(fault_obj); - set_soap_fault(&fault_obj, code, buffer, NULL, &outbuf, NULL TSRMLS_CC); + set_soap_fault(&fault_obj, code, buffer, NULL, outbuf, NULL TSRMLS_CC); fault = 1; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Mon Jan 31 07:47:53 2005 EDT Modified files: /CVSROOTavail Log: - Add Karma to Mike so that he can put the source for PECL_HTTP into CVS. http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.933&r2=1.934&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.933 CVSROOT/avail:1.934 --- CVSROOT/avail:1.933 Mon Jan 31 05:45:51 2005 +++ CVSROOT/avail Mon Jan 31 07:47:50 2005 @@ -250,6 +250,7 @@ avail|uw|pecl/maxdb avail|magnus|Zend/tests,ZendEngine2/tests avail|blindman|pecl/colorer +avail|mike|pecl/http # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Mon Jan 31 05:45:53 2005 EDT Modified files: /CVSROOTavail Log: - Give George Miroshnikov (login: freespace) karma on phpdoc-ru (Requested by Antony Dovgal) http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.932&r2=1.933&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.932 CVSROOT/avail:1.933 --- CVSROOT/avail:1.932 Wed Jan 26 14:06:48 2005 +++ CVSROOT/avail Mon Jan 31 05:45:51 2005 @@ -76,6 +76,7 @@ avail|neonz|phpdoc-lv avail|mkoula|phpdoc-cs avail|xdanger|phpdoc-zh,phpdoc-hk +avail|freespace|phpdoc-ru # access to the newly cut pecl website etc avail|pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon,cellog|peclweb,pecl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: Its me
The file is protected with the password ghj001. +++ Attachment: No Virus found +++ Kaspersky AntiVirus - www.kaspersky.com -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php