date:20080815

dmitry  Fri Aug 15 07:30:31 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Fixed double call to MSHUTDOWN in case of `php-cgi -m`
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.59r2=1.267.2.15.2.60diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.59 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.60
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.59 Wed Aug 13 01:01:29 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Aug 15 07:30:31 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.59 2008/08/13 01:01:29 jani Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.60 2008/08/15 07:30:31 dmitry Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -238,6 +238,7 @@
zend_llist sorted_exts;
 
zend_llist_copy(sorted_exts, zend_extensions);
+   sorted_exts.dtor = NULL;
zend_llist_sort(sorted_exts, extension_name_cmp TSRMLS_CC);
zend_llist_apply_with_argument(sorted_exts, 
(llist_apply_with_arg_func_t) print_extension_info, NULL TSRMLS_CC);
zend_llist_destroy(sorted_exts);



-- 
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/cgi cgi_main.c

dmitry  Fri Aug 15 07:30:50 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Fixed double call to MSHUTDOWN in case of `php-cgi -m`
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.23r2=1.267.2.15.2.50.2.24diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.23 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.24
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.23Wed Aug 13 00:53:28 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Aug 15 07:30:50 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.23 2008/08/13 00:53:28 jani Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.24 2008/08/15 07:30:50 dmitry Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -247,6 +247,7 @@
zend_llist sorted_exts;
 
zend_llist_copy(sorted_exts, zend_extensions);
+   sorted_exts.dtor = NULL;
zend_llist_sort(sorted_exts, extension_name_cmp TSRMLS_CC);
zend_llist_apply_with_argument(sorted_exts, 
(llist_apply_with_arg_func_t) print_extension_info, NULL TSRMLS_CC);
zend_llist_destroy(sorted_exts);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c

