[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Sep 26 01:30:53 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2464r2=1.2465diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2464 php-src/ChangeLog:1.2465 --- php-src/ChangeLog:1.2464Mon Sep 25 01:31:04 2006 +++ php-src/ChangeLog Tue Sep 26 01:30:53 2006 @@ -1,3 +1,86 @@ +2006-09-25 Hannes Magnusson [EMAIL PROTECTED] + +* ext/soap/soap.c: + Fix arginfoproto + +2006-09-25 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/standard/url.c: + MFB: Fixed bug #38891 (get_headers() do not work with curl-wrappers). + +* (PHP_5_2) + NEWS + ext/standard/url.c: + Fixed bug #38891 (get_headers() do not work with curl-wrappers). + +* main/main.c: + MFB: Fixed bug #38904 (apache2filter changes cwd to /). + +* (PHP_5_2) + NEWS + main/main.c: + Fixed bug #38904 (apache2filter changes cwd to /). + +2006-09-25 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + configure.in: + MFH: change CXXFLAGS along with CFLAGS as there might be C++ code + +* configure.in: + change CXXFLAGS along with CFLAGS as there might be C++ code + +2006-09-25 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/zip/tests/38943.phpt + ext/zip/tests/bug38943.phpt: + - fix test, php6 displays the class + - mv 38943.phpt to bug38943.phpt + +* ext/zip/lib/zip_get_archive_comment.c: + - MFB: #38944, freshly created archive has no comment or cdir + +* (PHP_5_2) + ext/zip/lib/zip_get_archive_comment.c: + - #38944, freshly created archive has no comment or cdir + +2006-09-25 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ext/zip/tests/bug38944.phpt: + add test + +* ext/zip/tests/bug38944.phpt + ext/zip/tests/bug38944.phpt: + + add test + +2006-09-25 Dmitry Stogov [EMAIL PROTECTED] + +* ext/soap/soap.c + ext/soap/soap.c: + Removed warning about unreferenced local variable + +* ext/standard/dns.c + ext/standard/math.c: + ZTS fix + +2006-09-25 Sara Golemon [EMAIL PROTECTED] + +* ext/standard/dns.c: + PHP6 Updates and some very minor feature add in dns_get_record() + +* ext/standard/type.c: + Make settype($var, 'string'); behave like $var = (string)$var; + e.g. switch between (binary) and (unicode) depending on UG(unicode) + +* ext/standard/crc32.c + ext/standard/crypt.c: + Flag a couple more unicode ready functions + +* ext/standard/base64.c: + base64 functions are basicly binary-only ops + 2006-09-24 Pierre-Alain Joye [EMAIL PROTECTED] * ext/zip/tests/38943.phpt
[PHP-CVS] cvs: php-src /ext/standard dns.c math.c
dmitry Mon Sep 25 06:59:02 2006 UTC
Modified files:
/php-src/ext/standard dns.c math.c
Log:
ZTS fix
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.81r2=1.82diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.81 php-src/ext/standard/dns.c:1.82
--- php-src/ext/standard/dns.c:1.81 Mon Sep 25 02:27:24 2006
+++ php-src/ext/standard/dns.c Mon Sep 25 06:59:02 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.81 2006/09/25 02:27:24 pollita Exp $ */
+/* $Id: dns.c,v 1.82 2006/09/25 06:59:02 dmitry Exp $ */
/* {{{ includes */
#include php.h
@@ -370,7 +370,7 @@
#endif
/* {{{ php_parserr */
-static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch,
int store, zval **subarray)
+static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch,
int store, zval **subarray TSRMLS_DC)
{
u_short type, class, dlen;
u_long ttl;
@@ -781,7 +781,7 @@
while (an-- cp cp end) {
zval *retval;
- cp = php_parserr(cp, answer, type_to_fetch,
store_results, retval);
+ cp = php_parserr(cp, answer, type_to_fetch,
store_results, retval TSRMLS_CC);
if (retval != NULL store_results) {
add_next_index_zval(return_value,
retval);
}
@@ -798,7 +798,7 @@
while (ns-- 0 cp cp end) {
zval *retval = NULL;
- cp = php_parserr(cp, answer, DNS_T_ANY, authns !=
NULL, retval);
+ cp = php_parserr(cp, answer, DNS_T_ANY, authns !=
NULL, retval TSRMLS_CC);
if (retval != NULL) {
add_next_index_zval(authns, retval);
}
@@ -810,7 +810,7 @@
while (ar-- 0 cp cp end) {
zval *retval = NULL;
- cp = php_parserr(cp, answer, DNS_T_ANY, 1, retval);
+ cp = php_parserr(cp, answer, DNS_T_ANY, 1, retval
TSRMLS_CC);
if (retval != NULL) {
add_next_index_zval(addtl, retval);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.137r2=1.138diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.137 php-src/ext/standard/math.c:1.138
--- php-src/ext/standard/math.c:1.137 Sun Sep 24 17:59:40 2006
+++ php-src/ext/standard/math.c Mon Sep 25 06:59:02 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.137 2006/09/24 17:59:40 pollita Exp $ */
+/* $Id: math.c,v 1.138 2006/09/25 06:59:02 dmitry Exp $ */
#include php.h
#include php_math.h
@@ -59,7 +59,7 @@
return;
}
- convert_scalar_to_number(value);
+ convert_scalar_to_number(value TSRMLS_CC);
if (Z_TYPE_P(value) == IS_DOUBLE) {
RETURN_DOUBLE(fabs(Z_DVAL_P(value)));
@@ -84,7 +84,7 @@
return;
}
- convert_scalar_to_number(value);
+ convert_scalar_to_number(value TSRMLS_CC);
if (Z_TYPE_P(value) == IS_DOUBLE) {
RETURN_DOUBLE(ceil(Z_DVAL_P(value)));
@@ -106,7 +106,7 @@
return;
}
- convert_scalar_to_number(value);
+ convert_scalar_to_number(value TSRMLS_CC);
if (Z_TYPE_P(value) == IS_DOUBLE) {
RETURN_DOUBLE(floor(Z_DVAL_P(value)));
@@ -130,7 +130,7 @@
return;
}
- convert_scalar_to_number(value);
+ convert_scalar_to_number(value TSRMLS_CC);
switch (Z_TYPE_P(value)) {
case IS_LONG:
--
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/soap soap.c
dmitry Mon Sep 25 08:15:03 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/soap soap.c Log: Removed warning about unreferenced local variable http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.13r2=1.156.2.28.2.14diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.28.2.13 php-src/ext/soap/soap.c:1.156.2.28.2.14 --- php-src/ext/soap/soap.c:1.156.2.28.2.13 Fri Sep 22 13:39:32 2006 +++ php-src/ext/soap/soap.c Mon Sep 25 08:15:03 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: soap.c,v 1.156.2.28.2.13 2006/09/22 13:39:32 dmitry Exp $ */ +/* $Id: soap.c,v 1.156.2.28.2.14 2006/09/25 08:15:03 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2041,7 +2041,9 @@ char buffer[1024]; int buffer_len; zval outbuf, outbuflen; +#ifdef va_copy va_list argcopy; +#endif int old = PG(display_errors); INIT_ZVAL(outbuf); @@ -2088,7 +2090,9 @@ int old = PG(display_errors); int fault = 0; zval fault_obj; +#ifdef va_copy va_list argcopy; +#endif if (error_num == E_USER_ERROR || error_num == E_COMPILE_ERROR || -- 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 25 08:19:06 2006 UTC Modified files: /php-src/ext/soap soap.c Log: Removed warning about unreferenced local variable http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.211r2=1.212diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.211 php-src/ext/soap/soap.c:1.212 --- php-src/ext/soap/soap.c:1.211 Fri Sep 22 13:39:17 2006 +++ php-src/ext/soap/soap.c Mon Sep 25 08:19:06 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: soap.c,v 1.211 2006/09/22 13:39:17 dmitry Exp $ */ +/* $Id: soap.c,v 1.212 2006/09/25 08:19:06 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2368,7 +2368,9 @@ char *buffer; int buffer_len; zval outbuf, outbuflen; +#ifdef va_copy va_list argcopy; +#endif int old = PG(display_errors); INIT_ZVAL(outbuf); @@ -2409,7 +2411,9 @@ int old = PG(display_errors); int fault = 0; zval fault_obj; +#ifdef va_copy va_list argcopy; +#endif if (error_num == E_USER_ERROR || error_num == E_COMPILE_ERROR || -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip/tests bug38944.phpt
tony2001Mon Sep 25 08:44:58 2006 UTC
Added files:
/php-src/ext/zip/tests bug38944.phpt
Log:
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug38944.phpt?view=markuprev=1.1
Index: php-src/ext/zip/tests/bug38944.phpt
+++ php-src/ext/zip/tests/bug38944.phpt
--TEST--
Bug #38944 (newly created ZipArchive segfaults when accessing comment property)
--SKIPIF--
?php if (!extension_loaded(zip)) print skip; ?
--FILE--
?php
$arc_name = dirname(__FILE__)./bug38944.zip;
$foo = new ZipArchive;
$foo-open($arc_name, ZIPARCHIVE::CREATE);;
var_dump($foo-status);
var_dump($foo-statusSys);
var_dump($foo-numFiles);
var_dump($foo-filename);
var_dump($foo-comment);
var_dump($foo);
echo Done\n;
?
--EXPECTF--
int(0)
int(0)
int(0)
string(0)
string(0)
object(ZipArchive)#%d (5) {
[status]=
int(0)
[statusSys]=
int(0)
[numFiles]=
int(0)
[filename]=
string(0)
[comment]=
string(0)
}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip/tests bug38944.phpt
tony2001Mon Sep 25 08:45:08 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/zip/tests bug38944.phpt
Log:
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug38944.phpt?view=markuprev=1.1
Index: php-src/ext/zip/tests/bug38944.phpt
+++ php-src/ext/zip/tests/bug38944.phpt
--TEST--
Bug #38944 (newly created ZipArchive segfaults when accessing comment property)
--SKIPIF--
?php if (!extension_loaded(zip)) print skip; ?
--FILE--
?php
$arc_name = dirname(__FILE__)./bug38944.zip;
$foo = new ZipArchive;
$foo-open($arc_name, ZIPARCHIVE::CREATE);;
var_dump($foo-status);
var_dump($foo-statusSys);
var_dump($foo-numFiles);
var_dump($foo-filename);
var_dump($foo-comment);
var_dump($foo);
echo Done\n;
?
--EXPECTF--
int(0)
int(0)
int(0)
string(0)
string(0)
object(ZipArchive)#%d (5) {
[status]=
int(0)
[statusSys]=
int(0)
[numFiles]=
int(0)
[filename]=
string(0)
[comment]=
string(0)
}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip/lib zip_get_archive_comment.c
pajoye Mon Sep 25 09:09:53 2006 UTC
Modified files:
/php-src/ext/zip/libzip_get_archive_comment.c
Log:
- MFB: #38944, freshly created archive has no comment or cdir
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_get_archive_comment.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/zip/lib/zip_get_archive_comment.c
diff -u php-src/ext/zip/lib/zip_get_archive_comment.c:1.1
php-src/ext/zip/lib/zip_get_archive_comment.c:1.2
--- php-src/ext/zip/lib/zip_get_archive_comment.c:1.1 Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/lib/zip_get_archive_comment.c Mon Sep 25 09:09:53 2006
@@ -45,9 +45,11 @@
{
if ((flags ZIP_FL_UNCHANGED)
|| (za-ch_comment_len == -1)) {
- if (lenp != NULL)
- *lenp = za-cdir-comment_len;
- return za-cdir-comment;
+ if (za-cdir) {
+ if (lenp != NULL)
+ *lenp = za-cdir-comment_len;
+ return za-cdir-comment;
+ }
}
if (lenp != NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip/tests 38943.phpt bug38943.phpt
pajoye Mon Sep 25 09:17:56 2006 UTC
Added files:
/php-src/ext/zip/tests bug38943.phpt
Removed files:
/php-src/ext/zip/tests 38943.phpt
Log:
- fix test, php6 displays the class
- mv 38943.phpt to bug38943.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug38943.phpt?view=markuprev=1.1
Index: php-src/ext/zip/tests/bug38943.phpt
+++ php-src/ext/zip/tests/bug38943.phpt
--TEST--
#38943, properties in extended class cannot be set
--SKIPIF--
?php
/* $Id: bug38943.phpt,v 1.1 2006/09/25 09:17:56 pajoye Exp $ */
if(!extension_loaded('zip')) die('skip');
?
--FILE--
?php
class myZip extends ZipArchive {
private $test = 0;
public $testp = 1;
private $testarray = array();
public function __construct() {
$this-testarray[] = 1;
var_dump($this-testarray);
}
}
$z = new myZip;
$z-testp = foobar;
var_dump($z);
?
--EXPECTF--
array(1) {
[0]=
int(1)
}
object(myZip)#1 (%d) {
[test:myZip:private]=
int(0)
[testp]=
string(6) foobar
[testarray:myZip:private]=
array(1) {
[0]=
int(1)
}
[status]=
int(0)
[statusSys]=
int(0)
[numFiles]=
int(0)
[filename]=
string(0)
[comment]=
string(0)
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
tony2001Mon Sep 25 11:05:29 2006 UTC
Modified files:
/php-srcconfigure.in
Log:
change CXXFLAGS along with CFLAGS as there might be C++ code
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.613r2=1.614diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.613 php-src/configure.in:1.614
--- php-src/configure.in:1.613 Tue Aug 22 13:01:27 2006
+++ php-src/configure.inMon Sep 25 11:05:29 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.613 2006/08/22 13:01:27 tony2001 Exp $ -*- autoconf
-*-
+ ## $Id: configure.in,v 1.614 2006/09/25 11:05:29 tony2001 Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -663,10 +663,12 @@
dnl Remove all optimization flags from CFLAGS
changequote({,})
CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
+ CXXFLAGS=`echo $CXXFLAGS | $SED -e 's/-O[0-9]*//g'`
changequote([,])
dnl Add the special gcc flags
CFLAGS=$CFLAGS -O0 -fprofile-arcs -ftest-coverage
+ CXXFLAGS=$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage
fi
PHP_ARG_ENABLE(debug, whether to include debugging symbols,
@@ -677,8 +679,10 @@
ZEND_DEBUG=yes
changequote({,})
CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
+ CXXFLAGS=`echo $CXXFLAGS | $SED -e 's/-O[0-9]*//g'`
changequote([,])
CFLAGS=$CFLAGS -O0
+ CXXFLAGS=$CXXFLAGS -O0
else
PHP_DEBUG=0
ZEND_DEBUG=no
--
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) / configure.in
tony2001Mon Sep 25 11:05:49 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcconfigure.in
Log:
MFH: change CXXFLAGS along with CFLAGS as there might be C++ code
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.18r2=1.579.2.52.2.19diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.18
php-src/configure.in:1.579.2.52.2.19
--- php-src/configure.in:1.579.2.52.2.18Thu Sep 14 18:04:40 2006
+++ php-src/configure.inMon Sep 25 11:05:49 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.18 2006/09/14 18:04:40 iliaa Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.19 2006/09/25 11:05:49 tony2001 Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -665,10 +665,12 @@
dnl Remove all optimization flags from CFLAGS
changequote({,})
CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
+ CXXFLAGS=`echo $CXXFLAGS | $SED -e 's/-O[0-9]*//g'`
changequote([,])
dnl Add the special gcc flags
CFLAGS=$CFLAGS -O0 -fprofile-arcs -ftest-coverage
+ CXXFLAGS=$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage
fi
PHP_ARG_ENABLE(debug, whether to include debugging symbols,
@@ -679,8 +681,10 @@
ZEND_DEBUG=yes
changequote({,})
CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
+ CXXFLAGS=`echo $CXXFLAGS | $SED -e 's/-O[0-9]*//g'`
changequote([,])
CFLAGS=$CFLAGS -O0
+ CXXFLAGS=$CXXFLAGS -O0
else
PHP_DEBUG=0
ZEND_DEBUG=no
--
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 /main main.c
iliaa Mon Sep 25 14:48:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main main.c
Log:
Fixed bug #38904 (apache2filter changes cwd to /).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.262r2=1.2027.2.547.2.263diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.262 php-src/NEWS:1.2027.2.547.2.263
--- php-src/NEWS:1.2027.2.547.2.262 Sun Sep 24 18:06:37 2006
+++ php-src/NEWSMon Sep 25 14:48:32 2006
@@ -8,6 +8,7 @@
(Dmitry)
- Fixed bug #38941 (imap extension does not compile against new version of
the imap library). (Ilia)
+- Fixed bug #38904 (apache2filter changes cwd to /). (Ilia, bjori)
- Fixed bug #38844 (curl_easy_strerror() is defined only since cURL 7.12.0).
(Tony)
- Fixed bug #38623 (leaks in a tricky code with switch() and exceptions).
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.15r2=1.640.2.23.2.16diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.15 php-src/main/main.c:1.640.2.23.2.16
--- php-src/main/main.c:1.640.2.23.2.15 Mon Sep 18 23:08:36 2006
+++ php-src/main/main.c Mon Sep 25 14:48:33 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.15 2006/09/18 23:08:36 iliaa Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.16 2006/09/25 14:48:33 iliaa Exp $ */
/* {{{ includes
*/
@@ -1704,8 +1704,7 @@
PG(during_request_startup) = 0;
- if (primary_file-type == ZEND_HANDLE_FILENAME
-primary_file-filename) {
+ if ((primary_file-type == ZEND_HANDLE_FILENAME ||
primary_file-type == ZEND_HANDLE_STREAM) primary_file-filename) {
#if HAVE_BROKEN_GETCWD
/* this looks nasty to me */
old_cwd_fd = open(., 0);
--
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
iliaa Mon Sep 25 14:49:34 2006 UTC
Modified files:
/php-src/main main.c
Log:
MFB: Fixed bug #38904 (apache2filter changes cwd to /).
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.702r2=1.703diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.702 php-src/main/main.c:1.703
--- php-src/main/main.c:1.702 Tue Sep 19 10:38:31 2006
+++ php-src/main/main.c Mon Sep 25 14:49:34 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.702 2006/09/19 10:38:31 dmitry Exp $ */
+/* $Id: main.c,v 1.703 2006/09/25 14:49:34 iliaa Exp $ */
/* {{{ includes
*/
@@ -1859,8 +1859,7 @@
PG(during_request_startup) = 0;
- if (primary_file-type == ZEND_HANDLE_FILENAME
-primary_file-filename) {
+ if ((primary_file-type == ZEND_HANDLE_FILENAME ||
primary_file-type == ZEND_HANDLE_STREAM) primary_file-filename) {
#if HAVE_BROKEN_GETCWD
/* this looks nasty to me */
old_cwd_fd = open(., 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard url.c
iliaa Mon Sep 25 16:00:43 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard url.c
Log:
Fixed bug #38891 (get_headers() do not work with curl-wrappers).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.263r2=1.2027.2.547.2.264diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.263 php-src/NEWS:1.2027.2.547.2.264
--- php-src/NEWS:1.2027.2.547.2.263 Mon Sep 25 14:48:32 2006
+++ php-src/NEWSMon Sep 25 16:00:43 2006
@@ -9,6 +9,7 @@
- Fixed bug #38941 (imap extension does not compile against new version of
the imap library). (Ilia)
- Fixed bug #38904 (apache2filter changes cwd to /). (Ilia, bjori)
+- Fixed bug #38891 (get_headers() do not work with curl-wrappers). (Ilia)
- Fixed bug #38844 (curl_easy_strerror() is defined only since cURL 7.12.0).
(Tony)
- Fixed bug #38623 (leaks in a tricky code with switch() and exceptions).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.86.2.5.2.3r2=1.86.2.5.2.4diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.86.2.5.2.3
php-src/ext/standard/url.c:1.86.2.5.2.4
--- php-src/ext/standard/url.c:1.86.2.5.2.3 Sat Sep 23 11:58:58 2006
+++ php-src/ext/standard/url.c Mon Sep 25 16:00:43 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]
|
+--+
*/
-/* $Id: url.c,v 1.86.2.5.2.3 2006/09/23 11:58:58 tony2001 Exp $ */
+/* $Id: url.c,v 1.86.2.5.2.4 2006/09/25 16:00:43 iliaa Exp $ */
#include stdlib.h
#include string.h
@@ -661,8 +661,9 @@
int url_len;
php_stream_context *context;
php_stream *stream;
- zval **prev_val, **hdr = NULL;
+ zval **prev_val, **hdr = NULL, **h;
HashPosition pos;
+ HashTable *hashT;
long format = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l, url,
url_len, format) == FAILURE) {
@@ -676,10 +677,22 @@
array_init(return_value);
- zend_hash_internal_pointer_reset_ex(HASH_OF(stream-wrapperdata), pos);
- while (zend_hash_get_current_data_ex(HASH_OF(stream-wrapperdata),
(void**)hdr, pos) != FAILURE) {
+ /* check for curl-wrappers that provide headers via a special headers
element */
+ if (zend_hash_find(HASH_OF(stream-wrapperdata), headers,
sizeof(headers), (void **)h) != FAILURE Z_TYPE_PP(h) == IS_ARRAY) {
+ /* curl-wrappers don't load data until the 1st read */
+ if (!Z_ARRVAL_PP(h)-nNumOfElements) {
+ php_stream_getc(stream);
+ }
+ zend_hash_find(HASH_OF(stream-wrapperdata), headers,
sizeof(headers), (void **)h);
+ hashT = Z_ARRVAL_PP(h);
+ } else {
+ hashT = HASH_OF(stream-wrapperdata);
+ }
+
+ zend_hash_internal_pointer_reset_ex(hashT, pos);
+ while (zend_hash_get_current_data_ex(hashT, (void**)hdr, pos) !=
FAILURE) {
if (!hdr || Z_TYPE_PP(hdr) != IS_STRING) {
- zend_hash_move_forward_ex(HASH_OF(stream-wrapperdata),
pos);
+ zend_hash_move_forward_ex(hashT, pos);
continue;
}
if (!format) {
@@ -709,7 +722,7 @@
goto no_name_header;
}
}
- zend_hash_move_forward_ex(HASH_OF(stream-wrapperdata), pos);
+ zend_hash_move_forward_ex(hashT, pos);
}
php_stream_close(stream);
--
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
bjori Mon Sep 25 21:16:51 2006 UTC
Modified files:
/php-src/ext/soap soap.c
Log:
Fix arginfoproto
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.212r2=1.213diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.212 php-src/ext/soap/soap.c:1.213
--- php-src/ext/soap/soap.c:1.212 Mon Sep 25 08:19:06 2006
+++ php-src/ext/soap/soap.c Mon Sep 25 21:16:51 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.212 2006/09/25 08:19:06 dmitry Exp $ */
+/* $Id: soap.c,v 1.213 2006/09/25 21:16:51 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -232,7 +232,7 @@
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO(__soap_call_args, 0)
+ZEND_BEGIN_ARG_INFO_EX(__soap_call_args, 0, 0, 2)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
@@ -3046,7 +3046,7 @@
}
-/* {{{ proto mixed SoapClient::__call ( string function_name [, array
arguments [, array options [, array input_headers [, array output_headers) U
+/* {{{ proto mixed SoapClient::__call ( string function_name, array arguments
[, array options [, array input_headers [, array output_headers]]]) U
Calls a SOAP function */
PHP_METHOD(SoapClient, __call)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
