[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip php_zip.c
pajoye Tue Nov 28 01:31:53 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zipphp_zip.c
Log:
- fix warning
- addEmptyDir returns true on success
- remove useless semi column
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.19&r2=1.1.2.20&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.19 php-src/ext/zip/php_zip.c:1.1.2.20
--- php-src/ext/zip/php_zip.c:1.1.2.19 Sun Nov 12 00:31:03 2006
+++ php-src/ext/zip/php_zip.c Tue Nov 28 01:31:53 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.1.2.19 2006/11/12 00:31:03 nlopess Exp $ */
+/* $Id: php_zip.c,v 1.1.2.20 2006/11/28 01:31:53 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -122,7 +122,7 @@
len = spprintf(&file_dirname_fullpath, 0, "%s", dest);
}
- php_basename(file, file_len, NULL, 0, &file_basename,
&file_basename_len TSRMLS_CC);
+ php_basename(file, file_len, NULL, 0, &file_basename, (int
*)&file_basename_len TSRMLS_CC);
if (SAFEMODE_CHECKFILE(file_dirname_fullpath)) {
efree(file_dirname_fullpath);
@@ -954,7 +954,7 @@
/* {{{ proto bool createEmptyDir(string dirname) U
Returns the index of the entry named filename in the archive */
-ZIPARCHIVE_METHOD(addEmptyDir)
+static ZIPARCHIVE_METHOD(addEmptyDir)
{
struct zip *intern;
zval *this = getThis();
@@ -978,6 +978,7 @@
if (zip_add_dir(intern, (const char *)dirname) < 0) {
RETURN_FALSE;
}
+ RETURN_TRUE;
}
/* }}} */
@@ -1004,7 +1005,6 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sll",
&filename, &filename_len, &entry_name, &entry_name_len,
&offset_start, &offset_len) == FAILURE) {
- WRONG_PARAM_COUNT;
return;
}
@@ -1375,7 +1375,7 @@
ZIP_FROM_OBJECT(intern, this);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
- &name, &name_len, &flags) == FAILURE) {;
+ &name, &name_len, &flags) == FAILURE) {
return;
}
if (name_len < 1) {
@@ -2001,7 +2001,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.19 2006/11/12 00:31:03 nlopess Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.20 2006/11/28 01:31:53 pajoye Exp $");
php_info_print_table_row(2, "Zip version", "2.0.0");
php_info_print_table_row(2, "Libzip version", "0.7.1");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c /ext/soap php_http.c
iliaa Tue Nov 28 00:24:16 2006 UTC
Modified files:
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/soap php_http.c
Log:
MFB: Replace non-threadsafe rand() with php_rand_r()
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.101&r2=1.102&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.101 php-src/ext/mcrypt/mcrypt.c:1.102
--- php-src/ext/mcrypt/mcrypt.c:1.101 Wed Nov 15 22:51:45 2006
+++ php-src/ext/mcrypt/mcrypt.c Tue Nov 28 00:24:16 2006
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: mcrypt.c,v 1.101 2006/11/15 22:51:45 mike Exp $ */
+/* $Id: mcrypt.c,v 1.102 2006/11/28 00:24:16 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1039,7 +1039,8 @@
case PHP_MCRYPT_IV_SOURCE_RAND:
*iv_len = size;
while (size) {
- (*iv_str)[--size] = 255.0 * rand() /
RAND_MAX;
+ unsigned int ctx;
+ (*iv_str)[--size] = 255.0 *
php_rand_r(&ctx) / RAND_MAX;
}
break;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.97&r2=1.98&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.97 php-src/ext/soap/php_http.c:1.98
--- php-src/ext/soap/php_http.c:1.97Wed Sep 6 11:03:59 2006
+++ php-src/ext/soap/php_http.c Tue Nov 28 00:24:16 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_http.c,v 1.97 2006/09/06 11:03:59 dmitry Exp $ */
+/* $Id: php_http.c,v 1.98 2006/11/28 00:24:16 iliaa Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -462,9 +462,10 @@
char HA1[33], HA2[33],
response[33], cnonce[33], nc[9];
PHP_MD5_CTX md5ctx;
unsigned char hash[16];
+ unsigned int ctx;
PHP_MD5Init(&md5ctx);
- sprintf(cnonce, "%d", rand());
+ sprintf(cnonce, "%d", php_rand_r(&ctx));
PHP_MD5Update(&md5ctx, (unsigned
char*)cnonce, strlen(cnonce));
PHP_MD5Final(hash, &md5ctx);
make_digest(cnonce, hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mcrypt mcrypt.c /ext/soap php_http.c
iliaa Tue Nov 28 00:22:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/soap php_http.c
Log:
Replace non-threadsafe rand() with php_rand_r()
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.5&r2=1.91.2.3.2.6&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.5
php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.6
--- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.5Mon Jun 26 16:33:38 2006
+++ php-src/ext/mcrypt/mcrypt.c Tue Nov 28 00:22:04 2006
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: mcrypt.c,v 1.91.2.3.2.5 2006/06/26 16:33:38 bjori Exp $ */
+/* $Id: mcrypt.c,v 1.91.2.3.2.6 2006/11/28 00:22:04 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1274,9 +1274,10 @@
RETURN_FALSE;
}
} else {
+ unsigned int ctx;
n = size;
while (size) {
- iv[--size] = 255.0 * rand() / RAND_MAX;
+ iv[--size] = 255.0 * php_rand_r(&ctx) / RAND_MAX;
}
}
RETURN_STRINGL(iv, n, 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.3&r2=1.77.2.11.2.4&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.3
php-src/ext/soap/php_http.c:1.77.2.11.2.4
--- php-src/ext/soap/php_http.c:1.77.2.11.2.3 Wed Sep 6 11:03:45 2006
+++ php-src/ext/soap/php_http.c Tue Nov 28 00:22:05 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_http.c,v 1.77.2.11.2.3 2006/09/06 11:03:45 dmitry Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.4 2006/11/28 00:22:05 iliaa Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -469,9 +469,10 @@
char HA1[33], HA2[33],
response[33], cnonce[33], nc[9];
PHP_MD5_CTX md5ctx;
unsigned char hash[16];
+ unsigned int ctx;
PHP_MD5Init(&md5ctx);
- sprintf(cnonce, "%d", rand());
+ sprintf(cnonce, "%d", php_rand_r(&ctx));
PHP_MD5Update(&md5ctx, (unsigned
char*)cnonce, strlen(cnonce));
PHP_MD5Final(hash, &md5ctx);
make_digest(cnonce, hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/pdo_sqlite sqlite_statement.c
tony2001Mon Nov 27 12:14:09 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/pdo_sqlite sqlite_statement.c Log: MFH: fix #39564 (PDO::errorInfo() returns inconsistent information when sqlite3_step() fails) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.377&r2=1.2027.2.547.2.378&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.377 php-src/NEWS:1.2027.2.547.2.378 --- php-src/NEWS:1.2027.2.547.2.377 Sun Nov 26 16:26:18 2006 +++ php-src/NEWSMon Nov 27 12:14:09 2006 @@ -50,6 +50,8 @@ - Fixed bug #39602 (Invalid session.save_handler crashes PHP). (Dmitry) - Fixed bug #39583 (ftp_put() does not change transfer mode to ASCII). (Tony) - Fixed bug #39576 (array_walk() doesn't separate userdata zval). (Tony) +- Fixed bug #39564 (PDO::errorInfo() returns inconsistent information when + sqlite3_step() fails). (Tony) - Fixed bug #39548 (ZMSG_LOG_SCRIPT_NAME not routed to OutputDebugString() on Windows). (Dmitry) - Fixed bug #39538 (fgetcsv can't handle starting newlines and trailing odd http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4&r2=1.18.2.4.2.1&diff_format=u Index: php-src/ext/pdo_sqlite/sqlite_statement.c diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4 php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.1 --- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4 Sun Jan 1 12:50:12 2006 +++ php-src/ext/pdo_sqlite/sqlite_statement.c Mon Nov 27 12:14:09 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: sqlite_statement.c,v 1.18.2.4 2006/01/01 12:50:12 sniper Exp $ */ +/* $Id: sqlite_statement.c,v 1.18.2.4.2.1 2006/11/27 12:14:09 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -66,6 +66,7 @@ return 1; case SQLITE_ERROR: + sqlite3_reset(S->stmt); case SQLITE_MISUSE: case SQLITE_BUSY: default: @@ -171,6 +172,8 @@ sqlite3_reset(S->stmt); return 0; + case SQLITE_ERROR: + sqlite3_reset(S->stmt); default: pdo_sqlite_error_stmt(stmt); return 0; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite sqlite_statement.c
tony2001Mon Nov 27 12:13:02 2006 UTC Modified files: /php-src/ext/pdo_sqlite sqlite_statement.c Log: fix #39564 (PDO::errorInfo() returns inconsistent information when sqlite3_step() fails) http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.20&r2=1.21&diff_format=u Index: php-src/ext/pdo_sqlite/sqlite_statement.c diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.20 php-src/ext/pdo_sqlite/sqlite_statement.c:1.21 --- php-src/ext/pdo_sqlite/sqlite_statement.c:1.20 Sun Jan 1 13:09:53 2006 +++ php-src/ext/pdo_sqlite/sqlite_statement.c Mon Nov 27 12:13:02 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: sqlite_statement.c,v 1.20 2006/01/01 13:09:53 sniper Exp $ */ +/* $Id: sqlite_statement.c,v 1.21 2006/11/27 12:13:02 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -66,6 +66,7 @@ return 1; case SQLITE_ERROR: + sqlite3_reset(S->stmt); case SQLITE_MISUSE: case SQLITE_BUSY: default: @@ -156,6 +157,8 @@ sqlite3_reset(S->stmt); return 0; + case SQLITE_ERROR: + sqlite3_reset(S->stmt); default: pdo_sqlite_error_stmt(stmt); return 0; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ftp/tests 004.phpt
tony2001Mon Nov 27 11:43:59 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/ftp/tests 004.phpt Log: MFH: fix test on FreeBSD http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/004.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/ftp/tests/004.phpt diff -u php-src/ext/ftp/tests/004.phpt:1.1.2.2 php-src/ext/ftp/tests/004.phpt:1.1.2.3 --- php-src/ext/ftp/tests/004.phpt:1.1.2.2 Fri Nov 24 13:39:24 2006 +++ php-src/ext/ftp/tests/004.phpt Mon Nov 27 11:43:59 2006 @@ -56,7 +56,7 @@ Warning: ftp_close() expects exactly 1 parameter, 0 given in %s004.php on line 17 NULL -Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: Name or service not known in %s004.php on line 18 +Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: %s not known in %s004.php on line 18 bool(false) Warning: ftp_delete() expects parameter 2 to be string, array given in %s004.php on line 19 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ftp/tests 004.phpt
tony2001Mon Nov 27 11:43:45 2006 UTC Modified files: /php-src/ext/ftp/tests 004.phpt Log: fix test this errmsg is different on FreeBSD http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/004.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/ftp/tests/004.phpt diff -u php-src/ext/ftp/tests/004.phpt:1.3 php-src/ext/ftp/tests/004.phpt:1.4 --- php-src/ext/ftp/tests/004.phpt:1.3 Fri Nov 24 13:39:16 2006 +++ php-src/ext/ftp/tests/004.phpt Mon Nov 27 11:43:45 2006 @@ -56,7 +56,7 @@ Warning: ftp_close() expects exactly 1 parameter, 0 given in %s004.php on line 17 NULL -Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: Name or service not known in %s004.php on line 18 +Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: %s not known in %s004.php on line 18 bool(false) Warning: ftp_delete() expects parameter 2 to be string, array given in %s004.php on line 19 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