dmitry  Fri Aug 15 07:31:08 2008 UTC

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Fixed double call to MSHUTDOWN in case of `php-cgi -m`
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.360r2=1.361diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.360 php-src/sapi/cgi/cgi_main.c:1.361
--- php-src/sapi/cgi/cgi_main.c:1.360   Wed Aug 13 00:49:59 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Aug 15 07:31:07 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.360 2008/08/13 00:49:59 jani Exp $ */
+/* $Id: cgi_main.c,v 1.361 2008/08/15 07:31:07 dmitry Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -247,6 +247,7 @@
zend_llist sorted_exts;
 
zend_llist_copy(sorted_exts, zend_extensions);
+   sorted_exts.dtor = NULL;
zend_llist_sort(sorted_exts, extension_name_cmp TSRMLS_CC);
zend_llist_apply_with_argument(sorted_exts, 
(llist_apply_with_arg_func_t) print_extension_info, NULL TSRMLS_CC);
zend_llist_destroy(sorted_exts);



-- 
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/streams stream_get_meta_data_socket_variation1.phpt stream_get_meta_data_socket_variation2.phpt stream_get_meta_data_socket_variation3.phpt stream_get_meta_d

dmitry  Fri Aug 15 09:27:14 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/streams 

stream_get_meta_data_socket_variation1.phpt 

stream_get_meta_data_socket_variation2.phpt 

stream_get_meta_data_socket_variation3.phpt 

stream_get_meta_data_socket_variation4.phpt 
  Log:
  Fixed possible infinity loop in tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt?r1=1.4r2=1.5diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.4
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.5
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.4
  Tue May 27 07:46:51 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt  
Fri Aug 15 09:27:14 2008
@@ -5,12 +5,21 @@
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
+if ($server === false) {
+   die(stream_socket_server() failed\n);
+}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
+if ($client === false) {
+   die(fsockopen() failed\n);
+}
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
+if ($socket === false) {
+   die(stream_socket_accept() failed\n);
+}
 
 echo Write some data:\n;
 fwrite($socket, abcdefg\n1234567\nxyzxyz\n);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt?r1=1.4r2=1.5diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.4
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.5
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.4
  Tue May 27 07:46:51 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt  
Fri Aug 15 09:27:14 2008
@@ -5,12 +5,21 @@
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
+if ($server === false) {
+   die(stream_socket_server() failed\n);
+}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
+if ($client === false) {
+   die(fsockopen() failed\n);
+}
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
+if ($socket === false) {
+   die(stream_socket_accept() failed\n);
+}
 
 var_dump(stream_get_meta_data($client));
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt?r1=1.4r2=1.5diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.4
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.5
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.4
  Tue May 27 07:46:51 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt  
Fri Aug 15 09:27:14 2008
@@ -5,12 +5,21 @@
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
+if ($server === false) {
+   die(stream_socket_server() failed\n);
+}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
+if ($client === false) {
+   die(fsockopen() failed\n);
+}
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
+if ($socket === false) {
+   die(stream_socket_accept() failed\n);
+}
 
 var_dump(stream_get_meta_data($client));
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt?r1=1.3r2=1.4diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.3
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.4
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.3
  Tue May 27 07:46:51 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt  
Fri Aug 15 09:27:14 2008
@@ -5,12 +5,21 @@
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
+if ($server === false) {
+   die(stream_socket_server() failed\n);
+}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
+if ($client === false) {
+   die(fsockopen() failed\n);
+}
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
+if ($socket === false)

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/streams stream_get_meta_data_socket_variation1.phpt stream_get_meta_data_socket_variation2.phpt stream_get_meta_data_socket_variation3.phpt stream_g

dmitry  Fri Aug 15 09:27:27 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/streams 

stream_get_meta_data_socket_variation1.phpt 

stream_get_meta_data_socket_variation2.phpt 

stream_get_meta_data_socket_variation3.phpt 

stream_get_meta_data_socket_variation4.phpt 
  Log:
  Fixed possible infinity loop in tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.1.2.4
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.1.2.5
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.1.2.4
  Thu Mar 20 12:14:06 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt  
Fri Aug 15 09:27:27 2008
@@ -5,12 +5,21 @@
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
+if ($server === false) {
+   die(stream_socket_server() failed\n);
+}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
+if ($client === false) {
+   die(fsockopen() failed\n);
+}
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
+if ($socket === false) {
+   die(stream_socket_accept() failed\n);
+}
 
 echo Write some data:\n;
 fwrite($socket, abcdefg\n1234567\nxyzxyz\n);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.1.2.4
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.1.2.5
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.1.2.4
  Thu Mar 20 12:14:06 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt  
Fri Aug 15 09:27:27 2008
@@ -5,12 +5,21 @@
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
+if ($server === false) {
+   die(stream_socket_server() failed\n);
+}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
+if ($client === false) {
+   die(fsockopen() failed\n);
+}
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
+if ($socket === false) {
+   die(stream_socket_accept() failed\n);
+}
 
 var_dump(stream_get_meta_data($client));
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.1.2.4
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.1.2.5
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.1.2.4
  Thu Mar 20 12:14:06 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt  
Fri Aug 15 09:27:27 2008
@@ -5,12 +5,21 @@
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
+if ($server === false) {
+   die(stream_socket_server() failed\n);
+}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
+if ($client === false) {
+   die(fsockopen() failed\n);
+}
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
+if ($socket === false) {
+   die(stream_socket_accept() failed\n);
+}
 
 var_dump(stream_get_meta_data($client));
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.1.2.3
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.1.2.4
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.1.2.3
  Thu Mar 20 08:35:44 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt  
Fri Aug 15 09:27:27 2008
@@ -5,12 +5,21 @@
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
+if ($server === false) {
+   die(stream_socket_server() failed\n);
+}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
+if ($client === false) {
+

Re: [PHP-CVS] cvs: php-src /ext/standard/tests/file clearstatcache_001.phpt

2008-08-15 Thread Marcus Boerger

Hello Jani,

  why did you drop the clean section here? Some test developers prefer to
have the cleanup code reside in the clean section as that allows them to
run the tests without cleanup while normall the tests would clean after
themselves.

marcus

Friday, August 15, 2008, 1:25:27 AM, you wrote:

 janiThu Aug 14 23:25:27 2008 UTC

   Modified files:  
 /php-src/ext/standard/tests/fileclearstatcache_001.phpt 
   Log:
   - Fix test: Do not leave your crap behind!
   
 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/clearstatcache_001.phpt?r1=1.3r2=1.4diff_format=u
 Index: php-src/ext/standard/tests/file/clearstatcache_001.phpt
 diff -u php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.3
 php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.4
 --- php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.3   Sun Aug 
 10 12:06:49 2008
 +++ php-src/ext/standard/tests/file/clearstatcache_001.phpt Thu Aug 14 
 23:25:27 2008
 @@ -30,9 +30,6 @@
  clearstatcache(true, __FILE__ . _link1);
  var_dump(realpath(__FILE__ . _link2));
  
-?
 ---CLEAN--
 -?php
  @rmdir(__FILE__ . _dir1);
  @rmdir(__FILE__ . _dir2);
  @unlink(__FILE__ . _link1);






Best regards,
 Marcus


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/standard/tests/file clearstatcache_001.phpt

Because it was the easiest way to fix this: __FILE__ is not same with clean and
actual test sections,
so the clean section code did nothing however you run the tests..

btw. run-tests.php is such a mess that I don't want to even look at the code anymore.
f.e. Are the tests in sapi/tests/ supposed to work in any branch..?

--Jani

Marcus Boerger [EMAIL PROTECTED] kirjoitti:

Hello Jani,

why did you drop the clean section here? Some test developers prefer to
have the cleanup code reside in the clean section as that allows them to
run the tests without cleanup while normall the tests would clean after
themselves.

marcus

Friday, August 15, 2008, 1:25:27 AM, you wrote:

janiThu Aug 14 23:25:27 2008 UTC

Modified files:
/php-src/ext/standard/tests/fileclearstatcache_001.phpt
Log:

- Fix test: Do not leave your crap behind!

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/clearstatcache_001.phpt?r1=1.3r2=1.4diff_format=u

Index: php-src/ext/standard/tests/file/clearstatcache_001.phpt
diff -u php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.3
php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.4
--- php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.3 Sun Aug
10 12:06:49 2008
+++ php-src/ext/standard/tests/file/clearstatcache_001.phpt Thu Aug 14
23:25:27 2008
@@ -30,9 +30,6 @@
clearstatcache(true, __FILE__ . _link1);
var_dump(realpath(__FILE__ . _link2));

---CLEAN--
-?php
@rmdir(__FILE__ . _dir1);
@rmdir(__FILE__ . _dir2);
@unlink(__FILE__ . _link1);

Best regards,
Marcus

--
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/spl/tests dit_002.phpt

janiFri Aug 15 15:21:04 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/spl/tests  dit_002.phpt 
  Log:
  - Remove crap
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_002.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/spl/tests/dit_002.phpt
diff -u php-src/ext/spl/tests/dit_002.phpt:1.1.2.4 
php-src/ext/spl/tests/dit_002.phpt:1.1.2.5
--- php-src/ext/spl/tests/dit_002.phpt:1.1.2.4  Thu Aug 14 23:28:12 2008
+++ php-src/ext/spl/tests/dit_002.phpt  Fri Aug 15 15:21:04 2008
@@ -31,7 +31,7 @@
var_dump($obj-getFlags());
if ($isstring) {
$val = $obj-current();
-   if (is_string($val) || is_unicode($val)) {
+   if (is_string($val)) {
var_dump(true);
} else {
var_dump($val);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests dit_002.phpt


Fixed now. It didn't really matter, the test fails anyway if $val is not 
string. Just for different reason. :D

--Jani

Hannes Magnusson [EMAIL PROTECTED] kirjoitti: 

2008/8/15 Jani Taskinen [EMAIL PROTECTED]:
 janiThu Aug 14 23:28:12 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/spl/tests  dit_002.phpt
  Log:
  MFH

 
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_002.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
 Index: php-src/ext/spl/tests/dit_002.phpt
 diff -u php-src/ext/spl/tests/dit_002.phpt:1.1.2.3 
php-src/ext/spl/tests/dit_002.phpt:1.1.2.4
 --- php-src/ext/spl/tests/dit_002.phpt:1.1.2.3  Sat May 24 14:10:43 2008
 +++ php-src/ext/spl/tests/dit_002.phpt  Thu Aug 14 23:28:12 2008
 @@ -1,5 +1,7 @@
  --TEST--
  SPL: DirectoryIterator defaults
 +--SKIPIF--
 +?php if (!extension_loaded(spl) || !extension_loaded('reflection')) print 
skip; ?
  --FILE--
  ?php

 @@ -29,7 +31,7 @@
var_dump($obj-getFlags());
if ($isstring) {
$val = $obj-current();
 -   if (is_string($val)) {
 +   if (is_string($val) || is_unicode($val)) {

Uhh? In 5_3?

-Hannes




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/bcmath/libbcmath/src bcmath.h

pajoye  Fri Aug 15 15:38:55 2008 UTC

  Modified files:  
/php-src/ext/bcmath/libbcmath/src   bcmath.h 
  Log:
  - no config.h in ext/
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/libbcmath/src/bcmath.h?r1=1.11r2=1.12diff_format=u
Index: php-src/ext/bcmath/libbcmath/src/bcmath.h
diff -u php-src/ext/bcmath/libbcmath/src/bcmath.h:1.11 
php-src/ext/bcmath/libbcmath/src/bcmath.h:1.12
--- php-src/ext/bcmath/libbcmath/src/bcmath.h:1.11  Tue Sep 11 11:24:39 2007
+++ php-src/ext/bcmath/libbcmath/src/bcmath.h   Fri Aug 15 15:38:55 2008
@@ -53,7 +53,7 @@
 } bc_struct;
 
 #ifdef HAVE_CONFIG_H
-#include ../../config.h
+#include config.h
 #endif
 
 #include php.h



-- 
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/bcmath/libbcmath/src bcmath.h

pajoye  Fri Aug 15 15:39:18 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/bcmath/libbcmath/src   bcmath.h 
  Log:
  - MFH: no config.h in ext/
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/libbcmath/src/bcmath.h?r1=1.9.6.2r2=1.9.6.2.2.1diff_format=u
Index: php-src/ext/bcmath/libbcmath/src/bcmath.h
diff -u php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2 
php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2.2.1
--- php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2   Tue Sep 11 11:25:20 2007
+++ php-src/ext/bcmath/libbcmath/src/bcmath.h   Fri Aug 15 15:39:17 2008
@@ -53,7 +53,7 @@
 } bc_struct;
 
 #ifdef HAVE_CONFIG_H
-#include ../../config.h
+#include config.h
 #endif
 
 #include php.h



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h

Can you count to 2 ?? It's easy: 1, 2. 


Now, count how many levels it's to where the config.h would be if you do a 
phpize build:

ext/bcmath/libbcmath/src/bcmath.h

Revert or I will and fix the correct bug.

--Jani

Pierre-Alain Joye [EMAIL PROTECTED] kirjoitti: 

pajoye  Fri Aug 15 15:39:18 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/bcmath/libbcmath/src	bcmath.h 
  Log:

  - MFH: no config.h in ext/
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/libbcmath/src/bcmath.h?r1=1.9.6.2r2=1.9.6.2.2.1diff_format=u

Index: php-src/ext/bcmath/libbcmath/src/bcmath.h
diff -u php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2 
php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2.2.1
--- php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2   Tue Sep 11 11:25:20 2007
+++ php-src/ext/bcmath/libbcmath/src/bcmath.h   Fri Aug 15 15:39:17 2008
@@ -53,7 +53,7 @@
 } bc_struct;
 
 #ifdef HAVE_CONFIG_H

-#include ../../config.h
+#include config.h
 #endif
 
 #include php.h




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php





--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h

On Fri, Aug 15, 2008 at 6:00 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Can you count to 2 ?? It's easy: 1, 2.
 Now, count how many levels it's to where the config.h would be if you do a
 phpize build:

Sorry, I can't count to 2 :)

Should it not be in path anyway?

 ext/bcmath/libbcmath/src/bcmath.h

 Revert or I will and fix the correct bug.

It is fixed with this commit, my comment may be wrong about ext/.


-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h

Pierre Joye [EMAIL PROTECTED] kirjoitti: 

On Fri, Aug 15, 2008 at 6:00 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Can you count to 2 ?? It's easy: 1, 2.
 Now, count how many levels it's to where the config.h would be if you do a
 phpize build:

Sorry, I can't count to 2 :)

Should it not be in path anyway?


It was correct as it was.


 ext/bcmath/libbcmath/src/bcmath.h

 Revert or I will and fix the correct bug.

It is fixed with this commit, my comment may be wrong about ext/.


WHAT was fixed? It worked fine before you started messing around, what EXACTLY did you fix 
with this change?


--Jani


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h

On Fri, Aug 15, 2008 at 6:30 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Pierre Joye [EMAIL PROTECTED] kirjoitti:

 On Fri, Aug 15, 2008 at 6:00 PM, Jani Taskinen [EMAIL PROTECTED]
 wrote:
  Can you count to 2 ?? It's easy: 1, 2.
  Now, count how many levels it's to where the config.h would be if you do
  a
  phpize build:

 Sorry, I can't count to 2 :)

 Should it not be in path anyway?

 It was correct as it was.

  ext/bcmath/libbcmath/src/bcmath.h
 
  Revert or I will and fix the correct bug.

 It is fixed with this commit, my comment may be wrong about ext/.

 WHAT was fixed? It worked fine before you started messing around, what
 EXACTLY did you fix with this change?

config.h not found, what else can be fixed? :)


-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

-- 
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/bcmath/libbcmath/src bcmath.h

janiFri Aug 15 16:36:39 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/bcmath/libbcmath/src   bcmath.h 
  Log:
  - Revert wrong fix
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/libbcmath/src/bcmath.h?r1=1.9.6.2.2.1r2=1.9.6.2.2.2diff_format=u
Index: php-src/ext/bcmath/libbcmath/src/bcmath.h
diff -u php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2.2.1 
php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2.2.2
--- php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2.2.1   Fri Aug 15 
15:39:17 2008
+++ php-src/ext/bcmath/libbcmath/src/bcmath.h   Fri Aug 15 16:36:39 2008
@@ -53,7 +53,7 @@
 } bc_struct;
 
 #ifdef HAVE_CONFIG_H
-#include config.h
+#include ../../config.h
 #endif
 
 #include php.h



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/bcmath/libbcmath/src bcmath.h

janiFri Aug 15 16:37:22 2008 UTC

  Modified files:  
/php-src/ext/bcmath/libbcmath/src   bcmath.h 
  Log:
  - Revert bad fix
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/libbcmath/src/bcmath.h?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/bcmath/libbcmath/src/bcmath.h
diff -u php-src/ext/bcmath/libbcmath/src/bcmath.h:1.12 
php-src/ext/bcmath/libbcmath/src/bcmath.h:1.13
--- php-src/ext/bcmath/libbcmath/src/bcmath.h:1.12  Fri Aug 15 15:38:55 2008
+++ php-src/ext/bcmath/libbcmath/src/bcmath.h   Fri Aug 15 16:37:22 2008
@@ -53,7 +53,7 @@
 } bc_struct;
 
 #ifdef HAVE_CONFIG_H
-#include config.h
+#include ../../config.h
 #endif
 
 #include php.h



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h


Not enough info - bogus.

FYI: Just tested to be sure. Doing phpize build now fails. Works when reverted. 
(reverted btw..)


I say again: Fix the REAL bugs, not symptoms of the real bugs..

--Jani



Pierre Joye [EMAIL PROTECTED] kirjoitti: 

On Fri, Aug 15, 2008 at 6:30 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Pierre Joye [EMAIL PROTECTED] kirjoitti:

 On Fri, Aug 15, 2008 at 6:00 PM, Jani Taskinen [EMAIL PROTECTED]
 wrote:
  Can you count to 2 ?? It's easy: 1, 2.
  Now, count how many levels it's to where the config.h would be if you do
  a
  phpize build:

 Sorry, I can't count to 2 :)

 Should it not be in path anyway?

 It was correct as it was.

  ext/bcmath/libbcmath/src/bcmath.h
 
  Revert or I will and fix the correct bug.

 It is fixed with this commit, my comment may be wrong about ext/.

 WHAT was fixed? It worked fine before you started messing around, what
 EXACTLY did you fix with this change?

config.h not found, what else can be fixed? :)


--
Pierre
http://blog.thepimp.net | http://www.libgd.org




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h

On Fri, Aug 15, 2008 at 6:37 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Not enough info - bogus.

 FYI: Just tested to be sure. Doing phpize build now fails. Works when
 reverted. (reverted btw..)

 I say again: Fix the REAL bugs, not symptoms of the real bugs..

Wait, you revert a fix because a phpize build fails now for an
extension being released only in php core?

-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h

2008-08-15 Thread Marcus Boerger

Hello Jani,

  the real fix actually is to drop all #include config.h, because php needs
to have php_config.h and not config.h as first file.

marcus

Friday, August 15, 2008, 6:37:24 PM, you wrote:

 Not enough info - bogus.

 FYI: Just tested to be sure. Doing phpize build now fails. Works when 
 reverted.
 (reverted btw..)

 I say again: Fix the REAL bugs, not symptoms of the real bugs..

 --Jani



 Pierre Joye [EMAIL PROTECTED] kirjoitti: 
 On Fri, Aug 15, 2008 at 6:30 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
  Pierre Joye [EMAIL PROTECTED] kirjoitti:
 
  On Fri, Aug 15, 2008 at 6:00 PM, Jani Taskinen [EMAIL PROTECTED]
  wrote:
   Can you count to 2 ?? It's easy: 1, 2.
   Now, count how many levels it's to where the config.h would be if you do
   a
   phpize build:
 
  Sorry, I can't count to 2 :)
 
  Should it not be in path anyway?
 
  It was correct as it was.
 
   ext/bcmath/libbcmath/src/bcmath.h
  
   Revert or I will and fix the correct bug.
 
  It is fixed with this commit, my comment may be wrong about ext/.
 
  WHAT was fixed? It worked fine before you started messing around, what
  EXACTLY did you fix with this change?
 
 config.h not found, what else can be fixed? :)
 
 
 -- 
 Pierre
 http://blog.thepimp.net | http://www.libgd.org
 





Best regards,
 Marcus


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h


No, I revert bad fixes that break something that worked before and
are inherently totally bogus to begin with.

--Jani

Pierre Joye [EMAIL PROTECTED] kirjoitti: 

On Fri, Aug 15, 2008 at 6:37 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Not enough info - bogus.

 FYI: Just tested to be sure. Doing phpize build now fails. Works when
 reverted. (reverted btw..)

 I say again: Fix the REAL bugs, not symptoms of the real bugs..

Wait, you revert a fix because a phpize build fails now for an
extension being released only in php core?

--
Pierre

http://blog.thepimp.net | http://www.libgd.org




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h


You don't really need to comment about everything, do you?
Please get your facts correct first.

--Jani


Marcus Boerger [EMAIL PROTECTED] kirjoitti: 

Hello Jani,

  the real fix actually is to drop all #include config.h, because php needs
to have php_config.h and not config.h as first file.

marcus

Friday, August 15, 2008, 6:37:24 PM, you wrote:

 Not enough info - bogus.

 FYI: Just tested to be sure. Doing phpize build now fails. Works when 
reverted.
 (reverted btw..)

 I say again: Fix the REAL bugs, not symptoms of the real bugs..

 --Jani



 Pierre Joye [EMAIL PROTECTED] kirjoitti: 
 On Fri, Aug 15, 2008 at 6:30 PM, Jani Taskinen [EMAIL PROTECTED] wrote:

  Pierre Joye [EMAIL PROTECTED] kirjoitti:
 
  On Fri, Aug 15, 2008 at 6:00 PM, Jani Taskinen [EMAIL PROTECTED]
  wrote:
   Can you count to 2 ?? It's easy: 1, 2.
   Now, count how many levels it's to where the config.h would be if you do
   a
   phpize build:
 
  Sorry, I can't count to 2 :)
 
  Should it not be in path anyway?
 
  It was correct as it was.
 
   ext/bcmath/libbcmath/src/bcmath.h
  
   Revert or I will and fix the correct bug.
 
  It is fixed with this commit, my comment may be wrong about ext/.
 
  WHAT was fixed? It worked fine before you started messing around, what
  EXACTLY did you fix with this change?
 
 config.h not found, what else can be fixed? :)
 
 
 -- 
 Pierre

 http://blog.thepimp.net | http://www.libgd.org
 






Best regards,
 Marcus


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php





--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard/tests/file tempnam_variation7-win32.phpt

pajoye  Fri Aug 15 16:50:55 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/filetempnam_variation7-win32.phpt 
  Log:
  - New parameter parsing API   new warning
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt
diff -u php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt:1.4 
php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt:1.5
--- php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt:1.4   Tue May 
27 09:34:55 2008
+++ php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt   Fri Aug 
15 16:50:55 2008
@@ -61,32 +61,33 @@
 *** Testing tempnam() with invalid/non-existing directory names ***
 -- Iteration 1 --
 File name is = %s
-File permissions are = 100666
+File permissions are = 100600
 -- Iteration 2 --
 File name is = %s
-File permissions are = 100666
+File permissions are = 100600
 -- Iteration 3 --
 File name is = %s
-File permissions are = 100666
+File permissions are = 100600
 -- Iteration 4 --
 File name is = %s
-File permissions are = 100666
+File permissions are = 100600
 -- Iteration 5 --
 File name is = %s
-File permissions are = 100666
+File permissions are = 100600
 -- Iteration 6 --
 File name is = %s
-File permissions are = 100666
+File permissions are = 100600
 -- Iteration 7 --
 
-Notice: Array to string conversion in %s on line %d
-File name is = %s
-File permissions are = 100666
+Warning: tempnam() expects parameter 1 to be string, array given in %s on line 
%d
+-- File is not created --
+
+Warning: unlink(): No such file or directory in %s on line %d
 -- Iteration 8 --
 File name is = %s
-File permissions are = 100666
+File permissions are = 100600
 -- Iteration 9 --
 File name is = %s
-File permissions are = 100666
+File permissions are = 100600
 
 *** 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/standard/tests/file rename_variation-win32.phpt

pajoye  Fri Aug 15 17:00:27 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/filerename_variation-win32.phpt 
  Log:
  - fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation-win32.phpt?r1=1.1.2.1.2.2r2=1.1.2.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/rename_variation-win32.phpt
diff -u php-src/ext/standard/tests/file/rename_variation-win32.phpt:1.1.2.1.2.2 
php-src/ext/standard/tests/file/rename_variation-win32.phpt:1.1.2.1.2.3
--- php-src/ext/standard/tests/file/rename_variation-win32.phpt:1.1.2.1.2.2 
Wed Apr 30 13:53:52 2008
+++ php-src/ext/standard/tests/file/rename_variation-win32.phpt Fri Aug 15 
17:00:27 2008
@@ -71,7 +71,7 @@
 
 Warning: 
rename(%s/rename_variation/rename_variation.tmp/,%s/rename_variation2.tmp): No 
such file or directory in %s on line %d
 bool(false)
-bool(true)
+bool(false)
 bool(false)
 
 Warning: unlink(%s/rename_variation2.tmp): No such file or directory in %s on 
line %d



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard/tests/file popen_pclose_error-win32-debug.phpt popen_pclose_error-win32.phpt

pajoye  Fri Aug 15 19:01:09 2008 UTC

  Added files: 
/php-src/ext/standard/tests/file
popen_pclose_error-win32-debug.phpt 

  Modified files:  
/php-src/ext/standard/tests/filepopen_pclose_error-win32.phpt 
  Log:
  - fix test
  - add debug build mode (crt outputs callback for invalid parameters)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt
diff -u php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt:1.3 
php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt:1.4
--- php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt:1.3   Tue May 
27 09:34:54 2008
+++ php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt   Fri Aug 
15 19:01:09 2008
@@ -3,8 +3,10 @@
 
 --SKIPIF--
 ?php
-if(substr(PHP_OS, 0, 3) != 'WIN' )
-  die(skip Not Valid for Linux);
+ob_start();phpinfo(INFO_GENERAL);$inf=ob_get_contents(); ob_end_clean();
+if (strpos('MSVC9', $inf) || strpos('MSVC8', $inf)) die(skip Not Valid for 
build done with VC  8);
+if(substr(PHP_OS, 0, 3) != 'WIN' ) die(skip Not Valid for Linux);
+if(PHP_DEBUG) die(skip Not Valid for debug builds);
 ?
 
 --FILE--

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
+++ php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
--TEST--
Test popen() and pclose function: error conditions

--SKIPIF--
?php
if(substr(PHP_OS, 0, 3) != 'WIN'  PHP_DEBUG)) die(skip Not Valid for Linux);
if(!PHP_DEBUG) die(skip Not Valid for release builds);
if (!(strpos('MSVC9', $inf) || strpos('MSVC8', $inf))) die(skip Not Valid for 
build done with VC  8);
?

--FILE--
?php
/*
 * Prototype: resource popen ( string command, string mode )
 * Description: Opens process file pointer.

 * Prototype: int pclose ( resource handle );
 * Description: Closes process file pointer.
 */
