[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache_hooks php_apache.c
pajoye Mon Mar 16 09:59:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache_hooks php_apache.c
Log:
- fix vc6 build
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.15r2=1.19.2.3.2.5.2.16diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.15
php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.16
--- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.15Sat Mar 7
22:36:35 2009
+++ php-src/sapi/apache_hooks/php_apache.c Mon Mar 16 09:59:16 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.19.2.3.2.5.2.15 2009/03/07 22:36:35 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.5.2.16 2009/03/16 09:59:16 pajoye Exp $ */
#include php_apache_http.h
@@ -713,21 +713,23 @@
PHP_FUNCTION(apache_request_remote_host)
{
zval *id;
- long type = 0;
+ long ztype;
request_rec *r;
char *res;
+ int type = REMOTE_NAME;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, type) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, ztype) ==
FAILURE) {
return;
}
- if (!type) {
- type = REMOTE_NAME
+ if (ZEND_NUM_ARGS() == 1) {
+ type = ztype;
}
+
APREQ_GET_REQUEST(id, r);
- res = (char *)ap_get_remote_host(r-connection, r-per_dir_config,
(int)type);
+ res = (char *)ap_get_remote_host(r-connection, r-per_dir_config,
type);
if (res) {
RETURN_STRING(res, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache_hooks php_apache.c
pajoye Mon Mar 16 10:13:18 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache_hooks php_apache.c
Log:
- fix build
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.17r2=1.19.2.3.2.5.2.18diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.17
php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.18
--- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.17Mon Mar 16
10:08:51 2009
+++ php-src/sapi/apache_hooks/php_apache.c Mon Mar 16 10:13:18 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.19.2.3.2.5.2.17 2009/03/16 10:08:51 pajoye Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.5.2.18 2009/03/16 10:13:18 pajoye Exp $ */
#include php_apache_http.h
@@ -722,7 +722,7 @@
}
if (!type) {
- type = REMOTE_NAME
+ type = REMOTE_NAME;
}
APREQ_GET_REQUEST(id, r);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
pajoye Mon Mar 16 10:14:16 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
- MFB: fix build
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.45r2=1.46diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.45
php-src/sapi/apache_hooks/php_apache.c:1.46
--- php-src/sapi/apache_hooks/php_apache.c:1.45 Tue Mar 10 23:40:01 2009
+++ php-src/sapi/apache_hooks/php_apache.c Mon Mar 16 10:14:16 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.45 2009/03/10 23:40:01 helly Exp $ */
+/* $Id: php_apache.c,v 1.46 2009/03/16 10:14:16 pajoye Exp $ */
#include php_apache_http.h
@@ -722,7 +722,7 @@
}
if (!type) {
- type = REMOTE_NAME
+ type = REMOTE_NAME;
}
APREQ_GET_REQUEST(id, r);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip/lib zip_open.c /ext/zip/tests bug47667.phpt
mkoppanen Mon Mar 16 10:19:43 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/zip/tests bug47667.phpt
Modified files:
/php-src/ext/zip/libzip_open.c
Log:
Closes bug #47667
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_open.c?r1=1.1.2.4.2.6r2=1.1.2.4.2.7diff_format=u
Index: php-src/ext/zip/lib/zip_open.c
diff -u php-src/ext/zip/lib/zip_open.c:1.1.2.4.2.6
php-src/ext/zip/lib/zip_open.c:1.1.2.4.2.7
--- php-src/ext/zip/lib/zip_open.c:1.1.2.4.2.6 Fri Jan 2 00:07:57 2009
+++ php-src/ext/zip/lib/zip_open.c Mon Mar 16 10:19:43 2009
@@ -66,6 +66,9 @@
int i;
off_t len;
+if (flags ZIP_OVERWRITE) {
+ return _zip_allocate_new(fn, zep);
+}
switch (_zip_file_exists(fn, flags, zep)) {
case -1:
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug47667.phpt?view=markuprev=1.1
Index: php-src/ext/zip/tests/bug47667.phpt
+++ php-src/ext/zip/tests/bug47667.phpt
--TEST--
Bug #47667 (ZipArchive::OVERWRITE seems to have no effect)
--SKIPIF--
?php
/* $Id: bug47667.phpt,v 1.1 2009/03/16 10:16:16 mkoppanen Exp $ */
if(!extension_loaded('zip')) die('skip');
?
--FILE--
?php
$thisdir = dirname(__FILE__);
$filename = $thisdir . /bug47667.zip;
$zip = new ZipArchive();
if ($zip-open($filename, ZipArchive::CREATE) !== true) {
exit(Unable to open the zip file);
} else {
$zip-addFromString('foo.txt', 'foo bar foobar');
$zip-close();
}
for ($i = 0; $i 10; $i++) {
$zip = new ZipArchive();
if ($zip-open($filename, ZipArchive::OVERWRITE) !== true) {
exit(Unable to open the zip file);
}
$zip-addFromString(foo_{$i}.txt, 'foo bar foobar');
$zip-close();
}
$zip = new ZipArchive();
if ($zip-open($filename, ZipArchive::CREATE) !== true) {
exit(Unable to open the zip file);
}
echo files: , $zip-numFiles;
unlink($filename);
--EXPECT--
files: 1
--
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/zip/lib zip_open.c /ext/zip/tests bug47667.phpt
mkoppanen Mon Mar 16 10:22:13 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/zip/tests bug47667.phpt
Modified files:
/php-src/ext/zip/libzip_open.c
Log:
Closes bug #47667
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_open.c?r1=1.1.2.11r2=1.1.2.12diff_format=u
Index: php-src/ext/zip/lib/zip_open.c
diff -u php-src/ext/zip/lib/zip_open.c:1.1.2.11
php-src/ext/zip/lib/zip_open.c:1.1.2.12
--- php-src/ext/zip/lib/zip_open.c:1.1.2.11 Thu Jan 1 19:32:45 2009
+++ php-src/ext/zip/lib/zip_open.c Mon Mar 16 10:22:13 2009
@@ -65,6 +65,10 @@
struct zip_cdir *cdir;
int i;
off_t len;
+
+if (flags ZIP_OVERWRITE) {
+ return _zip_allocate_new(fn, zep);
+}
switch (_zip_file_exists(fn, flags, zep)) {
case -1:
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug47667.phpt?view=markuprev=1.1
Index: php-src/ext/zip/tests/bug47667.phpt
+++ php-src/ext/zip/tests/bug47667.phpt
--TEST--
Bug #47667 (ZipArchive::OVERWRITE seems to have no effect)
--SKIPIF--
?php
/* $Id: bug47667.phpt,v 1.1 2009/03/16 10:16:16 mkoppanen Exp $ */
if(!extension_loaded('zip')) die('skip');
?
--FILE--
?php
$thisdir = dirname(__FILE__);
$filename = $thisdir . /bug47667.zip;
$zip = new ZipArchive();
if ($zip-open($filename, ZipArchive::CREATE) !== true) {
exit(Unable to open the zip file);
} else {
$zip-addFromString('foo.txt', 'foo bar foobar');
$zip-close();
}
for ($i = 0; $i 10; $i++) {
$zip = new ZipArchive();
if ($zip-open($filename, ZipArchive::OVERWRITE) !== true) {
exit(Unable to open the zip file);
}
$zip-addFromString(foo_{$i}.txt, 'foo bar foobar');
$zip-close();
}
$zip = new ZipArchive();
if ($zip-open($filename, ZipArchive::CREATE) !== true) {
exit(Unable to open the zip file);
}
echo files: , $zip-numFiles;
unlink($filename);
--EXPECT--
files: 1
--
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
mkoppanen Mon Mar 16 12:03:58 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Updated news file http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1438r2=1.2027.2.547.2.1439diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1438 php-src/NEWS:1.2027.2.547.2.1439 --- php-src/NEWS:1.2027.2.547.2.1438Sat Mar 14 17:48:41 2009 +++ php-src/NEWSMon Mar 16 12:03:57 2009 @@ -6,6 +6,7 @@ - Fixed memory corruptions while reading properties of zip files. (Ilia) +- Fixed bug #47667 (ZipArchive::OVERWRITE seems to have no effect). (Mikko,Pierre) - Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a string literal). (Ilia) - Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo/libmagic cdf.c
iliaa Mon Mar 16 12:52:39 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/fileinfo/libmagic cdf.c Log: Fixed compiler warnings http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/cdf.c?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/fileinfo/libmagic/cdf.c diff -u php-src/ext/fileinfo/libmagic/cdf.c:1.1.2.2 php-src/ext/fileinfo/libmagic/cdf.c:1.1.2.3 --- php-src/ext/fileinfo/libmagic/cdf.c:1.1.2.2 Sun Mar 15 23:04:18 2009 +++ php-src/ext/fileinfo/libmagic/cdf.c Mon Mar 16 12:52:39 2009 @@ -395,7 +395,7 @@ return 0; out: free(scn-sst_tab); - return (size_t)-1; + return -1; } int @@ -430,7 +430,7 @@ return 0; out: free(scn-sst_tab); - return (size_t)-1; + return -1; } int -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic cdf.c
iliaa Mon Mar 16 12:52:59 2009 UTC Modified files: /php-src/ext/fileinfo/libmagic cdf.c Log: MFB: Fixed compiler warnings http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/cdf.c?r1=1.1r2=1.2diff_format=u Index: php-src/ext/fileinfo/libmagic/cdf.c diff -u php-src/ext/fileinfo/libmagic/cdf.c:1.1 php-src/ext/fileinfo/libmagic/cdf.c:1.2 --- php-src/ext/fileinfo/libmagic/cdf.c:1.1 Sun Mar 15 23:02:34 2009 +++ php-src/ext/fileinfo/libmagic/cdf.c Mon Mar 16 12:52:59 2009 @@ -395,7 +395,7 @@ return 0; out: free(scn-sst_tab); - return (size_t)-1; + return -1; } int @@ -430,7 +430,7 @@ return 0; out: free(scn-sst_tab); - return (size_t)-1; + return -1; } int -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/class_object get_class_variation_001.phpt
dmitry Mon Mar 16 15:00:00 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/class_object get_class_variation_001.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_class_variation_001.phpt?r1=1.1.4.4r2=1.1.4.5diff_format=u Index: php-src/ext/standard/tests/class_object/get_class_variation_001.phpt diff -u php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.1.4.4 php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.1.4.5 --- php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.1.4.4 Mon Mar 16 09:51:31 2009 +++ php-src/ext/standard/tests/class_object/get_class_variation_001.phpt Mon Mar 16 15:00:00 2009 @@ -76,137 +76,137 @@ --EXPECTF-- *** Testing get_class() : usage variations *** -Notice: Undefined variable: undefined_var in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 58 +Notice: Undefined variable: undefined_var in %sget_class_variation_001.php on line 58 -Notice: Undefined variable: unset_var in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 61 +Notice: Undefined variable: unset_var in %sget_class_variation_001.php on line 61 Arg value: 0 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d bool(false) Arg value: 1 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d bool(false) Arg value: 12345 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d bool(false) Arg value: -2345 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d bool(false) Arg value: 10.5 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) Arg value: -10.5 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) Arg value: 101234567000 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) Arg value: 1.07654321E-9 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) Arg value: 0.5 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) Arg value: Array (type: array) -Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, array given in %sget_class_variation_001.php on line %d bool(false) Arg value: Array (type: array) -Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, array given
[PHP-CVS] cvs: php-src /ext/standard/tests/class_object get_class_variation_001.phpt
dmitry Mon Mar 16 15:00:11 2009 UTC Modified files: /php-src/ext/standard/tests/class_object get_class_variation_001.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_class_variation_001.phpt?r1=1.5r2=1.6diff_format=u Index: php-src/ext/standard/tests/class_object/get_class_variation_001.phpt diff -u php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.5 php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.6 --- php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.5 Mon Mar 16 09:52:25 2009 +++ php-src/ext/standard/tests/class_object/get_class_variation_001.phpt Mon Mar 16 15:00:11 2009 @@ -76,147 +76,147 @@ --EXPECTF-- *** Testing get_class() : usage variations *** -Notice: Undefined variable: undefined_var in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 58 +Notice: Undefined variable: undefined_var in %sget_class_variation_001.php on line 58 -Notice: Undefined variable: unset_var in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 61 +Notice: Undefined variable: unset_var in %sget_class_variation_001.php on line 61 Arg value: 0 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d bool(false) Arg value: 1 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d bool(false) Arg value: 12345 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d bool(false) Arg value: -2345 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d bool(false) Arg value: 10.5 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) Arg value: -10.5 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) Arg value: 101234567000 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) Arg value: 1.07654321E-9 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) Arg value: 0.5 (type: double) -Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, double given in %sget_class_variation_001.php on line %d bool(false) -Notice: Array to string conversion in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 67 +Notice: Array to string conversion in %sget_class_variation_001.php on line 67 Arg value: Array (type: array) -Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68 +Warning: get_class() expects parameter 1 to be object, array given in %sget_class_variation_001.php on line %d bool(false) -Notice: Array to string conversion in /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php
[PHP-CVS] cvs: php-src /ext/fileinfo CREDITS config.w32 /ext/fileinfo/libmagic cdf.c cdf.h cdf_time.c file.h readcdf.c
pajoye Mon Mar 16 15:02:45 2009 UTC
Modified files:
/php-src/ext/fileinfo CREDITS config.w32
/php-src/ext/fileinfo/libmagic cdf.c cdf.h cdf_time.c file.h
readcdf.c
Log:
- fix the build for win (vc6 or vc9)
- fix logic in time convertion
- force shared on windows, will fix the dirent issue later (no, it is not
enough to simply remove the dep or header include)
- add myself before I forget again
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/CREDITS?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/fileinfo/CREDITS
diff -u php-src/ext/fileinfo/CREDITS:1.3 php-src/ext/fileinfo/CREDITS:1.4
--- php-src/ext/fileinfo/CREDITS:1.3Thu Dec 4 14:53:51 2008
+++ php-src/ext/fileinfo/CREDITSMon Mar 16 15:02:44 2009
@@ -1,2 +1,2 @@
fileinfo
-Ilia Alshanetsky, Scott MacVicar, Derick Rethans
+Ilia Alshanetsky, Pierre Alain Joye, Scott MacVicar, Derick Rethans
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.w32?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/fileinfo/config.w32
diff -u php-src/ext/fileinfo/config.w32:1.5 php-src/ext/fileinfo/config.w32:1.6
--- php-src/ext/fileinfo/config.w32:1.5 Sun Mar 15 23:02:32 2009
+++ php-src/ext/fileinfo/config.w32 Mon Mar 16 15:02:44 2009
@@ -1,10 +1,11 @@
-// $Id: config.w32,v 1.5 2009/03/15 23:02:32 scottmac Exp $
+// $Id: config.w32,v 1.6 2009/03/16 15:02:44 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE(fileinfo, fileinfo support, no);
if (PHP_FILEINFO != 'no') {
-
+ if (CHECK_HEADER_ADD_INCLUDE(dirent.h, CFLAGS_FILEINFO)
+ CHECK_LIB(dirent_a.lib, fileinfo, PHP_FILEINFO)) {
LIBMAGIC_SOURCES= apprentice.c apptype.c ascmagic.c \
cdf.c cdf_time.c compress.c \
encoding.c fsmagic.c funcs.c \
@@ -15,6 +16,10 @@
ADD_FLAG('CFLAGS', '/Zm1000');
}
- EXTENSION('fileinfo', 'fileinfo.c', null, /I +
configure_module_dirname + /libmagic /I + configure_module_dirname);
+ EXTENSION('fileinfo', 'fileinfo.c', true, /I +
configure_module_dirname + /libmagic /I + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES,
fileinfo);
+ } else {
+ WARNING(fileinfo not enabled; libraries and headers not
found);
+ PHP_FILEINFO = no;
+ }
}
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/cdf.c?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/fileinfo/libmagic/cdf.c
diff -u php-src/ext/fileinfo/libmagic/cdf.c:1.2
php-src/ext/fileinfo/libmagic/cdf.c:1.3
--- php-src/ext/fileinfo/libmagic/cdf.c:1.2 Mon Mar 16 12:52:59 2009
+++ php-src/ext/fileinfo/libmagic/cdf.c Mon Mar 16 15:02:44 2009
@@ -1001,7 +1001,11 @@
break;
case CDF_FILETIME:
tp = info[i].pi_tp;
+#if defined(PHP_WIN32 ) _MSC_VER = 1500
+ if (tp 1000i64) {
+#else
if (tp 1000LL) {
+#endif
cdf_print_elapsed_time(buf, sizeof(buf), tp);
printf(timestamp %s\n, buf);
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/cdf.h?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/fileinfo/libmagic/cdf.h
diff -u php-src/ext/fileinfo/libmagic/cdf.h:1.1
php-src/ext/fileinfo/libmagic/cdf.h:1.2
--- php-src/ext/fileinfo/libmagic/cdf.h:1.1 Sun Mar 15 23:02:34 2009
+++ php-src/ext/fileinfo/libmagic/cdf.h Mon Mar 16 15:02:44 2009
@@ -42,7 +42,11 @@
typedef struct {
uint64_th_magic;
-#define CDF_MAGIC 0xE11AB1A1E011CFD0LL
+#if defined(PHP_WIN32 ) _MSC_VER = 1500
+# define CDF_MAGIC 0xE11AB1A1E011CFD0i64
+#else
+# define CDF_MAGIC 0xE11AB1A1E011CFD0LL
+#endif
uint64_th_uuid[2];
uint16_th_revision;
uint16_th_version;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/cdf_time.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/fileinfo/libmagic/cdf_time.c
diff -u php-src/ext/fileinfo/libmagic/cdf_time.c:1.1
php-src/ext/fileinfo/libmagic/cdf_time.c:1.2
--- php-src/ext/fileinfo/libmagic/cdf_time.c:1.1Sun Mar 15 23:02:34 2009
+++ php-src/ext/fileinfo/libmagic/cdf_time.cMon Mar 16 15:02:44 2009
@@ -104,8 +104,8 @@
#endif
int rdays;
- /* Unit is 100,000's of microseconds */
- ts-tv_usec = (t % CDF_TIME_PREC) * 10;
+ /* Time interval, in microseconds */
+ ts-tv_usec = (t % CDF_TIME_PREC) * CDF_TIME_PREC;
t /= CDF_TIME_PREC;
tm.tm_sec = t % 60;
@@ -153,7 +153,7 @@
errno = EINVAL;
return -1;
}
- *t = (ts-ts_usec / 10) * CDF_TIME_PREC;
+ *t = (ts-ts_usec / CDF_TIME_PREC) * CDF_TIME_PREC;
*t = tm.tm_sec;
*t += tm.tm_min * 60;
*t += tm.tm_hour * 60 * 60;
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo CREDITS config.w32 /ext/fileinfo/libmagic apprentice.c cdf.c cdf.h cdf_time.c file.h readcdf.c
pajoye Mon Mar 16 15:03:06 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/fileinfo CREDITS config.w32
/php-src/ext/fileinfo/libmagic apprentice.c cdf.c cdf.h cdf_time.c
file.h readcdf.c
Log:
- fix the build for win (vc6 or vc9)
- fix logic in time convertion
- force shared on windows, will fix the dirent issue later (no, it is not
enough to simply remove the dep or header include)
- add myself before I forget again
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/CREDITS?r1=1.2.2.1r2=1.2.2.2diff_format=u
Index: php-src/ext/fileinfo/CREDITS
diff -u php-src/ext/fileinfo/CREDITS:1.2.2.1
php-src/ext/fileinfo/CREDITS:1.2.2.2
--- php-src/ext/fileinfo/CREDITS:1.2.2.1Thu Dec 4 14:55:19 2008
+++ php-src/ext/fileinfo/CREDITSMon Mar 16 15:03:06 2009
@@ -1,2 +1,2 @@
fileinfo
-Ilia Alshanetsky, Scott MacVicar, Derick Rethans
+Ilia Alshanetsky, Pierre Alain Joye, Scott MacVicar, Derick Rethans
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.w32?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/fileinfo/config.w32
diff -u php-src/ext/fileinfo/config.w32:1.1.2.4
php-src/ext/fileinfo/config.w32:1.1.2.5
--- php-src/ext/fileinfo/config.w32:1.1.2.4 Sun Mar 15 23:03:50 2009
+++ php-src/ext/fileinfo/config.w32 Mon Mar 16 15:03:06 2009
@@ -1,20 +1,25 @@
-// $Id: config.w32,v 1.1.2.4 2009/03/15 23:03:50 scottmac Exp $
+// $Id: config.w32,v 1.1.2.5 2009/03/16 15:03:06 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE(fileinfo, fileinfo support, no);
if (PHP_FILEINFO != 'no') {
+ if (CHECK_HEADER_ADD_INCLUDE(dirent.h, CFLAGS_FILEINFO)
+ CHECK_LIB(dirent_a.lib, fileinfo, PHP_FILEINFO)) {
+ LIBMAGIC_SOURCES= apprentice.c apptype.c ascmagic.c \
+ cdf.c cdf_time.c compress.c \
+ encoding.c fsmagic.c funcs.c \
+ is_tar.c magic.c print.c \
+ readcdf.c readelf.c softmagic.c;
- LIBMAGIC_SOURCES= apprentice.c apptype.c ascmagic.c \
- cdf.c cdf_time.c compress.c \
- encoding.c fsmagic.c funcs.c \
- is_tar.c magic.c print.c \
- readcdf.c readelf.c softmagic.c;
+ if (VCVERS 1500) {
+ ADD_FLAG('CFLAGS', '/Zm1000');
+ }
- if (VCVERS 1500) {
- ADD_FLAG('CFLAGS', '/Zm1000');
- }
-
- EXTENSION('fileinfo', 'fileinfo.c', null, /I +
configure_module_dirname + /libmagic /I + configure_module_dirname);
- ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES,
fileinfo);
+ EXTENSION('fileinfo', 'fileinfo.c', true, /I +
configure_module_dirname + /libmagic /I + configure_module_dirname);
+ ADD_SOURCES(configure_module_dirname + '\\libmagic',
LIBMAGIC_SOURCES, fileinfo);
+ } else {
+ WARNING(fileinfo not enabled; libraries and headers not
found);
+ PHP_FILEINFO = no;
+ }
}
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.7.2.13r2=1.7.2.14diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.13
php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.14
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.13 Sun Mar 15 23:04:18 2009
+++ php-src/ext/fileinfo/libmagic/apprentice.c Mon Mar 16 15:03:06 2009
@@ -51,16 +51,11 @@
#include unistd.h
#endif
-
-
-
#include string.h
#include assert.h
#include ctype.h
#include fcntl.h
-#ifndef PHP_WIN32
-#include dirent.h
-#endif
+
#defineEATAB {while (isascii((unsigned char) *l) \
isspace((unsigned char) *l)) ++l;}
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/cdf.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/fileinfo/libmagic/cdf.c
diff -u php-src/ext/fileinfo/libmagic/cdf.c:1.1.2.3
php-src/ext/fileinfo/libmagic/cdf.c:1.1.2.4
--- php-src/ext/fileinfo/libmagic/cdf.c:1.1.2.3 Mon Mar 16 12:52:39 2009
+++ php-src/ext/fileinfo/libmagic/cdf.c Mon Mar 16 15:03:06 2009
@@ -1001,7 +1001,11 @@
break;
case CDF_FILETIME:
tp = info[i].pi_tp;
+#if defined(PHP_WIN32 ) _MSC_VER = 1500
+ if (tp 1000i64) {
+#else
if (tp 1000LL) {
+#endif
cdf_print_elapsed_time(buf, sizeof(buf), tp);
printf(timestamp %s\n, buf);
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/cdf.h?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/fileinfo/libmagic/cdf.h
diff -u php-src/ext/fileinfo/libmagic/cdf.h:1.1.2.2
php-src/ext/fileinfo/libmagic/cdf.h:1.1.2.3
---
[PHP-CVS] cvs: php-src /ext/curl interface.c
felipe Mon Mar 16 15:05:21 2009 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
- Fixed bug #47616 (curl keeps crashing)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.148r2=1.149diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.148 php-src/ext/curl/interface.c:1.149
--- php-src/ext/curl/interface.c:1.148 Fri Mar 13 19:41:48 2009
+++ php-src/ext/curl/interface.cMon Mar 16 15:05:21 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.148 2009/03/13 19:41:48 stas Exp $ */
+/* $Id: interface.c,v 1.149 2009/03/16 15:05:21 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1747,6 +1747,7 @@
} else {
#if LIBCURL_VERSION_NUM = 0x071101
+ convert_to_string_ex(zvalue);
/* with curl 7.17.0 and later, we can use
COPYPOSTFIELDS, but we have to provide size before */
error = curl_easy_setopt(ch-cp,
CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
error = curl_easy_setopt(ch-cp,
CURLOPT_COPYPOSTFIELDS, Z_STRVAL_PP(zvalue));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl interface.c
felipe Mon Mar 16 15:08:56 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
- MFH: Fixed bug #47616 (curl keeps crashing)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.31r2=1.62.2.14.2.27.2.32diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.31
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.32
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.31Fri Mar 13 19:39:49 2009
+++ php-src/ext/curl/interface.cMon Mar 16 15:08:56 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.31 2009/03/13 19:39:49 stas Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.32 2009/03/16 15:08:56 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1684,6 +1684,7 @@
} else {
#if LIBCURL_VERSION_NUM = 0x071101
+ convert_to_string_ex(zvalue);
/* with curl 7.17.0 and later, we can use
COPYPOSTFIELDS, but we have to provide size before */
error = curl_easy_setopt(ch-cp,
CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
error = curl_easy_setopt(ch-cp,
CURLOPT_COPYPOSTFIELDS, Z_STRVAL_PP(zvalue));
--
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/curl interface.c
felipe Mon Mar 16 15:09:52 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
/php-srcNEWS
Log:
- MFH: Fixed bug #47616 (curl keeps crashing)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.42r2=1.62.2.14.2.43diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.42
php-src/ext/curl/interface.c:1.62.2.14.2.43
--- php-src/ext/curl/interface.c:1.62.2.14.2.42 Fri Mar 13 19:43:49 2009
+++ php-src/ext/curl/interface.cMon Mar 16 15:09:51 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.42 2009/03/13 19:43:49 stas Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.43 2009/03/16 15:09:51 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1572,6 +1572,7 @@
} else {
#if LIBCURL_VERSION_NUM = 0x071101
/* with curl 7.17.0 and later, we can use
COPYPOSTFIELDS, but we have to provide size before */
+ convert_to_string_ex(zvalue);
error = curl_easy_setopt(ch-cp,
CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
error = curl_easy_setopt(ch-cp,
CURLOPT_COPYPOSTFIELDS, Z_STRVAL_PP(zvalue));
#else
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1439r2=1.2027.2.547.2.1440diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1439 php-src/NEWS:1.2027.2.547.2.1440
--- php-src/NEWS:1.2027.2.547.2.1439Mon Mar 16 12:03:57 2009
+++ php-src/NEWSMon Mar 16 15:09:51 2009
@@ -9,6 +9,7 @@
- Fixed bug #47667 (ZipArchive::OVERWRITE seems to have no effect).
(Mikko,Pierre)
- Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a string
literal). (Ilia)
+- Fixed bug #47616 (curl keeps crashing). (Felipe)
- Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia)
- Fixed bug #47546 (Default value for limit parameter in explode is 0, not -1).
(Kalle)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/tidy/tests tidy_error.phpt
zoe Mon Mar 16 20:38:19 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/tidy/tests tidy_error.phpt Log: test for /ext/tidy from stefan priebsch http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tests/tidy_error.phpt?view=markuprev=1.1 Index: php-src/ext/tidy/tests/tidy_error.phpt +++ php-src/ext/tidy/tests/tidy_error.phpt --TEST-- Ensure tidy_get_status() returns correct status --CREDITS-- Stefan Priebsch --SKIPIF-- ?php if (!extension_loaded(tidy)) print skip tidy extension not loaded; ? --FILE-- ?php $html = '!DOCTYPE html PUBLIC -//W3C//DTD HTML 3.2//EN html head title/title /head body pparagraph/p /body /html'; $tidy = tidy_parse_string($html); echo tidy_get_status($tidy); // status 0 indicates no errors or warnings $html = 'pparagraph/i'; $tidy = tidy_parse_string($html); echo tidy_get_status($tidy); // status 1 indicates warnings $html = 'bogustest/bogus'; $tidy = tidy_parse_string($html); echo tidy_get_status($tidy); // status 2 indicates error ? --EXPECT-- 012 -- 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/tidy/tests tidy_error.phpt
zoe Mon Mar 16 20:38:51 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/tidy/tests tidy_error.phpt Log: test for /ext/tidy from stefan priebsch http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tests/tidy_error.phpt?view=markuprev=1.1 Index: php-src/ext/tidy/tests/tidy_error.phpt +++ php-src/ext/tidy/tests/tidy_error.phpt --TEST-- Ensure tidy_get_status() returns correct status --CREDITS-- Stefan Priebsch --SKIPIF-- ?php if (!extension_loaded(tidy)) print skip tidy extension not loaded; ? --FILE-- ?php $html = '!DOCTYPE html PUBLIC -//W3C//DTD HTML 3.2//EN html head title/title /head body pparagraph/p /body /html'; $tidy = tidy_parse_string($html); echo tidy_get_status($tidy); // status 0 indicates no errors or warnings $html = 'pparagraph/i'; $tidy = tidy_parse_string($html); echo tidy_get_status($tidy); // status 1 indicates warnings $html = 'bogustest/bogus'; $tidy = tidy_parse_string($html); echo tidy_get_status($tidy); // status 2 indicates error ? --EXPECT-- 012 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
mattwil Tue Mar 17 00:02:40 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
Log:
Removed unneeded HashPosition variable (php_implode() doesn't change the
internal pointer)
- It was added in '06 with the 200-300% implode() optimization (hasn't been
merged to HEAD)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.43r2=1.445.2.14.2.69.2.44diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.43
php-src/ext/standard/string.c:1.445.2.14.2.69.2.44
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.43 Tue Mar 3 11:47:31 2009
+++ php-src/ext/standard/string.c Tue Mar 17 00:02:39 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.43 2009/03/03 11:47:31 kalle Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.44 2009/03/17 00:02:39 mattwil Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1130,7 +1130,6 @@
PHP_FUNCTION(implode)
{
zval **arg1 = NULL, **arg2 = NULL, *delim, *arr;
- HashPosition pos;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z|Z, arg1,
arg2) == FAILURE) {
return;
@@ -1162,13 +1161,9 @@
return;
}
}
-
- pos = Z_ARRVAL_P(arr)-pInternalPointer;
php_implode(delim, arr, return_value TSRMLS_CC);
- Z_ARRVAL_P(arr)-pInternalPointer = pos;
-
if (arg2 == NULL) {
FREE_ZVAL(delim);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/assert assert03.phpt assert04.phpt /ext/standard/tests/general_functions set_magic_quotes_runtime_basic.phpt
sixdTue Mar 17 01:50:34 2009 UTC Modified files: /php-src/ext/standard/tests/assert assert03.phpt assert04.phpt /php-src/ext/standard/tests/general_functions set_magic_quotes_runtime_basic.phpt Log: Fix INI blocks http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert03.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/assert/assert03.phpt diff -u php-src/ext/standard/tests/assert/assert03.phpt:1.2 php-src/ext/standard/tests/assert/assert03.phpt:1.3 --- php-src/ext/standard/tests/assert/assert03.phpt:1.2 Sun Jan 25 11:03:15 2009 +++ php-src/ext/standard/tests/assert/assert03.phpt Tue Mar 17 01:50:34 2009 @@ -1,6 +1,6 @@ --TEST-- assert() - set callback using ini_set() INI--- +--INI-- assert.active = 1 assert.warning = 0 assert.callback = http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert04.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/assert/assert04.phpt diff -u php-src/ext/standard/tests/assert/assert04.phpt:1.3 php-src/ext/standard/tests/assert/assert04.phpt:1.4 --- php-src/ext/standard/tests/assert/assert04.phpt:1.3 Sun Jan 25 11:03:15 2009 +++ php-src/ext/standard/tests/assert/assert04.phpt Tue Mar 17 01:50:34 2009 @@ -1,6 +1,6 @@ --TEST-- misc assert() tests tests INI--- +--INI-- assert.active = 1 assert.warning = 1 assert.callback = http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt diff -u php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt:1.1 php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt:1.2 --- php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt:1.1 Sun Feb 1 19:29:29 2009 +++ php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt Tue Mar 17 01:50:34 2009 @@ -1,6 +1,6 @@ --TEST-- Test set_magic_quotes_runtime() function - basic test ---INI- +--INI-- magic_quotes_runtime = 0 --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/assert assert03.phpt assert04.phpt /ext/standard/tests/general_functions get_magic_quotes_runtime.phpt set_magic_quotes_runtime_basic.phpt set_magi
sixdTue Mar 17 01:52:52 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/assert assert03.phpt assert04.phpt /php-src/ext/standard/tests/general_functions get_magic_quotes_runtime.phpt set_magic_quotes_runtime_basic.phpt set_magic_quotes_runtime_variation1.phpt Log: Fix INI blocks http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert03.phpt?r1=1.1.2.2.2.1r2=1.1.2.2.2.2diff_format=u Index: php-src/ext/standard/tests/assert/assert03.phpt diff -u php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2.2.1 Sun Jan 25 11:06:36 2009 +++ php-src/ext/standard/tests/assert/assert03.phpt Tue Mar 17 01:52:52 2009 @@ -1,6 +1,6 @@ --TEST-- assert() - set callback using ini_set() INI--- +--INI-- assert.active = 1 assert.warning = 0 assert.callback = http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert04.phpt?r1=1.1.2.2.2.2r2=1.1.2.2.2.3diff_format=u Index: php-src/ext/standard/tests/assert/assert04.phpt diff -u php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2.2.2 Sun Jan 25 11:06:36 2009 +++ php-src/ext/standard/tests/assert/assert04.phpt Tue Mar 17 01:52:52 2009 @@ -1,6 +1,6 @@ --TEST-- misc assert() tests tests INI--- +--INI-- assert.active = 1 assert.warning = 1 assert.callback = http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt diff -u php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt:1.1.2.3 --- php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt:1.1.2.2 Sun Feb 1 18:55:26 2009 +++ php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt Tue Mar 17 01:52:52 2009 @@ -1,6 +1,6 @@ --TEST-- Test get_magic_quotes_runtime() function ---INI- +--INI-- magic_quotes_runtime = 0 --FILE-- ?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt diff -u php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt:1.1.2.3 --- php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt:1.1.2.2 Sun Feb 1 19:29:31 2009 +++ php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt Tue Mar 17 01:52:52 2009 @@ -1,6 +1,6 @@ --TEST-- Test set_magic_quotes_runtime() function - basic test ---INI- +--INI-- magic_quotes_runtime = 0 --FILE-- ?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt diff -u php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt:1.1.2.1 Sun Feb 1 19:29:31 2009 +++ php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt Tue Mar 17 01:52:52 2009 @@ -1,6 +1,6 @@ --TEST-- Test set_magic_quotes_runtime() function - usage variation ---INI- +--INI-- magic_quotes_runtime = 0 --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json JSON_parser.c /ext/json/tests bug47644.phpt
scottmacTue Mar 17 02:00:08 2009 UTC
Added files:
/php-src/ext/json/tests bug47644.phpt
Modified files:
/php-src/ext/json JSON_parser.c
Log:
Fix bug #47644 - Valid integers are truncated with json_decode()
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.22 php-src/ext/json/JSON_parser.c:1.23
--- php-src/ext/json/JSON_parser.c:1.22 Fri Dec 19 02:00:59 2008
+++ php-src/ext/json/JSON_parser.c Tue Mar 17 02:00:08 2009
@@ -289,11 +289,11 @@
if (type == IS_LONG)
{
- double d = zend_strtod(buf-c, NULL);
- if (d LONG_MAX || d LONG_MIN) {
- ZVAL_DOUBLE(*z, d);
+ long l = strtol(buf-c, NULL, 10);
+ if (l LONG_MAX || l LONG_MIN) {
+ ZVAL_DOUBLE(*z, zend_strtod(buf-c, NULL));
} else {
- ZVAL_LONG(*z, (long)d);
+ ZVAL_LONG(*z, l);
}
}
else if (type == IS_DOUBLE)
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug47644.phpt?view=markuprev=1.1
Index: php-src/ext/json/tests/bug47644.phpt
+++ php-src/ext/json/tests/bug47644.phpt
--TEST--
Bug #47644 (valid large integers are truncated)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
if (PHP_INT_SIZE != 8) die(skip this test is for 64bit platform only);
?
--FILE--
?php
for ($i = 1; $i 10006; $i++) {
var_dump(json_decode([$i]));
}
echo Done\n;
?
--EXPECT--
array(1) {
[0]=
int(1)
}
array(1) {
[0]=
int(10001)
}
array(1) {
[0]=
int(10002)
}
array(1) {
[0]=
int(10003)
}
array(1) {
[0]=
int(10004)
}
array(1) {
[0]=
int(10005)
}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json JSON_parser.c /ext/json/tests bug47644.phpt
scottmacTue Mar 17 02:00:13 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/json/tests bug47644.phpt
Modified files:
/php-src/ext/json JSON_parser.c
Log:
MFH Fix bug #47644 - Valid integers are truncated with json_decode()
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.12.2.6r2=1.1.2.12.2.7diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.12.2.6
php-src/ext/json/JSON_parser.c:1.1.2.12.2.7
--- php-src/ext/json/JSON_parser.c:1.1.2.12.2.6 Fri Dec 19 02:00:57 2008
+++ php-src/ext/json/JSON_parser.c Tue Mar 17 02:00:13 2009
@@ -289,11 +289,11 @@
if (type == IS_LONG)
{
- double d = zend_strtod(buf-c, NULL);
- if (d LONG_MAX || d LONG_MIN) {
- ZVAL_DOUBLE(*z, d);
+ long l = strtol(buf-c, NULL, 10);
+ if (l LONG_MAX || l LONG_MIN) {
+ ZVAL_DOUBLE(*z, zend_strtod(buf-c, NULL));
} else {
- ZVAL_LONG(*z, (long)d);
+ ZVAL_LONG(*z, l);
}
}
else if (type == IS_DOUBLE)
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug47644.phpt?view=markuprev=1.1
Index: php-src/ext/json/tests/bug47644.phpt
+++ php-src/ext/json/tests/bug47644.phpt
--TEST--
Bug #47644 (valid large integers are truncated)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
if (PHP_INT_SIZE != 8) die(skip this test is for 64bit platform only);
?
--FILE--
?php
for ($i = 1; $i 10006; $i++) {
var_dump(json_decode([$i]));
}
echo Done\n;
?
--EXPECT--
array(1) {
[0]=
int(1)
}
array(1) {
[0]=
int(10001)
}
array(1) {
[0]=
int(10002)
}
array(1) {
[0]=
int(10003)
}
array(1) {
[0]=
int(10004)
}
array(1) {
[0]=
int(10005)
}
Done
--
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/json JSON_parser.c /ext/json/tests bug47644.phpt
scottmacTue Mar 17 02:02:45 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/json/tests bug47644.phpt
Modified files:
/php-src/ext/json JSON_parser.c
Log:
MFH Fix bug #47644 - Valid integers are truncated with json_decode()
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.15r2=1.1.2.16diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.15
php-src/ext/json/JSON_parser.c:1.1.2.16
--- php-src/ext/json/JSON_parser.c:1.1.2.15 Fri Dec 19 02:13:41 2008
+++ php-src/ext/json/JSON_parser.c Tue Mar 17 02:02:45 2009
@@ -284,12 +284,12 @@
if (type == IS_LONG)
{
- double d = zend_strtod(buf-c, NULL);
- if (d LONG_MAX || d LONG_MIN) {
- ZVAL_DOUBLE(*z, d);
- } else {
- ZVAL_LONG(*z, (long)d);
- }
+ long l = strtol(buf-c, NULL, 10);
+ if (l LONG_MAX || l LONG_MIN) {
+ ZVAL_DOUBLE(*z, zend_strtod(buf-c, NULL));
+ } else {
+ ZVAL_LONG(*z, l);
+ }
}
else if (type == IS_DOUBLE)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug47644.phpt?view=markuprev=1.1
Index: php-src/ext/json/tests/bug47644.phpt
+++ php-src/ext/json/tests/bug47644.phpt
--TEST--
Bug #47644 (valid large integers are truncated)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
if (PHP_INT_SIZE != 8) die(skip this test is for 64bit platform only);
?
--FILE--
?php
for ($i = 1; $i 10006; $i++) {
var_dump(json_decode([$i]));
}
echo Done\n;
?
--EXPECT--
array(1) {
[0]=
int(1)
}
array(1) {
[0]=
int(10001)
}
array(1) {
[0]=
int(10002)
}
array(1) {
[0]=
int(10003)
}
array(1) {
[0]=
int(10004)
}
array(1) {
[0]=
int(10005)
}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 config0.m4 sqlite3.c /ext/sqlite3/tests sqlite3_22_loadextension.phpt
scottmacTue Mar 17 02:42:42 2009 UTC
Modified files:
/php-src/ext/sqlite3config0.m4 sqlite3.c
/php-src/ext/sqlite3/tests sqlite3_22_loadextension.phpt
Log:
Fix bug #47678 - Allow loadExtension to be disabled in SQLite3
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config0.m4?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/sqlite3/config0.m4
diff -u php-src/ext/sqlite3/config0.m4:1.9 php-src/ext/sqlite3/config0.m4:1.10
--- php-src/ext/sqlite3/config0.m4:1.9 Tue Jan 13 02:50:23 2009
+++ php-src/ext/sqlite3/config0.m4 Tue Mar 17 02:42:41 2009
@@ -1,4 +1,4 @@
-dnl $Id: config0.m4,v 1.9 2009/01/13 02:50:23 scottmac Exp $
+dnl $Id: config0.m4,v 1.10 2009/03/17 02:42:41 scottmac Exp $
dnl config.m4 for extension sqlite3
dnl vim:et:ts=2:sw=2
@@ -51,6 +51,10 @@
AC_DEFINE(HAVE_SQLITE3_KEY, 1, [have commercial sqlite3 with crypto
support])
])
+PHP_CHECK_LIBRARY(sqlite3,sqlite3_load_extension,[
+ AC_DEFINE(SQLITE_OMIT_LOAD_EXTENSION, 1, [have sqlite3 with extension
support])
+])
+
else
AC_MSG_CHECKING([bundled sqlite3 library])
AC_MSG_RESULT([yes])
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.36 php-src/ext/sqlite3/sqlite3.c:1.37
--- php-src/ext/sqlite3/sqlite3.c:1.36 Wed Feb 18 20:07:55 2009
+++ php-src/ext/sqlite3/sqlite3.c Tue Mar 17 02:42:41 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.36 2009/02/18 20:07:55 iliaa Exp $ */
+/* $Id: sqlite3.c,v 1.37 2009/03/17 02:42:41 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -281,6 +281,7 @@
}
/* }}} */
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
/* {{{ proto bool SQLite3::loadExtension(String Shared Library)
Attempts to load an SQLite extension library */
PHP_METHOD(sqlite3, loadExtension)
@@ -343,6 +344,7 @@
RETURN_TRUE;
}
/* }}} */
+#endif
/* {{{ proto int SQLite3::changes() U
Returns the number of database rows that were changed (or inserted or
deleted) by the most recent SQL statement. */
@@ -1636,9 +1638,11 @@
ZEND_ARG_INFO(0, encryption_key)
ZEND_END_ARG_INFO()
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_loadextension, 0)
ZEND_ARG_INFO(0, shared_library)
ZEND_END_ARG_INFO()
+#endif
ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_escapestring, 0, 0, 1)
ZEND_ARG_INFO(0, value)
@@ -1717,7 +1721,9 @@
PHP_ME(sqlite3, lastInsertRowID,arginfo_sqlite3_void,
ZEND_ACC_PUBLIC)
PHP_ME(sqlite3, lastErrorCode, arginfo_sqlite3_void,
ZEND_ACC_PUBLIC)
PHP_ME(sqlite3, lastErrorMsg, arginfo_sqlite3_void,
ZEND_ACC_PUBLIC)
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
PHP_ME(sqlite3, loadExtension,
arginfo_sqlite3_loadextension, ZEND_ACC_PUBLIC)
+#endif
PHP_ME(sqlite3, changes,
arginfo_sqlite3_void, ZEND_ACC_PUBLIC)
PHP_ME(sqlite3, escapeString,
arginfo_sqlite3_escapestring, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(sqlite3, prepare,
arginfo_sqlite3_query, ZEND_ACC_PUBLIC)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
diff -u php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.3
php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.4
--- php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.3 Wed Aug 6
14:07:20 2008
+++ php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt Tue Mar 17
02:42:41 2009
@@ -1,7 +1,13 @@
--TEST--
SQLite3 load extension
--SKIPIF--
-?php require_once(dirname(__FILE__) . '/skipif.inc'); ?
+?php
+require_once(dirname(__FILE__) . '/skipif.inc');
+$r = new ReflectionClass(sqlite3);
+if (!$r-hasMethod(loadExtension)) {
+ die(skip - sqlite3 doesn't have loadExtension enabled);
+}
+?
--INI--
open_basedir=.
sqlite3.extension_dir=.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 config0.m4 sqlite3.c /ext/sqlite3/tests sqlite3_22_loadextension.phpt
scottmacTue Mar 17 02:45:12 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3config0.m4 sqlite3.c
/php-src/ext/sqlite3/tests sqlite3_22_loadextension.phpt
Log:
MFH Fix bug #47678 - Allow loadExtension to be disabled in SQLite3
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config0.m4?r1=1.1.2.11r2=1.1.2.12diff_format=u
Index: php-src/ext/sqlite3/config0.m4
diff -u php-src/ext/sqlite3/config0.m4:1.1.2.11
php-src/ext/sqlite3/config0.m4:1.1.2.12
--- php-src/ext/sqlite3/config0.m4:1.1.2.11 Tue Jan 13 02:50:54 2009
+++ php-src/ext/sqlite3/config0.m4 Tue Mar 17 02:45:12 2009
@@ -1,4 +1,4 @@
-dnl $Id: config0.m4,v 1.1.2.11 2009/01/13 02:50:54 scottmac Exp $
+dnl $Id: config0.m4,v 1.1.2.12 2009/03/17 02:45:12 scottmac Exp $
dnl config.m4 for extension sqlite3
dnl vim:et:ts=2:sw=2
@@ -51,6 +51,10 @@
AC_DEFINE(HAVE_SQLITE3_KEY, 1, [have commercial sqlite3 with crypto
support])
])
+PHP_CHECK_LIBRARY(sqlite3,sqlite3_load_extension,[
+ AC_DEFINE(SQLITE_OMIT_LOAD_EXTENSION, 1, [have sqlite3 with extension
support])
+])
+
else
AC_MSG_CHECKING([bundled sqlite3 library])
AC_MSG_RESULT([yes])
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.33r2=1.1.2.34diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.33
php-src/ext/sqlite3/sqlite3.c:1.1.2.34
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.33 Wed Feb 18 20:07:40 2009
+++ php-src/ext/sqlite3/sqlite3.c Tue Mar 17 02:45:12 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.1.2.33 2009/02/18 20:07:40 iliaa Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.34 2009/03/17 02:45:12 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -266,6 +266,7 @@
}
/* }}} */
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
/* {{{ proto bool SQLite3::loadExtension(String Shared Library)
Attempts to load an SQLite extension library. */
PHP_METHOD(sqlite3, loadExtension)
@@ -328,6 +329,7 @@
RETURN_TRUE;
}
/* }}} */
+#endif
/* {{{ proto int SQLite3::changes()
Returns the number of database rows that were changed (or inserted or
deleted) by the most recent SQL statement. */
@@ -1607,9 +1609,11 @@
ZEND_ARG_INFO(0, encryption_key)
ZEND_END_ARG_INFO()
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_loadextension, 0)
ZEND_ARG_INFO(0, shared_library)
ZEND_END_ARG_INFO()
+#endif
ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_escapestring, 0, 0, 1)
ZEND_ARG_INFO(0, value)
@@ -1685,7 +1689,9 @@
PHP_ME(sqlite3, lastInsertRowID,arginfo_sqlite3_void,
ZEND_ACC_PUBLIC)
PHP_ME(sqlite3, lastErrorCode, arginfo_sqlite3_void,
ZEND_ACC_PUBLIC)
PHP_ME(sqlite3, lastErrorMsg, arginfo_sqlite3_void,
ZEND_ACC_PUBLIC)
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
PHP_ME(sqlite3, loadExtension,
arginfo_sqlite3_loadextension, ZEND_ACC_PUBLIC)
+#endif
PHP_ME(sqlite3, changes,
arginfo_sqlite3_void, ZEND_ACC_PUBLIC)
PHP_ME(sqlite3, escapeString,
arginfo_sqlite3_escapestring, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(sqlite3, prepare,
arginfo_sqlite3_query, ZEND_ACC_PUBLIC)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
diff -u php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.1.2.3
php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.1.2.4
--- php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.1.2.3 Wed Aug
6 14:07:37 2008
+++ php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt Tue Mar 17
02:45:12 2009
@@ -1,7 +1,13 @@
--TEST--
SQLite3 load extension
--SKIPIF--
-?php require_once(dirname(__FILE__) . '/skipif.inc'); ?
+?php
+require_once(dirname(__FILE__) . '/skipif.inc');
+$r = new ReflectionClass(sqlite3);
+if (!$r-hasMethod(loadExtension)) {
+ die(skip - sqlite3 doesn't have loadExtension enabled);
+}
+?
--INI--
open_basedir=.
sqlite3.extension_dir=.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
scottmacTue Mar 17 02:47:30 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.516r2=1.2027.2.547.2.965.2.517diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.516 php-src/NEWS:1.2027.2.547.2.965.2.517 --- php-src/NEWS:1.2027.2.547.2.965.2.516 Mon Mar 16 09:51:31 2009 +++ php-src/NEWSTue Mar 17 02:47:29 2009 @@ -8,6 +8,7 @@ - Added LIBXML_LOADED_VERSION constant (libxml2 version currently used). (Rob) +- Fixed bug #47678 (Allow loadExtension to be disabled in SQLite3). (Scott) - Fixed bug #47664 (get_class returns NULL instead of FALSE). (Dmitry) - Fixed bug #47593 (interface_exists() returns false when using absolute namespace path). (Kalle, Felipe) -- 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/standard/tests/assert assert02.phpt assert03.phpt assert04.phpt /ext/standard/tests/general_functions get_magic_quotes_runtime.phpt set_magic_quotes_runtime_basic
sixdTue Mar 17 03:08:16 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/assert assert02.phpt assert03.phpt assert04.phpt /php-src/ext/standard/tests/general_functions get_magic_quotes_runtime.phpt set_magic_quotes_runtime_basic.phpt set_magic_quotes_runtime_variation1.phpt Log: Fix INI blocks http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert02.phpt?r1=1.1.2.7r2=1.1.2.8diff_format=u Index: php-src/ext/standard/tests/assert/assert02.phpt diff -u php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.7 php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.8 --- php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.7 Sun Jan 25 11:08:21 2009 +++ php-src/ext/standard/tests/assert/assert02.phpt Tue Mar 17 03:08:16 2009 @@ -1,6 +1,6 @@ --TEST-- catch assert() errors INI--- +--INI-- assert.active = 1 assert.warning = 1 assert.callback = http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert03.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/standard/tests/assert/assert03.phpt diff -u php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.3 php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.4 --- php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.3 Sun Jan 25 11:08:21 2009 +++ php-src/ext/standard/tests/assert/assert03.phpt Tue Mar 17 03:08:16 2009 @@ -1,6 +1,6 @@ --TEST-- assert() - set callback using ini_set() INI--- +--INI-- assert.active = 1 assert.warning = 0 assert.callback = http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert04.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/standard/tests/assert/assert04.phpt diff -u php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.3 php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.4 --- php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.3 Sun Jan 25 11:08:21 2009 +++ php-src/ext/standard/tests/assert/assert04.phpt Tue Mar 17 03:08:16 2009 @@ -1,6 +1,6 @@ --TEST-- misc assert() tests tests INI--- +--INI-- assert.active = 1 assert.warning = 1 assert.callback = http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt diff -u php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt:1.1.4.2 php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt:1.1.4.3 --- php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt:1.1.4.2 Sun Feb 1 18:55:28 2009 +++ php-src/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt Tue Mar 17 03:08:16 2009 @@ -1,6 +1,6 @@ --TEST-- Test get_magic_quotes_runtime() function ---INI- +--INI-- magic_quotes_runtime = 0 --FILE-- ?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt diff -u php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt:1.1.4.2 php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt:1.1.4.3 --- php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt:1.1.4.2 Sun Feb 1 19:29:33 2009 +++ php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt Tue Mar 17 03:08:16 2009 @@ -1,6 +1,6 @@ --TEST-- Test set_magic_quotes_runtime() function - basic test ---INI- +--INI-- magic_quotes_runtime = 0 --FILE-- ?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt diff -u php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt:1.1.4.2 php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt:1.1.4.3 --- php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt:1.1.4.2 Sun Feb 1 19:29:33 2009 +++ php-src/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt Tue Mar 17 03:08:16 2009 @@ -1,6 +1,6 @@ --TEST-- Test set_magic_quotes_runtime() function - usage variation ---INI- +--INI-- magic_quotes_runtime = 0 --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd/tests image_type_to_mime_type_basic.phpt image_type_to_mime_type_variation3.phpt /ext/standard image.c /ext/standard/tests/image getimagesize.phpt getimagesiz
scottmacTue Mar 17 03:25:57 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard image.c
/php-src/ext/gd/tests image_type_to_mime_type_basic.phpt
image_type_to_mime_type_variation3.phpt
/php-src/ext/standard/tests/image getimagesize.phpt
getimagesize_basic.phpt
image_type_to_mime_type.phpt
image_type_to_mime_type_variation3.phpt
Log:
MFH Fix bug #47359 - Use the official unofficial mimetype for bmp files, this
stops IE from getting confused.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.114.2.2.2.5.2.7r2=1.114.2.2.2.5.2.8diff_format=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.114.2.2.2.5.2.7
php-src/ext/standard/image.c:1.114.2.2.2.5.2.8
--- php-src/ext/standard/image.c:1.114.2.2.2.5.2.7 Wed Dec 31 11:15:45 2008
+++ php-src/ext/standard/image.cTue Mar 17 03:25:57 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.114.2.2.2.5.2.7 2008/12/31 11:15:45 sebastian Exp $ */
+/* $Id: image.c,v 1.114.2.2.2.5.2.8 2009/03/17 03:25:57 scottmac Exp $ */
#include php.h
#include stdio.h
@@ -1133,7 +1133,7 @@
case IMAGE_FILETYPE_PSD:
return image/psd;
case IMAGE_FILETYPE_BMP:
- return image/bmp;
+ return image/x-ms-bmp;
case IMAGE_FILETYPE_TIFF_II:
case IMAGE_FILETYPE_TIFF_MM:
return image/tiff;
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt
diff -u php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.1.2.2
php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.1.2.3
--- php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.1.2.2 Fri Feb
1 16:33:17 2008
+++ php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt Tue Mar 17
03:25:57 2009
@@ -49,7 +49,7 @@
string(9) image/png
string(29) application/x-shockwave-flash
string(9) image/psd
-string(9) image/bmp
+string(14) image/x-ms-bmp
string(10) image/tiff
string(10) image/tiff
string(24) application/octet-stream
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt
diff -u php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt:1.1.4.2
php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt:1.1.4.3
--- php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt:1.1.4.2
Thu Jan 22 13:27:25 2009
+++ php-src/ext/gd/tests/image_type_to_mime_type_variation3.phptTue Mar
17 03:25:57 2009
@@ -39,7 +39,7 @@
string\(9\) image\/psd
-- Iteration 6 --
-string\(9\) image\/bmp
+string\(14\) image\/x-ms-bmp
-- Iteration 7 --
string\(10\) image\/tiff
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/getimagesize.phpt?r1=1.6r2=1.6.8.1diff_format=u
Index: php-src/ext/standard/tests/image/getimagesize.phpt
diff -u php-src/ext/standard/tests/image/getimagesize.phpt:1.6
php-src/ext/standard/tests/image/getimagesize.phpt:1.6.8.1
--- php-src/ext/standard/tests/image/getimagesize.phpt:1.6 Fri Jan 17
23:57:43 2003
+++ php-src/ext/standard/tests/image/getimagesize.phpt Tue Mar 17 03:25:57 2009
@@ -37,7 +37,7 @@
[bits]=
int(24)
[mime]=
-string(9) image/bmp
+string(14) image/x-ms-bmp
}
[test1pix.jp2]=
array(7) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/getimagesize_basic.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/image/getimagesize_basic.phpt
diff -u php-src/ext/standard/tests/image/getimagesize_basic.phpt:1.1.2.2
php-src/ext/standard/tests/image/getimagesize_basic.phpt:1.1.2.3
--- php-src/ext/standard/tests/image/getimagesize_basic.phpt:1.1.2.2Fri Jan
23 11:18:36 2009
+++ php-src/ext/standard/tests/image/getimagesize_basic.phptTue Mar 17
03:25:57 2009
@@ -138,7 +138,7 @@
[bits]=
int(24)
[mime]=
- string(9) image/bmp
+ string(14) image/x-ms-bmp
}
array(0) {
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/image_type_to_mime_type.phpt?r1=1.5r2=1.5.8.1diff_format=u
Index: php-src/ext/standard/tests/image/image_type_to_mime_type.phpt
diff -u php-src/ext/standard/tests/image/image_type_to_mime_type.phpt:1.5
php-src/ext/standard/tests/image/image_type_to_mime_type.phpt:1.5.8.1
--- php-src/ext/standard/tests/image/image_type_to_mime_type.phpt:1.5 Fri Jan
17 18:51:30 2003
+++ php-src/ext/standard/tests/image/image_type_to_mime_type.phpt Tue Mar
17 03:25:57 2009
@@ -27,7 +27,7 @@
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
scottmacTue Mar 17 03:29:28 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.517r2=1.2027.2.547.2.965.2.518diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.517 php-src/NEWS:1.2027.2.547.2.965.2.518 --- php-src/NEWS:1.2027.2.547.2.965.2.517 Tue Mar 17 02:47:29 2009 +++ php-src/NEWSTue Mar 17 03:29:27 2009 @@ -19,6 +19,7 @@ - Fixed bug #47438 (mysql_fetch_field ignores zero offset). (Johannes) - Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly). (Felipe) - Fixed bug #47390 (odbc_fetch_into - BC in php 5.3.0). (Felipe) +- Fixed bug #47359 (Use the expected unofficial mimetype for bmp files). (Scott) - Fixed bug #47343 (gc_collect_cycles causes a segfault when called within a destructor in one case). (Dmitry) - Fixed bug #47329 (Crash in garbage collector). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv iconv.c
moriyoshi Tue Mar 17 05:27:00 2009 UTC
Modified files:
/php-src/ext/iconv iconv.c
Log:
- Make iconv filter accept '.' as the delimiter between encoding names as well
as '/'. It's impossible to specify the filter in php://filter without this
fix.
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.172r2=1.173diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.172 php-src/ext/iconv/iconv.c:1.173
--- php-src/ext/iconv/iconv.c:1.172 Tue Mar 10 23:39:22 2009
+++ php-src/ext/iconv/iconv.c Tue Mar 17 05:27:00 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: iconv.c,v 1.172 2009/03/10 23:39:22 helly Exp $ */
+/* $Id: iconv.c,v 1.173 2009/03/17 05:27:00 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2850,7 +2850,7 @@
return NULL;
}
++from_charset;
- if ((to_charset = strchr(from_charset, '/')) == NULL) {
+ if ((to_charset = strpbrk(from_charset, /.)) == NULL) {
return NULL;
}
from_charset_len = to_charset - from_charset;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/iconv iconv.c
moriyoshi Tue Mar 17 05:31:04 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/iconv iconv.c
Log:
- MFH: Make iconv filter accept '.' as the delimiter between encoding names as
well as '/'. It's impossible to specify the filter in php://filter without
this fix.
# I hope this to be merged to 5.2 as well. This doesn't break BC as there is
# no such encoding name that contains '.'. (Andif there were to be such one,
# the filter is failed in the first place since it also uses '.' for the
# delimiter between the filter name and the from encoding name.
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.20.2.13r2=1.124.2.8.2.20.2.14diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.13
php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.14
--- php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.13 Wed Dec 31 11:15:37 2008
+++ php-src/ext/iconv/iconv.c Tue Mar 17 05:31:04 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: iconv.c,v 1.124.2.8.2.20.2.13 2008/12/31 11:15:37 sebastian Exp $ */
+/* $Id: iconv.c,v 1.124.2.8.2.20.2.14 2009/03/17 05:31:04 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2759,7 +2759,7 @@
return NULL;
}
++from_charset;
- if ((to_charset = strchr(from_charset, '/')) == NULL) {
+ if ((to_charset = strpbrk(from_charset, /.)) == NULL) {
return NULL;
}
from_charset_len = to_charset - from_charset;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
