[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Sep 5 01:30:53 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2443r2=1.2444diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2443 php-src/ChangeLog:1.2444 --- php-src/ChangeLog:1.2443Mon Sep 4 01:30:57 2006 +++ php-src/ChangeLog Tue Sep 5 01:30:52 2006 @@ -1,3 +1,61 @@ +2006-09-04 Nuno Lopes [EMAIL PROTECTED] + +* ext/readline/readline.c + ext/standard/filters.c: + MFB: fix gcc warning + +* (PHP_5_2) + ext/readline/readline.c + ext/standard/filters.c: + fix gcc warning + +2006-09-04 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/curl/multi.c: + MFB: Fixed bug #38693 (curl_multi_add_handle() set curl handle to null). + +* (PHP_5_2) + NEWS + ext/curl/multi.c: + Fixed bug #38693 (curl_multi_add_handle() set curl handle to null). + +2006-09-04 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h: + Removed unreachable handlers + +* (PHP_5_2) + NEWS + ext/soap/soap.c + ext/soap/soap.c: + Fixed bug #38700 (SoapClient::__getTypes never returns) + +2006-09-04 Michael Wallner [EMAIL PROTECTED] + +* ext/zlib/zlib.c + ext/zlib/tests/ob_004.phpt + ext/zlib/tests/ob_005.phpt: + - fix issues with ob_start(ob_gzhandler) + - add tests + +2006-09-04 Dmitry Stogov [EMAIL PROTECTED] + +* TSRM/tsrm_virtual_cwd.h + TSRM/tsrm_virtual_cwd.h + main/php.h + main/php.h: + Fixed VIRTUAL_DIR inconsistency + +* sapi/cgi/fastcgi.c: + Fixed signed/unsigned mismatch warning + +* (PHP_5_2) + sapi/cgi/fastcgi.c: + Fixed signed/unsigned mismatch warning. + 2006-09-03 Ilia Alshanetsky [EMAIL PROTECTED] * main/streams/streams.c:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Sep 5 01:30:56 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.975r2=1.976diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.975 ZendEngine2/ChangeLog:1.976 --- ZendEngine2/ChangeLog:1.975 Fri Sep 1 01:30:54 2006 +++ ZendEngine2/ChangeLog Tue Sep 5 01:30:56 2006 @@ -1,3 +1,11 @@ +2006-09-04 Dmitry Stogov [EMAIL PROTECTED] + +* zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h: + Removed unreachable handlers + 2006-08-31 Dmitry Stogov [EMAIL PROTECTED] * zend_alloc.c: @@ -15053,7 +15061,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.975 2006/09/01 01:30:54 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.976 2006/09/05 01:30:56 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -16777,7 +16785,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.975 2006/09/01 01:30:54 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.976 2006/09/05 01:30:56 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi fastcgi.c
dmitry Mon Sep 4 07:26:48 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi fastcgi.c
Log:
Fixed signed/unsigned mismatch warning.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.7r2=1.4.2.13.2.8diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.7
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.8
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.7 Sun Aug 20 18:24:11 2006
+++ php-src/sapi/cgi/fastcgi.c Mon Sep 4 07:26:48 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.7 2006/08/20 18:24:11 iliaa Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.8 2006/09/04 07:26:48 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -394,7 +394,7 @@
{
char buf[128];
char *tmp = buf;
- size_t buf_size = sizeof(buf);
+ int buf_size = sizeof(buf);
int name_len, val_len;
char *s;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c
dmitry Mon Sep 4 07:27:50 2006 UTC
Modified files:
/php-src/sapi/cgi fastcgi.c
Log:
Fixed signed/unsigned mismatch warning
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.21r2=1.22diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.21 php-src/sapi/cgi/fastcgi.c:1.22
--- php-src/sapi/cgi/fastcgi.c:1.21 Sun Aug 20 17:44:06 2006
+++ php-src/sapi/cgi/fastcgi.c Mon Sep 4 07:27:50 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.21 2006/08/20 17:44:06 sas Exp $ */
+/* $Id: fastcgi.c,v 1.22 2006/09/04 07:27:50 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -394,7 +394,7 @@
{
char buf[128];
char *tmp = buf;
- size_t buf_size = sizeof(buf);
+ int buf_size = sizeof(buf);
int name_len, val_len;
char *s;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib zlib.c /ext/zlib/tests ob_004.phpt ob_005.phpt
mikeMon Sep 4 10:31:12 2006 UTC
Added files:
/php-src/ext/zlib/tests ob_004.phpt ob_005.phpt
Modified files:
/php-src/ext/zlib zlib.c
Log:
- fix issues with ob_start(ob_gzhandler)
- add tests
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.209r2=1.210diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.209 php-src/ext/zlib/zlib.c:1.210
--- php-src/ext/zlib/zlib.c:1.209 Thu Aug 31 13:51:35 2006
+++ php-src/ext/zlib/zlib.c Mon Sep 4 10:31:11 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.209 2006/08/31 13:51:35 mike Exp $ */
+/* $Id: zlib.c,v 1.210 2006/09/04 10:31:11 mike Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -105,10 +105,11 @@
{
php_output_handler *h = NULL;
- if (php_zlib_output_encoding(TSRMLS_C)) {
- if ((h = php_output_handler_create_internal(handler_name,
php_zlib_output_handler, chunk_size, flags TSRMLS_CC))) {
- php_output_handler_set_context(h, ecalloc(1,
sizeof(php_zlib_context)), php_zlib_output_handler_dtor TSRMLS_CC);
- }
+ if (!ZLIBG(output_compression)) {
+ ZLIBG(output_compression) = chunk_size ? chunk_size :
PHP_OUTPUT_HANDLER_DEFAULT_SIZE;
+ }
+ if ((h = php_output_handler_create_internal(handler_name,
php_zlib_output_handler, chunk_size, flags TSRMLS_CC))) {
+ php_output_handler_set_context(h, ecalloc(1,
sizeof(php_zlib_context)), php_zlib_output_handler_dtor TSRMLS_CC);
}
return h;
@@ -119,7 +120,7 @@
int php_zlib_output_handler(void **handler_context, php_output_context
*output_context)
{
php_zlib_context *ctx = *(php_zlib_context **) handler_context;
- int flags = Z_SYNC_FLUSH, status;
+ int flags = Z_SYNC_FLUSH;
PHP_OUTPUT_TSRMLS(output_context);
if (!php_zlib_output_encoding(TSRMLS_C)) {
@@ -180,7 +181,7 @@
flags = Z_FULL_FLUSH;
}
- switch ((status = deflate(ctx-Z, flags))) {
+ switch (deflate(ctx-Z, flags)) {
case Z_OK:
if (flags == Z_FINISH) {
deflateEnd(ctx-Z);
@@ -629,7 +630,7 @@
{
int status, int_value;
char *ini_value;
-
+
if (new_value == NULL) {
return FAILURE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/ob_004.phpt?view=markuprev=1.1
Index: php-src/ext/zlib/tests/ob_004.phpt
+++ php-src/ext/zlib/tests/ob_004.phpt
--TEST--
ob_gzhandler
--SKIPIF--
?php
if (!extension_loaded(zlib)) die(skip need ext/zlib);
if (false === stristr(PHP_SAPI, cgi)) die(skip need sapi/cgi);
?
--INI--
zlib.output_compression=0
--ENV--
HTTP_ACCEPT_ENCODING=gzip
--FILE--
?php
ob_start(ob_gzhandler);
echo hi\n;
?
--EXPECTF--
%s
Content-Encoding: gzip
Vary: Accept-Encoding
%s
%s
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/ob_005.phpt?view=markuprev=1.1
Index: php-src/ext/zlib/tests/ob_005.phpt
+++ php-src/ext/zlib/tests/ob_005.phpt
--TEST--
ob_gzhandler
--SKIPIF--
?php
if (!extension_loaded(zlib)) die(skip need ext/zlib);
if (false === stristr(PHP_SAPI, cgi)) die(skip need sapi/cgi);
?
--INI--
zlib.output_compression=0
--ENV--
HTTP_ACCEPT_ENCODING=gzip
--FILE--
?php
ob_start(ob_gzhandler);
ini_set(zlib.output_compression, 0);
echo hi\n;
?
--EXPECTF--
%shi
--
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/soap soap.c
dmitry Mon Sep 4 10:52:34 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #38700 (SoapClient::__getTypes never returns)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.232r2=1.2027.2.547.2.233diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.232 php-src/NEWS:1.2027.2.547.2.233
--- php-src/NEWS:1.2027.2.547.2.232 Sun Sep 3 16:32:27 2006
+++ php-src/NEWSMon Sep 4 10:52:34 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? Sep 2006, PHP 5.2.0RC4
+- Fixed bug #38700 (SoapClient::__getTypes never returns). (Dmitry)
- Fixed bug #38661 (mixed-case URL breaks url-wrappers). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.9r2=1.156.2.28.2.10diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.9
php-src/ext/soap/soap.c:1.156.2.28.2.10
--- php-src/ext/soap/soap.c:1.156.2.28.2.9 Thu Aug 24 06:18:30 2006
+++ php-src/ext/soap/soap.c Mon Sep 4 10:52:34 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.9 2006/08/24 06:18:30 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.10 2006/09/04 10:52:34 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4543,6 +4543,7 @@
type-kind == XSD_TYPEKIND_EXTENSION)
type-encode) {
encodePtr enc = type-encode;
while (enc enc-details.sdl_type
+ enc !=
enc-details.sdl_type-encode
enc-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
enc-details.sdl_type-kind !=
XSD_TYPEKIND_LIST
enc-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c
dmitry Mon Sep 4 10:52:45 2006 UTC
Modified files:
/php-src/ext/soap soap.c
Log:
Fixed bug #38700 (SoapClient::__getTypes never returns)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.205r2=1.206diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.205 php-src/ext/soap/soap.c:1.206
--- php-src/ext/soap/soap.c:1.205 Thu Aug 24 06:18:45 2006
+++ php-src/ext/soap/soap.c Mon Sep 4 10:52:44 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.205 2006/08/24 06:18:45 dmitry Exp $ */
+/* $Id: soap.c,v 1.206 2006/09/04 10:52:44 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -5034,6 +5034,7 @@
type-kind == XSD_TYPEKIND_EXTENSION)
type-encode) {
encodePtr enc = type-encode;
while (enc enc-details.sdl_type
+ enc !=
enc-details.sdl_type-encode
enc-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
enc-details.sdl_type-kind !=
XSD_TYPEKIND_LIST
enc-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
--
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 multi.c
iliaa Mon Sep 4 16:31:28 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/curl multi.c
Log:
Fixed bug #38693 (curl_multi_add_handle() set curl handle to null).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.233r2=1.2027.2.547.2.234diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.233 php-src/NEWS:1.2027.2.547.2.234
--- php-src/NEWS:1.2027.2.547.2.233 Mon Sep 4 10:52:34 2006
+++ php-src/NEWSMon Sep 4 16:31:27 2006
@@ -1,7 +1,8 @@
-PHPNEWS
+'PHP
NEWS
|||
?? Sep 2006, PHP 5.2.0RC4
- Fixed bug #38700 (SoapClient::__getTypes never returns). (Dmitry)
+- Fixed bug #38693 (curl_multi_add_handle() set curl handle to null). (Ilia)
- Fixed bug #38661 (mixed-case URL breaks url-wrappers). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/multi.c?r1=1.19.2.3.2.2r2=1.19.2.3.2.3diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.19.2.3.2.2
php-src/ext/curl/multi.c:1.19.2.3.2.3
--- php-src/ext/curl/multi.c:1.19.2.3.2.2 Sun Jun 11 01:42:16 2006
+++ php-src/ext/curl/multi.cMon Sep 4 16:31:27 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: multi.c,v 1.19.2.3.2.2 2006/06/11 01:42:16 bjori Exp $ */
+/* $Id: multi.c,v 1.19.2.3.2.3 2006/09/04 16:31:27 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -62,7 +62,7 @@
mh = ecalloc(1, sizeof(php_curlm));
mh-multi = curl_multi_init();
- zend_llist_init(mh-easyh, sizeof(zval *), (llist_dtor_func_t)
ZVAL_PTR_DTOR, 0);
+ zend_llist_init(mh-easyh, sizeof(zval *), (llist_dtor_func_t) NULL,
0);
ZEND_REGISTER_RESOURCE(return_value, mh, le_curl_multi_handle);
}
@@ -76,6 +76,7 @@
zval *z_ch;
php_curlm *mh;
php_curl *ch;
+ zval tmp_val;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rr, z_mh,
z_ch) == FAILURE) {
return;
@@ -87,11 +88,11 @@
_php_curl_cleanup_handle(ch);
ch-uses++;
- /* we want to create a copy of this zval that we store in the
multihandle
- structure element easyh - so we separate it from the original
- input zval to this function using SEPARATE_ZVAL */
- SEPARATE_ZVAL( z_ch );
- zend_llist_add_element(mh-easyh, z_ch);
+ /* we want to create a copy of this zval that we store in the
multihandle structure element easyh */
+ tmp_val = *z_ch;
+ zval_copy_ctor(tmp_val);
+
+ zend_llist_add_element(mh-easyh, tmp_val);
RETURN_LONG((long) curl_multi_add_handle(mh-multi, ch-cp));
}
@@ -99,11 +100,11 @@
/* Used internally as comparison routine passed to zend_list_del_element */
-static int curl_compare_resources( zval **z1, zval **z2 )
+static int curl_compare_resources( zval *z1, zval **z2 )
{
- return (Z_TYPE_PP( z1 ) == Z_TYPE_PP( z2 )
-Z_TYPE_PP( z1 ) == IS_RESOURCE
-Z_LVAL_PP( z1 ) == Z_LVAL_PP( z2 ) );
+ return (Z_TYPE_P( z1 ) == Z_TYPE_PP( z2 )
+Z_TYPE_P( z1 ) == IS_RESOURCE
+Z_LVAL_P( z1 ) == Z_LVAL_PP( z2 ) );
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl multi.c
iliaa Mon Sep 4 16:31:38 2006 UTC
Modified files:
/php-src/ext/curl multi.c
Log:
MFB: Fixed bug #38693 (curl_multi_add_handle() set curl handle to null).
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/multi.c?r1=1.24r2=1.25diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.24 php-src/ext/curl/multi.c:1.25
--- php-src/ext/curl/multi.c:1.24 Sat Jun 10 22:59:40 2006
+++ php-src/ext/curl/multi.cMon Sep 4 16:31:38 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: multi.c,v 1.24 2006/06/10 22:59:40 bjori Exp $ */
+/* $Id: multi.c,v 1.25 2006/09/04 16:31:38 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -62,7 +62,7 @@
mh = ecalloc(1, sizeof(php_curlm));
mh-multi = curl_multi_init();
- zend_llist_init(mh-easyh, sizeof(zval *), (llist_dtor_func_t)
ZVAL_PTR_DTOR, 0);
+ zend_llist_init(mh-easyh, sizeof(zval *), (llist_dtor_func_t) NULL,
0);
ZEND_REGISTER_RESOURCE(return_value, mh, le_curl_multi_handle);
}
@@ -76,6 +76,7 @@
zval *z_ch;
php_curlm *mh;
php_curl *ch;
+ zval tmp_val;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rr, z_mh,
z_ch) == FAILURE) {
return;
@@ -87,11 +88,11 @@
_php_curl_cleanup_handle(ch);
ch-uses++;
- /* we want to create a copy of this zval that we store in the
multihandle
- structure element easyh - so we separate it from the original
- input zval to this function using SEPARATE_ZVAL */
- SEPARATE_ZVAL( z_ch );
- zend_llist_add_element(mh-easyh, z_ch);
+ /* we want to create a copy of this zval that we store in the
multihandle structure element easyh */
+ tmp_val = *z_ch;
+ zval_copy_ctor(tmp_val);
+
+ zend_llist_add_element(mh-easyh, tmp_val);
RETURN_LONG((long) curl_multi_add_handle(mh-multi, ch-cp));
}
@@ -99,11 +100,11 @@
/* Used internally as comparison routine passed to zend_list_del_element */
-static int curl_compare_resources( zval **z1, zval **z2 )
+static int curl_compare_resources( zval *z1, zval **z2 )
{
- return (Z_TYPE_PP( z1 ) == Z_TYPE_PP( z2 )
-Z_TYPE_PP( z1 ) == IS_RESOURCE
-Z_LVAL_PP( z1 ) == Z_LVAL_PP( z2 ) );
+ return (Z_TYPE_P( z1 ) == Z_TYPE_PP( z2 )
+Z_TYPE_P( z1 ) == IS_RESOURCE
+Z_LVAL_P( z1 ) == Z_LVAL_PP( z2 ) );
}
--
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/readline readline.c
nlopess Mon Sep 4 18:59:01 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/readline readline.c
Log:
fix gcc warning
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3r2=1.42.2.3.2.1diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3
php-src/ext/readline/readline.c:1.42.2.3.2.1
--- php-src/ext/readline/readline.c:1.42.2.3Sun Jan 1 12:50:12 2006
+++ php-src/ext/readline/readline.c Mon Sep 4 18:59:01 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: readline.c,v 1.42.2.3 2006/01/01 12:50:12 sniper Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.1 2006/09/04 18:59:01 nlopess Exp $ */
/* {{{ includes prototypes */
@@ -363,7 +363,7 @@
/* {{{ proto bool readline_completion_function(string funcname)
Readline completion function? */
-static char *_readline_command_generator(char *text,int state)
+static char *_readline_command_generator(const char *text, int state)
{
HashTable *myht = Z_ARRVAL(_readline_array);
zval **entry;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/readline readline.c
nlopess Mon Sep 4 19:00:12 2006 UTC
Modified files:
/php-src/ext/readline readline.c
Log:
MFB: fix gcc warning
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.46r2=1.47diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.46
php-src/ext/readline/readline.c:1.47
--- php-src/ext/readline/readline.c:1.46Sun Jan 1 13:09:53 2006
+++ php-src/ext/readline/readline.c Mon Sep 4 19:00:12 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: readline.c,v 1.46 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: readline.c,v 1.47 2006/09/04 19:00:12 nlopess Exp $ */
/* {{{ includes prototypes */
@@ -363,7 +363,7 @@
/* {{{ proto bool readline_completion_function(string funcname)
Readline completion function? */
-static char *_readline_command_generator(char *text,int state)
+static char *_readline_command_generator(const char *text, int state)
{
HashTable *myht = Z_ARRVAL(_readline_array);
zval **entry;
--
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 filters.c
nlopess Mon Sep 4 19:15:00 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard filters.c
Log:
fix gcc warning
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filters.c?r1=1.44.2.6.2.2r2=1.44.2.6.2.3diff_format=u
Index: php-src/ext/standard/filters.c
diff -u php-src/ext/standard/filters.c:1.44.2.6.2.2
php-src/ext/standard/filters.c:1.44.2.6.2.3
--- php-src/ext/standard/filters.c:1.44.2.6.2.2 Thu Jun 1 22:42:22 2006
+++ php-src/ext/standard/filters.c Mon Sep 4 19:14:59 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: filters.c,v 1.44.2.6.2.2 2006/06/01 22:42:22 iliaa Exp $ */
+/* $Id: filters.c,v 1.44.2.6.2.3 2006/09/04 19:14:59 nlopess Exp $ */
#include php.h
#include php_globals.h
@@ -1880,7 +1880,7 @@
/* Create this filter */
data = pecalloc(1, sizeof(php_consumed_filter_data), persistent);
if (!data) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%ld bytes., sizeof(php_consumed_filter_data));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zd bytes., sizeof(php_consumed_filter_data));
return NULL;
}
data-persistent = persistent;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard filters.c
nlopess Mon Sep 4 19:16:21 2006 UTC
Modified files:
/php-src/ext/standard filters.c
Log:
MFB: fix gcc warning
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filters.c?r1=1.57r2=1.58diff_format=u
Index: php-src/ext/standard/filters.c
diff -u php-src/ext/standard/filters.c:1.57 php-src/ext/standard/filters.c:1.58
--- php-src/ext/standard/filters.c:1.57 Thu Jun 1 22:42:53 2006
+++ php-src/ext/standard/filters.c Mon Sep 4 19:16:21 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: filters.c,v 1.57 2006/06/01 22:42:53 iliaa Exp $ */
+/* $Id: filters.c,v 1.58 2006/09/04 19:16:21 nlopess Exp $ */
#include php.h
#include php_globals.h
@@ -1961,7 +1961,7 @@
/* Create this filter */
data = pecalloc(1, sizeof(php_consumed_filter_data), persistent);
if (!data) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%ld bytes., sizeof(php_consumed_filter_data));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zd bytes., sizeof(php_consumed_filter_data));
return NULL;
}
data-persistent = persistent;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