$file_path = dirname(__FILE__);
echo *** Testing for error conditions ***\n;
var_dump( popen() );  // Zero Arguments
var_dump( popen(abc.txt) );   // Single Argument
var_dump( popen(abc.txt, rw) );   // Invalid mode Argument
var_dump( pclose() );
$file_handle = fopen($file_path./popen.tmp, w);
var_dump( pclose($file_handle, $file_handle) );
pclose($file_handle);
var_dump( pclose(1) );
echo \n--- Done ---;
?
--CLEAN--
?php
$file_path = dirname(__FILE__);
unlink($file_path./popen.tmp);
?
--EXPECTF--
*** Testing for error conditions ***

Warning: popen() expects exactly 2 parameters, 0 given in %s on line %d
NULL

Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d
NULL

Warning: Invalid parameter detected in CRT function '_fdopen' (%s:%d) in %s on 
line %d

Warning: popen(abc.txt,rw): Invalid argument in %s on line %d
bool(false)

Warning: pclose() expects exactly 1 parameter, 0 given in %s on line %d
bool(false)

Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)

Warning: pclose() expects parameter 1 to be resource, integer given in %s on 
line %d
bool(false)

--- Done ---'abc.txt' is not recognized as an internal or external command,
operable program or batch file.



-- 
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/file popen_pclose_error-win32-debug.phpt popen_pclose_error-win32.phpt

pajoye  Fri Aug 15 19:01:42 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/file
popen_pclose_error-win32-debug.phpt 

  Modified files:  
/php-src/ext/standard/tests/filepopen_pclose_error-win32.phpt 
  Log:
  -MFH:
   - fix test
   - add debug build mode (crt outputs callback for invalid parameters)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt?r1=1.1.2.1.2.1r2=1.1.2.1.2.2diff_format=u
Index: php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt
diff -u 
php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt:1.1.2.1.2.1 
php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt:1.1.2.1.2.1   
Mon Nov  5 17:43:21 2007
+++ php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt   Fri Aug 
15 19:01:42 2008
@@ -3,8 +3,8 @@
 
 --SKIPIF--
 ?php
-if(substr(PHP_OS, 0, 3) != 'WIN' )
-  die(skip Not Valid for Linux);
+if(substr(PHP_OS, 0, 3) != 'WIN') die(skip Not Valid for Linux);
+if(PHP_DEBUG) die(skip Not Valid for debug builds);
 ?
 
 --FILE--

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
+++ php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
--TEST--
Test popen() and pclose function: error conditions

--SKIPIF--
?php
if(substr(PHP_OS, 0, 3) != 'WIN'  PHP_DEBUG)) die(skip Not Valid for Linux);
if(!PHP_DEBUG) die(skip Not Valid for release builds);
if (!(strpos('MSVC9', $inf) || strpos('MSVC8', $inf))) die(skip Not Valid for 
build done with VC  8);
?

--FILE--
?php
/*
 * Prototype: resource popen ( string command, string mode )
 * Description: Opens process file pointer.

 * Prototype: int pclose ( resource handle );
 * Description: Closes process file pointer.
 */
$file_path = dirname(__FILE__);
echo *** Testing for error conditions ***\n;
var_dump( popen() );  // Zero Arguments
var_dump( popen(abc.txt) );   // Single Argument
var_dump( popen(abc.txt, rw) );   // Invalid mode Argument
var_dump( pclose() );
$file_handle = fopen($file_path./popen.tmp, w);
var_dump( pclose($file_handle, $file_handle) );
pclose($file_handle);
var_dump( pclose(1) );
echo \n--- Done ---;
?
--CLEAN--
?php
$file_path = dirname(__FILE__);
unlink($file_path./popen.tmp);
?
--EXPECTF--
*** Testing for error conditions ***

Warning: popen() expects exactly 2 parameters, 0 given in %s on line %d
NULL

Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d
NULL

Warning: Invalid parameter detected in CRT function '_fdopen' (%s:%d) in %s on 
line %d

Warning: popen(abc.txt,rw): Invalid argument in %s on line %d
bool(false)

Warning: pclose() expects exactly 1 parameter, 0 given in %s on line %d
bool(false)

Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)

Warning: pclose() expects parameter 1 to be resource, integer given in %s on 
line %d
bool(false)

--- Done ---'abc.txt' is not recognized as an internal or external command,
operable program or batch file.



-- 
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/file stream_copy_to_stream.phpt

pajoye  Fri Aug 15 19:25:56 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/filestream_copy_to_stream.phpt 
  Log:
  - make it portable without loosing pertinent data
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stream_copy_to_stream.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/stream_copy_to_stream.phpt
diff -u php-src/ext/standard/tests/file/stream_copy_to_stream.phpt:1.2 
php-src/ext/standard/tests/file/stream_copy_to_stream.phpt:1.3
--- php-src/ext/standard/tests/file/stream_copy_to_stream.phpt:1.2  Tue May 
27 09:34:54 2008
+++ php-src/ext/standard/tests/file/stream_copy_to_stream.phpt  Fri Aug 15 
19:25:56 2008
@@ -2,6 +2,7 @@
 stream_copy_to_stream() tests
 --FILE--
 ?php
+define('WIN', substr(PHP_OS, 0, 3) == 'WIN');
 
 $initial_file = dirname(__FILE__).'/bug38086.txt';
 $new_file = dirname(__FILE__).'/bug38086_1.txt';
@@ -24,8 +25,11 @@
 $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest, -1));
 fclose($src); fclose($dest);
-
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -37,7 +41,11 @@
 var_dump(stream_copy_to_stream($src, $dest));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -48,7 +56,11 @@
 var_dump(stream_copy_to_stream($src, $dest));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -59,7 +71,12 @@
 var_dump(stream_copy_to_stream($src, $dest, 100));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
+
 unlink($new_file);
 
 /* --- */
@@ -70,7 +87,11 @@
 var_dump(stream_copy_to_stream($src, $dest, 10));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -81,45 +102,49 @@
 var_dump(stream_copy_to_stream($src, $dest, -1));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 echo Done\n;
 ?
---EXPECT--
+--EXPECTF--
 int(0)
 string(0) 
-int(134)
+int(%d)
 string(134) Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf
 Gung ubyq zr qbja
 V'yy grne lbh qbja vagb zl cevingr uryy
 
-int(134)
+int(%d)
 string(134) Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf
 Gung ubyq zr qbja
 V'yy grne lbh qbja vagb zl cevingr uryy
 
-int(134)
+int(%d)
 string(134) Another day
 When the pains of life won't bar my way
 I'll break these chains
 That hold me down
 I'll tear you down into my private hell
 
-int(134)
+int(%d)
 string(134) Another day
 When the pains of life won't bar my way
 I'll break these chains
 That hold me down
 I'll tear you down into my private hell
 
-int(10)
+int(%d)
 string(10) Another da
-int(134)
+int(%d)
 string(134) Another day
 When the pains of life won't bar my way
 I'll break these chains



-- 
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/file stream_copy_to_stream.phpt

pajoye  Fri Aug 15 19:26:37 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/filestream_copy_to_stream.phpt 
  Log:
  - MFH: make it portable without loosing pertinent data
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stream_copy_to_stream.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/ext/standard/tests/file/stream_copy_to_stream.phpt
diff -u php-src/ext/standard/tests/file/stream_copy_to_stream.phpt:1.1.2.2 
php-src/ext/standard/tests/file/stream_copy_to_stream.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/stream_copy_to_stream.phpt:1.1.2.2  Thu Jul 
13 12:00:17 2006
+++ php-src/ext/standard/tests/file/stream_copy_to_stream.phpt  Fri Aug 15 
19:26:37 2008
@@ -2,6 +2,7 @@
 stream_copy_to_stream() tests
 --FILE--
 ?php
+define('WIN', substr(PHP_OS, 0, 3) == 'WIN');
 
 $initial_file = dirname(__FILE__).'/bug38086.txt';
 $new_file = dirname(__FILE__).'/bug38086_1.txt';
@@ -24,8 +25,11 @@
 $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest, -1));
 fclose($src); fclose($dest);
-
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -37,7 +41,11 @@
 var_dump(stream_copy_to_stream($src, $dest));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -48,7 +56,11 @@
 var_dump(stream_copy_to_stream($src, $dest));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -59,7 +71,12 @@
 var_dump(stream_copy_to_stream($src, $dest, 100));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
+
 unlink($new_file);
 
 /* --- */
@@ -70,7 +87,11 @@
 var_dump(stream_copy_to_stream($src, $dest, 10));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -81,7 +102,11 @@
 var_dump(stream_copy_to_stream($src, $dest, -1));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 echo Done\n;
@@ -89,37 +114,37 @@
 --EXPECTF--
 int(0)
 string(0) 
-int(134)
+int(%d)
 string(134) Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf
 Gung ubyq zr qbja
 V'yy grne lbh qbja vagb zl cevingr uryy
 
-int(134)
+int(%d)
 string(134) Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf
 Gung ubyq zr qbja
 V'yy grne lbh qbja vagb zl cevingr uryy
 
-int(134)
+int(%d)
 string(134) Another day
 When the pains of life won't bar my way
 I'll break these chains
 That hold me down
 I'll tear you down into my private hell
 
-int(134)
+int(%d)
 string(134) Another day
 When the pains of life won't bar my way
 I'll break these chains
 That hold me down
 I'll tear you down into my private hell
 
-int(10)
+int(%d)
 string(10) Another da
-int(134)
+int(%d)
 string(134) Another day
 When the pains of life won't bar my way
 I'll break these chains



-- 
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

2008-08-15 Thread Hannes Magnusson

bjori   Fri Aug 15 19:31:05 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Fix typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.270r2=1.2027.2.547.2.965.2.271diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.270 
php-src/NEWS:1.2027.2.547.2.965.2.271
--- php-src/NEWS:1.2027.2.547.2.965.2.270   Thu Aug 14 18:19:49 2008
+++ php-src/NEWSFri Aug 15 19:31:04 2008
@@ -202,7 +202,7 @@
   . Added GlobIterator. (Marcus)
   . Added SplHeap, SplMinHeap, SplMaxHeap, SplPriorityQueue classes. (Etienne)
   . Added new parameter $prepend to spl_autoload_register(). (Etienne)
-  . Added FixedArray. (Etienne, Tony)
+  . Added SplFixedArray. (Etienne, Tony)
   . Added delaying exceptions in SPL's autoload mechanism. (Marcus)
   . Added RecursiveTreeIterator. (Arnaud, Marcus)
   . Added MultipleIterator. (Arnaud, Marcus, Johannes)



-- 
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/file bug38086.phpt

pajoye  Fri Aug 15 19:33:56 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug38086.phpt 
  Log:
   - MFH: make it portable without loosing pertinent data
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug38086.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/ext/standard/tests/file/bug38086.phpt
diff -u php-src/ext/standard/tests/file/bug38086.phpt:1.1.2.2 
php-src/ext/standard/tests/file/bug38086.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/bug38086.phpt:1.1.2.2   Thu Jul 13 
12:00:17 2006
+++ php-src/ext/standard/tests/file/bug38086.phpt   Fri Aug 15 19:33:56 2008
@@ -2,6 +2,7 @@
 Bug #38086 (stream_copy_to_stream() returns 0 when maxlen is bigger than the 
actual length)
 --FILE--
 ?php
+define('WIN', substr(PHP_OS, 0, 3) == 'WIN');
 
 $initial_file = dirname(__FILE__).'/bug38086.txt';
 $new_file = dirname(__FILE__).'/bug38086_1.txt';
@@ -13,7 +14,11 @@
 var_dump(stream_copy_to_stream($src, $dest));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 $src = fopen($initial_file, 'r');
@@ -23,20 +28,24 @@
 var_dump(stream_copy_to_stream($src, $dest, 1));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace(\r\n,\n, file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 echo Done\n;
 ?
 --EXPECTF--
-int(134)
+int(%d)
 string(134) Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf
 Gung ubyq zr qbja
 V'yy grne lbh qbja vagb zl cevingr uryy
 
-int(134)
+int(%d)
 string(134) Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main main.c ZendEngine2 zend.c zend.h zend_alloc.c zend_alloc.h zend_execute.c zend_gc.c zend_gc.h zend_language_scanner.c zend_language_scanner.l zend_operators.c zend_stream

felipe  Fri Aug 15 19:45:25 2008 UTC

  Modified files:  
/ZendEngine2zend.c zend.h zend_alloc.c zend_alloc.h zend_execute.c 
zend_gc.c zend_gc.h zend_language_scanner.c 
zend_language_scanner.l zend_operators.c zend_stream.c 
zend_vm_def.h zend_vm_execute.h 
/php-src/main   main.c 
  Log:
  - Removed some TSRMLS_FETCH()s
  
  http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.422r2=1.423diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.422 ZendEngine2/zend.c:1.423
--- ZendEngine2/zend.c:1.422Thu Aug 14 10:06:39 2008
+++ ZendEngine2/zend.c  Fri Aug 15 19:45:24 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend.c,v 1.422 2008/08/14 10:06:39 helly Exp $ */
+/* $Id: zend.c,v 1.423 2008/08/15 19:45:24 felipe Exp $ */
 
 #include zend.h
 #include zend_extensions.h
@@ -58,7 +58,7 @@
 ZEND_API zend_write_func_t zend_write;
 ZEND_API int (*zend_path_encode)(char **encpath, int *encpath_len, const UChar 
*path, int path_len TSRMLS_DC);
 ZEND_API int (*zend_path_decode)(UChar **decpath, int *decpath_len, const char 
*path, int path_len TSRMLS_DC);
-ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
+ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path 
TSRMLS_DC);
 ZEND_API int (*zend_stream_open_function)(const char *filename, 
zend_file_handle *handle TSRMLS_DC);
 ZEND_API void (*zend_block_interruptions)(void);
 ZEND_API void (*zend_unblock_interruptions)(void);
@@ -70,7 +70,7 @@
 
 void (*zend_on_timeout)(int seconds TSRMLS_DC);
 
-static void (*zend_message_dispatcher_p)(long message, void *data);
+static void (*zend_message_dispatcher_p)(long message, void *data TSRMLS_DC);
 static int (*zend_get_configuration_directive_p)(const char *name, uint 
name_length, zval *contents);
 
 static ZEND_INI_MH(OnUpdateErrorReporting) /* {{{ */
@@ -665,7 +665,7 @@
 }
 /* }}} */
 
-static FILE *zend_fopen_wrapper(const char *filename, char **opened_path) /* 
{{{ */
+static FILE *zend_fopen_wrapper(const char *filename, char **opened_path 
TSRMLS_DC) /* {{{ */
 {
if (opened_path) {
*opened_path = estrdup(filename);
@@ -1045,7 +1045,7 @@
 
 void zend_init_opcodes_handlers(void);
 
-int zend_startup(zend_utility_functions *utility_functions, char **extensions) 
/* {{{ */
+int zend_startup(zend_utility_functions *utility_functions, char **extensions 
TSRMLS_DC) /* {{{ */
 {
 #ifdef ZTS
zend_compiler_globals *compiler_globals;
@@ -1058,7 +1058,6 @@
extern zend_php_scanner_globals language_scanner_globals;
extern zend_unicode_globals unicode_globals;
 #endif
-   TSRMLS_FETCH();
 
 #ifndef __GNUC__
null_zstr.v = NULL;
@@ -1140,7 +1139,6 @@
ts_allocate_id(ini_scanner_globals_id, 
sizeof(zend_ini_scanner_globals), (ts_allocate_ctor) ini_scanner_globals_ctor, 
NULL);
compiler_globals = ts_resource(compiler_globals_id);
executor_globals = ts_resource(executor_globals_id);
-   tsrm_ls = ts_resource_ex(0, NULL);
 
compiler_globals_dtor(compiler_globals TSRMLS_CC);
compiler_globals-in_compilation = 0;
@@ -1468,10 +1466,10 @@
 /* }}} */
 
 BEGIN_EXTERN_C()
-ZEND_API void zend_message_dispatcher(long message, void *data) /* {{{ */
+ZEND_API void zend_message_dispatcher(long message, void *data TSRMLS_DC) /* 
{{{ */
 {
if (zend_message_dispatcher_p) {
-   zend_message_dispatcher_p(message, data);
+   zend_message_dispatcher_p(message, data TSRMLS_CC);
}
 }
 /* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.360r2=1.361diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.360 ZendEngine2/zend.h:1.361
--- ZendEngine2/zend.h:1.360Tue Aug 12 17:15:59 2008
+++ ZendEngine2/zend.h  Fri Aug 15 19:45:24 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend.h,v 1.360 2008/08/12 17:15:59 felipe Exp $ */
+/* $Id: zend.h,v 1.361 2008/08/15 19:45:24 felipe Exp $ */
 
 #ifndef ZEND_H
 #define ZEND_H
@@ -509,8 +509,8 @@
int (*write_function)(const char *str, uint str_length);
int (*path_encode_function)(char **encpath, int *encpath_len, const 
UChar *path, int path_len TSRMLS_DC);
int (*path_decode_function)(UChar **decpath, int *decpath_len, const 
char *path, int path_len TSRMLS_DC);
-   FILE *(*fopen_function)(const char *filename, char **opened_path);
-   void (*message_handler)(long message, void *data);
+   FILE *(*fopen_function)(const char *filename, char **opened_path 
TSRMLS_DC);
+   void (*message_handler)(long message, void *data TSRMLS_DC);
void (*block_interruptions)(void);
void (*unblock_interruptions)(void);
int (*get_configuration_directive)(const char *name, uint name_length, 
zval *contents);
@@

[PHP-CVS] cvs: php-src(PHP_5_3) /main main.c ZendEngine2 zend.c zend.h zend_alloc.c zend_alloc.h zend_execute.c zend_gc.c zend_gc.h zend_language_scanner.c zend_language_scanner.l zend_operators.c ze

felipe  Fri Aug 15 19:47:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/ZendEngine2zend.c zend.h zend_alloc.c zend_alloc.h zend_execute.c 
zend_gc.c zend_gc.h zend_language_scanner.c 
zend_language_scanner.l zend_operators.c zend_stream.c 
zend_vm_def.h zend_vm_execute.h 
/php-src/main   main.c 
  Log:
  - MFH: Removed some TSRMLS_FETCH()s
  
  http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.35.2.22r2=1.308.2.12.2.35.2.23diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.35.2.22 
ZendEngine2/zend.c:1.308.2.12.2.35.2.23
--- ZendEngine2/zend.c:1.308.2.12.2.35.2.22 Thu Aug 14 10:24:51 2008
+++ ZendEngine2/zend.c  Fri Aug 15 19:47:23 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend.c,v 1.308.2.12.2.35.2.22 2008/08/14 10:24:51 helly Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.35.2.23 2008/08/15 19:47:23 felipe Exp $ */
 
 #include zend.h
 #include zend_extensions.h
@@ -50,7 +50,7 @@
 ZEND_API zend_class_entry *zend_standard_class_def = NULL;
 ZEND_API int (*zend_printf)(const char *format, ...);
 ZEND_API zend_write_func_t zend_write;
-ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
+ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path 
TSRMLS_DC);
 ZEND_API int (*zend_stream_open_function)(const char *filename, 
zend_file_handle *handle TSRMLS_DC);
 ZEND_API void (*zend_block_interruptions)(void);
 ZEND_API void (*zend_unblock_interruptions)(void);
@@ -62,7 +62,7 @@
 
 void (*zend_on_timeout)(int seconds TSRMLS_DC);
 
-static void (*zend_message_dispatcher_p)(long message, void *data);
+static void (*zend_message_dispatcher_p)(long message, void *data TSRMLS_DC);
 static int (*zend_get_configuration_directive_p)(const char *name, uint 
name_length, zval *contents);
 
 static ZEND_INI_MH(OnUpdateErrorReporting) /* {{{ */
@@ -423,7 +423,7 @@
 }
 /* }}} */
 
-static FILE *zend_fopen_wrapper(const char *filename, char **opened_path) /* 
{{{ */
+static FILE *zend_fopen_wrapper(const char *filename, char **opened_path 
TSRMLS_DC) /* {{{ */
 {
if (opened_path) {
*opened_path = estrdup(filename);
@@ -601,7 +601,7 @@
 
 void zend_init_opcodes_handlers(void);
 
-int zend_startup(zend_utility_functions *utility_functions, char **extensions, 
int start_builtin_functions) /* {{{ */
+int zend_startup(zend_utility_functions *utility_functions, char **extensions, 
int start_builtin_functions TSRMLS_DC) /* {{{ */
 {
 #ifdef ZTS
zend_compiler_globals *compiler_globals;
@@ -612,7 +612,6 @@
extern zend_ini_scanner_globals ini_scanner_globals;
extern zend_php_scanner_globals language_scanner_globals;
 #endif
-   TSRMLS_FETCH();
 
start_memory_manager(TSRMLS_C);
 
@@ -680,7 +679,6 @@
ts_allocate_id(ini_scanner_globals_id, 
sizeof(zend_ini_scanner_globals), (ts_allocate_ctor) ini_scanner_globals_ctor, 
NULL);
compiler_globals = ts_resource(compiler_globals_id);
executor_globals = ts_resource(executor_globals_id);
-   tsrm_ls = ts_resource_ex(0, NULL);
 
compiler_globals_dtor(compiler_globals TSRMLS_CC);
compiler_globals-in_compilation = 0;
@@ -949,10 +947,10 @@
 /* }}} */
 
 BEGIN_EXTERN_C()
-ZEND_API void zend_message_dispatcher(long message, void *data) /* {{{ */
+ZEND_API void zend_message_dispatcher(long message, void *data TSRMLS_DC) /* 
{{{ */
 {
if (zend_message_dispatcher_p) {
-   zend_message_dispatcher_p(message, data);
+   zend_message_dispatcher_p(message, data TSRMLS_CC);
}
 }
 /* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.293.2.11.2.9.2.27r2=1.293.2.11.2.9.2.28diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.293.2.11.2.9.2.27 
ZendEngine2/zend.h:1.293.2.11.2.9.2.28
--- ZendEngine2/zend.h:1.293.2.11.2.9.2.27  Tue Aug 12 17:20:23 2008
+++ ZendEngine2/zend.h  Fri Aug 15 19:47:23 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend.h,v 1.293.2.11.2.9.2.27 2008/08/12 17:20:23 felipe Exp $ */
+/* $Id: zend.h,v 1.293.2.11.2.9.2.28 2008/08/15 19:47:23 felipe Exp $ */
 
 #ifndef ZEND_H
 #define ZEND_H
@@ -469,8 +469,8 @@
void (*error_function)(int type, const char *error_filename, const uint 
error_lineno, const char *format, va_list args) 
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0);
int (*printf_function)(const char *format, ...) 
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2);
int (*write_function)(const char *str, uint str_length);
-   FILE *(*fopen_function)(const char *filename, char **opened_path);
-   void (*message_handler)(long message, void *data);
+   FILE *(*fopen_function)(const char *filename, char **opened_path 
TSRMLS_DC);
+   void (*message_handler)(long message,

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3/libsqlite sqlite3.c

pajoye  Fri Aug 15 19:56:29 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/sqlite3/libsqlite  sqlite3.c 
  Log:
  - attempt to fix unexpected EOF on line 391/6
  http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.c
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.4 
php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.5
--- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.4 Wed Aug  6 14:22:04 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3.c Fri Aug 15 19:56:06 2008
@@ -41,7 +41,7 @@
 *
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -70,7 +70,7 @@
 ** 
 ** This file defines various limits of what SQLite can process.
 **
-** @(#) $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 
 /*
@@ -387,16 +387,12 @@
 ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
 ** the default.
 */
-#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\
-defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\
-defined(SQLITE_POW2_MEMORY_SIZE)1
+#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+ 
defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+ 
defined(SQLITE_POW2_MEMORY_SIZE)1
 # error At most one of the following compile-time configuration options\
  is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\
  SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE
 #endif
-#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\
-defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\
-defined(SQLITE_POW2_MEMORY_SIZE)==0
+#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+ 
defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+ 
defined(SQLITE_POW2_MEMORY_SIZE)==0
 # define SQLITE_SYSTEM_MALLOC 1
 #endif
 
@@ -474,7 +470,7 @@
 ** the version number) and changes its name to sqlite3.h as
 ** part of the build process.
 **
-** @(#) $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -6740,7 +6736,7 @@
 ** This is the header file for the generic hash-table implemenation
 ** used in SQLite.
 **
-** $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 #ifndef _SQLITE_HASH_H_
 #define _SQLITE_HASH_H_
@@ -7265,7 +7261,7 @@
 ** subsystem.  See comments in the source code for a detailed description
 ** of what each interface routine does.
 **
-** @(#) $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 #ifndef _BTREE_H_
 #define _BTREE_H_
@@ -7491,7 +7487,7 @@
 ** or VDBE.  The VDBE implements an abstract machine that runs a
 ** simple program to access and modify the underlying database.
 **
-** $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 #ifndef _SQLITE_VDBE_H_
 #define _SQLITE_VDBE_H_
@@ -7880,7 +7876,7 @@
 ** subsystem.  The page cache subsystem reads and writes a file a page
 ** at a time and provides a journal for rollback.
 **
-** @(#) $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 
 #ifndef _PAGER_H_
@@ -8034,7 +8030,7 @@
 ** This header file is #include-ed by sqliteInt.h and thus ends up
 ** being included by every source file.
 **
-** $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 #ifndef _SQLITE_OS_H_
 #define _SQLITE_OS_H_
@@ -8316,7 +8312,7 @@
 ** Source files should #include the sqliteInt.h file and let that file
 ** include this one indirectly.
 **
-** $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 
 
@@ -10271,7 +10267,7 @@
 **
 ** This file contains definitions of global variables and contants.
 **
-** $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 
 
@@ -10351,7 +10347,7 @@
 ** This module implements the sqlite3_status() interface and related
 ** functionality.
 **
-** $Id: sqlite3.c,v 1.1.2.4 2008/08/06 14:22:04 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.5 2008/08/15 19:56:06 pajoye Exp $
 */
 
 /*
@@ -10467,7 +10463,7 @@
 ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: sqlite3.c,v 1.1.2.4 2008/08/06

[PHP-CVS] cvs: php-src /ext/pdo_pgsql pgsql_statement.c /ext/shmop shmop.c /ext/zip php_zip.c

felipe  Fri Aug 15 19:57:24 2008 UTC

  Modified files:  
/php-src/ext/pdo_pgsql  pgsql_statement.c 
/php-src/ext/shmop  shmop.c 
/php-src/ext/zipphp_zip.c 
  Log:
  - Removed unused variables
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.47r2=1.48diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.47 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.48
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.47Tue Feb 26 00:14:25 2008
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Fri Aug 15 19:57:24 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.47 2008/02/26 00:14:25 iliaa Exp $ */
+/* $Id: pgsql_statement.c,v 1.48 2008/08/15 19:57:24 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -51,10 +51,6 @@
 
 #if HAVE_PQPREPARE
if (S-stmt_name) {
-   pdo_pgsql_db_handle *H = S-H;
-   char *q = NULL;
-   PGresult *res;
-
efree(S-stmt_name);
S-stmt_name = NULL;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.43r2=1.44diff_format=u
Index: php-src/ext/shmop/shmop.c
diff -u php-src/ext/shmop/shmop.c:1.43 php-src/ext/shmop/shmop.c:1.44
--- php-src/ext/shmop/shmop.c:1.43  Thu Jul  3 12:21:25 2008
+++ php-src/ext/shmop/shmop.c   Fri Aug 15 19:57:24 2008
@@ -16,7 +16,7 @@
|  Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
  */
-/* $Id: shmop.c,v 1.43 2008/07/03 12:21:25 felipe Exp $ */
+/* $Id: shmop.c,v 1.44 2008/08/15 19:57:24 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -267,7 +267,6 @@
int type;
char *startaddr;
int bytes;
-   char *return_string;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, lll, shmid, 
start, count) == FAILURE) {
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.60r2=1.61diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.60 php-src/ext/zip/php_zip.c:1.61
--- php-src/ext/zip/php_zip.c:1.60  Fri Aug  8 18:13:55 2008
+++ php-src/ext/zip/php_zip.c   Fri Aug 15 19:57:24 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_zip.c,v 1.60 2008/08/08 18:13:55 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.61 2008/08/15 19:57:24 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1734,8 +1734,6 @@
long flags = 0;
struct zip_stat sb;
 
-   int res = 0;
-
if (!this) {
RETURN_FALSE;
}
@@ -2645,7 +2643,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.60 
2008/08/08 18:13:55 pajoye Exp $);
+   php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.61 
2008/08/15 19:57:24 felipe Exp $);
php_info_print_table_row(2, Zip version, PHP_ZIP_VERSION_STRING);
php_info_print_table_row(2, Libzip version, 0.9.0);
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h

2008-08-15 Thread Marcus Boerger

Hello Jani,

  hu? First there was the clean and the fix would have been to clean the
correct file. Though the fix you did was fine as well. All I did was
reminding about the clean section. Second, and that was the only other
thing I commented on, was this one. And, well, ignore my ignorance, but
because we have a bunch of bundled libs and because we have a ton of wrong
include statements, including config.h is not alwas the correct one. I hate
to say it but we either need to drop them and only include php.n or the
php_config.h or fix the build system to generate correct includes and
prevent from it from pulling in the wrong config.h or we could not do
anything and ignore that there is a problem.

Anyway, in case you feel personally aussaulted, sorry.

marcus

Friday, August 15, 2008, 6:49:08 PM, you wrote:

 You don't really need to comment about everything, do you?
 Please get your facts correct first.

 --Jani


 Marcus Boerger [EMAIL PROTECTED] kirjoitti: 
 Hello Jani,
 
   the real fix actually is to drop all #include config.h, because php needs
 to have php_config.h and not config.h as first file.
 
 marcus
 
 Friday, August 15, 2008, 6:37:24 PM, you wrote:
 
  Not enough info - bogus.
 
  FYI: Just tested to be sure. Doing phpize build now fails. Works when 
  reverted.
  (reverted btw..)
 
  I say again: Fix the REAL bugs, not symptoms of the real bugs..
 
  --Jani
 
 
 
  Pierre Joye [EMAIL PROTECTED] kirjoitti: 
  On Fri, Aug 15, 2008 at 6:30 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
   Pierre Joye [EMAIL PROTECTED] kirjoitti:
  
   On Fri, Aug 15, 2008 at 6:00 PM, Jani Taskinen [EMAIL PROTECTED]
   wrote:
Can you count to 2 ?? It's easy: 1, 2.
Now, count how many levels it's to where the config.h would be if 
you do
a
phpize build:
  
   Sorry, I can't count to 2 :)
  
   Should it not be in path anyway?
  
   It was correct as it was.
  
ext/bcmath/libbcmath/src/bcmath.h
   
Revert or I will and fix the correct bug.
  
   It is fixed with this commit, my comment may be wrong about ext/.
  
   WHAT was fixed? It worked fine before you started messing around, what
   EXACTLY did you fix with this change?
  
  config.h not found, what else can be fixed? :)
  
  
  -- 
  Pierre
  http://blog.thepimp.net | http://www.libgd.org
  
 
 
 
 
 
 Best regards,
  Marcus
 
 
 -- 
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php
 
 





Best regards,
 Marcus


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /main main.c ZendEngine2 zend.c zend.h zend_alloc.c zend_alloc.h zend_execute.c zend_gc.c zend_gc.h zend_language_scanner.c zend_language_scanner.l zend_operators.c

hi Felipe!

2008/8/15 Felipe Pena [EMAIL PROTECTED]:
 felipe  Fri Aug 15 19:47:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/ZendEngine2zend.c zend.h zend_alloc.c zend_alloc.h zend_execute.c
zend_gc.c zend_gc.h zend_language_scanner.c
zend_language_scanner.l zend_operators.c zend_stream.c
zend_vm_def.h zend_vm_execute.h
/php-src/main   main.c
  Log:
  - MFH: Removed some TSRMLS_FETCH()s

The following error:

ext\xmlrpc\xmlrpc-epi-php.c(284) : error C2065: 'tsrm_ls' : undeclared
identifier

may be related to this change: FREE_ZVAL macro.

Can you check it please?

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c

pajoye  Fri Aug 15 21:03:34 2008 UTC

  Modified files:  
/php-src/ext/sqlite3/libsqlite  sqlite3.c 
  Log:
  - MFB: fix unexpected EOF on line 391
  http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.c
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.6 
php-src/ext/sqlite3/libsqlite/sqlite3.c:1.7
--- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.6 Wed Aug  6 14:22:34 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3.c Fri Aug 15 21:03:32 2008
@@ -41,7 +41,7 @@
 *
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -70,7 +70,7 @@
 ** 
 ** This file defines various limits of what SQLite can process.
 **
-** @(#) $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 
 /*
@@ -387,16 +387,12 @@
 ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
 ** the default.
 */
-#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\
-defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\
-defined(SQLITE_POW2_MEMORY_SIZE)1
+#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+ 
defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+ 
defined(SQLITE_POW2_MEMORY_SIZE)1
 # error At most one of the following compile-time configuration options\
  is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\
  SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE
 #endif
-#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\
-defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\
-defined(SQLITE_POW2_MEMORY_SIZE)==0
+#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+ 
defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+ 
defined(SQLITE_POW2_MEMORY_SIZE)==0
 # define SQLITE_SYSTEM_MALLOC 1
 #endif
 
@@ -474,7 +470,7 @@
 ** the version number) and changes its name to sqlite3.h as
 ** part of the build process.
 **
-** @(#) $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -6740,7 +6736,7 @@
 ** This is the header file for the generic hash-table implemenation
 ** used in SQLite.
 **
-** $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 #ifndef _SQLITE_HASH_H_
 #define _SQLITE_HASH_H_
@@ -7265,7 +7261,7 @@
 ** subsystem.  See comments in the source code for a detailed description
 ** of what each interface routine does.
 **
-** @(#) $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 #ifndef _BTREE_H_
 #define _BTREE_H_
@@ -7491,7 +7487,7 @@
 ** or VDBE.  The VDBE implements an abstract machine that runs a
 ** simple program to access and modify the underlying database.
 **
-** $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 #ifndef _SQLITE_VDBE_H_
 #define _SQLITE_VDBE_H_
@@ -7880,7 +7876,7 @@
 ** subsystem.  The page cache subsystem reads and writes a file a page
 ** at a time and provides a journal for rollback.
 **
-** @(#) $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 
 #ifndef _PAGER_H_
@@ -8034,7 +8030,7 @@
 ** This header file is #include-ed by sqliteInt.h and thus ends up
 ** being included by every source file.
 **
-** $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 #ifndef _SQLITE_OS_H_
 #define _SQLITE_OS_H_
@@ -8316,7 +8312,7 @@
 ** Source files should #include the sqliteInt.h file and let that file
 ** include this one indirectly.
 **
-** $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 
 
@@ -10271,7 +10267,7 @@
 **
 ** This file contains definitions of global variables and contants.
 **
-** $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 
 
@@ -10351,7 +10347,7 @@
 ** This module implements the sqlite3_status() interface and related
 ** functionality.
 **
-** $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 */
 
 /*
@@ -10467,7 +10463,7 @@
 ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: sqlite3.c,v 1.6 2008/08/06 14:22:34 scottmac Exp $
+** $Id: sqlite3.c,v 1.7 2008/08/15 21:03:32 pajoye Exp $
 **
 ** SQLite processes all times and dates as Julian Day

[PHP-CVS] cvs: php-src /ext/xmlrpc xmlrpc-epi-php.c

felipe  Fri Aug 15 22:13:59 2008 UTC

  Modified files:  
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
  Log:
  - Fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.59r2=1.60diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.59 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.60
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.59Sat Aug  2 04:40:45 2008
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri Aug 15 22:13:58 2008
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.59 2008/08/02 04:40:45 felipe Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.60 2008/08/15 22:13:58 felipe Exp $ */
 
 /**
 * BUGS:   *
@@ -275,7 +275,7 @@
 * startup / shutdown *
 */
 
-static void destroy_server_data(xmlrpc_server_data *server) /* {{{ */
+static void destroy_server_data(xmlrpc_server_data *server TSRMLS_DC) /* {{{ */
 {
if (server) {
XMLRPC_ServerDestroy(server-server_ptr);
@@ -296,7 +296,7 @@
 static void xmlrpc_server_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* 
{{{ */
 {
if (rsrc  rsrc-ptr) {
-   destroy_server_data((xmlrpc_server_data*) rsrc-ptr);
+   destroy_server_data((xmlrpc_server_data*) rsrc-ptr TSRMLS_CC);
}
 }
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/xmlrpc xmlrpc-epi-php.c

felipe  Fri Aug 15 22:15:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
  Log:
  - MFH: Fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.6.2.11r2=1.39.2.5.2.6.2.12diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.11 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.12
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.11   Sat Aug  2 
04:46:07 2008
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri Aug 15 22:15:46 2008
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.11 2008/08/02 04:46:07 felipe Exp $ 
*/
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.12 2008/08/15 22:15:46 felipe Exp $ 
*/
 
 /**
 * BUGS:   *
@@ -275,7 +275,7 @@
 * startup / shutdown *
 */
 
-static void destroy_server_data(xmlrpc_server_data *server)
+static void destroy_server_data(xmlrpc_server_data *server TSRMLS_DC)
 {
if (server) {
XMLRPC_ServerDestroy(server-server_ptr);
@@ -295,7 +295,7 @@
 static void xmlrpc_server_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
if (rsrc  rsrc-ptr) {
-   destroy_server_data((xmlrpc_server_data*) rsrc-ptr);
+   destroy_server_data((xmlrpc_server_data*) rsrc-ptr TSRMLS_CC);
}
 }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /main main.c ZendEngine2 zend.c zend.h zend_alloc.c zend_alloc.h zend_execute.c zend_gc.c zend_gc.h zend_language_scanner.c zend_language_scanner.l zend_operators.c