[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c
iliaaFri, 20 Nov 2009 18:54:08 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291096
Log:
Don't ignore the 2nd parameter to PDO's quote() method that identifies the data
type
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
U php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
U php/php-src/trunk/ext/pdo/pdo_dbh.c
Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c 2009-11-20 17:07:32 UTC
(rev 291095)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c 2009-11-20 18:54:08 UTC
(rev 291096)
@@ -1091,8 +1091,7 @@
char *qstr;
int qlen;
- if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s|l", &str, &str_len,
- ¶mtype)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
&str, &str_len, ¶mtype)) {
RETURN_FALSE;
}
Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c 2009-11-20 17:07:32 UTC
(rev 291095)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c 2009-11-20 18:54:08 UTC
(rev 291096)
@@ -1144,8 +1144,7 @@
char *qstr;
int qlen;
- if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s|l", &str, &str_len,
- ¶mtype)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
&str, &str_len, ¶mtype)) {
RETURN_FALSE;
}
Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-11-20 17:07:32 UTC (rev 291095)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-11-20 18:54:08 UTC (rev 291096)
@@ -1145,8 +1145,7 @@
char *qstr;
int qlen;
- if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s|l", &str, &str_len,
- ¶mtype)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
&str, &str_len, ¶mtype)) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_2/Zend/zend_operators.c PHP_5_3/NEWS PHP_5_3/Zend/zend_operators.c
On Thu, Nov 19, 2009 at 15:04, Ilia Alshanetsky wrote: > iliaa Thu, 19 Nov 2009 14:04:34 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=290995 > > Log: > Fixed bug #50207 (segmentation fault when concatenating very large strings > on 64bit linux). > > Bug: http://bugs.php.net/50207 (Verified) segmentation fault when > concatenating very large strings on 64bit linux > > Changed paths: > U php/php-src/branches/PHP_5_2/NEWS > U php/php-src/branches/PHP_5_2/Zend/zend_operators.c > U php/php-src/branches/PHP_5_3/NEWS > U php/php-src/branches/PHP_5_3/Zend/zend_operators.c > I assume HEAD isn't affected? What about phpt for this? -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_2/Zend/zend_operators.c PHP_5_3/NEWS PHP_5_3/Zend/zend_operators.c
On Fri, Nov 20, 2009 at 21:28, Hannes Magnusson wrote: > On Thu, Nov 19, 2009 at 15:04, Ilia Alshanetsky wrote: >> iliaa Thu, 19 Nov 2009 14:04:34 + >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=290995 >> >> Log: >> Fixed bug #50207 (segmentation fault when concatenating very large strings >> on 64bit linux). >> >> Bug: http://bugs.php.net/50207 (Verified) segmentation fault when >> concatenating very large strings on 64bit linux >> >> Changed paths: >> U php/php-src/branches/PHP_5_2/NEWS >> U php/php-src/branches/PHP_5_2/Zend/zend_operators.c >> U php/php-src/branches/PHP_5_3/NEWS >> U php/php-src/branches/PHP_5_3/Zend/zend_operators.c >> > > > I assume HEAD isn't affected? > What about phpt for this? Forget the phpt ;) -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_2/Zend/zend_operators.c PHP_5_3/NEWS PHP_5_3/Zend/zend_operators.c
Head contains slightly different code, I am not sure the patch is needed, I can't build head atm since mysqli seems to break the compile. On 2009-11-20, at 3:28 PM, Hannes Magnusson wrote: > On Thu, Nov 19, 2009 at 15:04, Ilia Alshanetsky wrote: >> iliaaThu, 19 Nov 2009 14:04:34 + >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=290995 >> >> Log: >> Fixed bug #50207 (segmentation fault when concatenating very large strings >> on 64bit linux). >> >> Bug: http://bugs.php.net/50207 (Verified) segmentation fault when >> concatenating very large strings on 64bit linux >> >> Changed paths: >>U php/php-src/branches/PHP_5_2/NEWS >>U php/php-src/branches/PHP_5_2/Zend/zend_operators.c >>U php/php-src/branches/PHP_5_3/NEWS >>U php/php-src/branches/PHP_5_3/Zend/zend_operators.c >> > > > I assume HEAD isn't affected? > What about phpt for this? > > -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/README.SUBMITTING_PATCH trunk/README.SUBMITTING_PATCH
sixd Fri, 20 Nov 2009 21:52:02 + Revision: http://svn.php.net/viewvc?view=revision&revision=291100 Log: Mention account access so we can refer account-requestors to this README Changed paths: U php/php-src/branches/PHP_5_3/README.SUBMITTING_PATCH U php/php-src/trunk/README.SUBMITTING_PATCH Modified: php/php-src/branches/PHP_5_3/README.SUBMITTING_PATCH === --- php/php-src/branches/PHP_5_3/README.SUBMITTING_PATCH2009-11-20 20:51:16 UTC (rev 291099) +++ php/php-src/branches/PHP_5_3/README.SUBMITTING_PATCH2009-11-20 21:52:02 UTC (rev 291100) @@ -4,6 +4,11 @@ This document describes how to submit a patch for PHP. Creating a patch for PHP is easy! +You don't need any login accounts or special access to download, +build, debug and begin submitting PHP code, tests or documentation for +inclusion in PHP. Once you've followed this README and had several +patches accepted, PHP commit privileges are often quickly granted. + An excellent article to read first is: http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith @@ -128,7 +133,4 @@ commit log. If your patch affects end users, a brief description and your name might be added to the NEWS file. -Commit privileges are often granted to people who have had several -patches accepted. - Thank you for patching PHP! Modified: php/php-src/trunk/README.SUBMITTING_PATCH === --- php/php-src/trunk/README.SUBMITTING_PATCH 2009-11-20 20:51:16 UTC (rev 291099) +++ php/php-src/trunk/README.SUBMITTING_PATCH 2009-11-20 21:52:02 UTC (rev 291100) @@ -4,6 +4,11 @@ This document describes how to submit a patch for PHP. Creating a patch for PHP is easy! +You don't need any login accounts or special access to download, +build, debug and begin submitting PHP code, tests or documentation for +inclusion in PHP. Once you've followed this README and had several +patches accepted, PHP commit privileges are often quickly granted. + An excellent article to read first is: http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith @@ -128,7 +133,4 @@ commit log. If your patch affects end users, a brief description and your name might be added to the NEWS file. -Commit privileges are often granted to people who have had several -patches accepted. - Thank you for patching PHP! -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/soap/php_http.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/soap/php_http.c trunk/ext/soap/php_http.c
pierrick Sat, 21 Nov 2009 01:22:32 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291104
Log:
Fixed bug #50219 (soap call Segmentation fault on a redirected url).
Bug: http://bugs.php.net/50219 (Open) soap call Segmentation fault on a
redirected url
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/soap/php_http.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/soap/php_http.c
U php/php-src/trunk/ext/soap/php_http.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-11-21 00:34:37 UTC (rev 291103)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-11-21 01:22:32 UTC (rev 291104)
@@ -6,6 +6,8 @@
- Changed "post_max_size" php.ini directive to allow unlimited post size by
setting it to 0. (Rasmus)
+- Fixed bug #50219 (soap call Segmentation fault on a redirected url).
+ (Pierrick)
- Fixed bug #50207 (segmentation fault when concatenating very large strings
on 64bit linux). (Ilia)
- Fixed bug #50185 (ldap_get_entries() return false instead of an empty array
Modified: php/php-src/branches/PHP_5_2/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_2/ext/soap/php_http.c2009-11-21 00:34:37 UTC
(rev 291103)
+++ php/php-src/branches/PHP_5_2/ext/soap/php_http.c2009-11-21 01:22:32 UTC
(rev 291104)
@@ -931,12 +931,20 @@
new_url->host = phpurl->host ?
estrdup(phpurl->host) : NULL;
new_url->port = phpurl->port;
if (new_url->path && new_url->path[0]
!= '/') {
- char *t = phpurl->path;
- char *p = strrchr(t, '/');
- if (p) {
- char *s = emalloc((p -
t) + strlen(new_url->path) + 2);
- strncpy(s, t, (p - t) +
1);
- s[(p - t) + 1] = 0;
+ if (phpurl->path) {
+ char *t = phpurl->path;
+ char *p = strrchr(t,
'/');
+ if (p) {
+ char *s =
emalloc((p - t) + strlen(new_url->path) + 2);
+ strncpy(s, t,
(p - t) + 1);
+ s[(p - t) + 1]
= 0;
+ strcat(s,
new_url->path);
+
efree(new_url->path);
+ new_url->path =
s;
+ }
+ } else {
+ char *s =
emalloc(strlen(new_url->path) + 2);
+ s[0] = '/'; s[1] = 0;
strcat(s,
new_url->path);
efree(new_url->path);
new_url->path = s;
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-11-21 00:34:37 UTC (rev 291103)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-11-21 01:22:32 UTC (rev 291104)
@@ -24,6 +24,8 @@
(Pierre)
+- Fixed bug #50219 (soap call Segmentation fault on a redirected url).
+ (Pierrick)
- Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT).
(Ilia, shigeru_kitazaki at cybozu dot co dot jp)
- Fixed bug #50207 (segmentation fault when concatenating very large strings on
Modified: php/php-src/branches/PHP_5_3/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_3/ext/soap/php_http.c2009-11-21 00:34:37 UTC
(rev 291103)
+++ php/php-src/branches/PHP_5_3/ext/soap/php_http.c2009-11-21 01:22:32 UTC
(rev 291104)
@@ -990,12 +990,20 @@
new_url->host = phpurl->host ?
estrdup(phpurl->host) : NULL;
new_url->port = phpurl->port;
if (new_url->path && new_url->path[0]
!= '/') {
- char *t = phpurl->path;
-
[PHP-CVS] svn: /php/php-src/trunk/ext/phar/tests/ phar_buildfromdirectory6.phpt
shireSat, 21 Nov 2009 05:38:58 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291107
Log:
Fix phar regex test when '.php' is part of the path, instead be more specific
with '.php$' regex.
Changed paths:
U php/php-src/trunk/ext/phar/tests/phar_buildfromdirectory6.phpt
Modified: php/php-src/trunk/ext/phar/tests/phar_buildfromdirectory6.phpt
===
--- php/php-src/trunk/ext/phar/tests/phar_buildfromdirectory6.phpt
2009-11-21 03:05:14 UTC (rev 291106)
+++ php/php-src/trunk/ext/phar/tests/phar_buildfromdirectory6.phpt
2009-11-21 05:38:58 UTC (rev 291107)
@@ -15,7 +15,7 @@
try {
$phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar');
- var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir',
'/\.php/'));
+ var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir',
'/\.php$/'));
} catch (Exception $e) {
var_dump(get_class($e));
echo $e->getMessage() . "\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/phar/tests/ phar_buildfromdirectory6.phpt
shireSat, 21 Nov 2009 05:40:16 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291108
Log:
MFH: Fix phar regex test when '.php' is part of the path, instead be more
specific with '.php$' regex.
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
===
--- php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
2009-11-21 05:38:58 UTC (rev 291107)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
2009-11-21 05:40:16 UTC (rev 291108)
@@ -15,7 +15,7 @@
try {
$phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar');
- var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir',
'/\.php/'));
+ var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir',
'/\.php$/'));
} catch (Exception $e) {
var_dump(get_class($e));
echo $e->getMessage() . "\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: svn: /php/php-src/branches/PHP_5_3/ext/phar/tests/ phar_buildfromdirectory6.phpt
Brian Shire wrote:
> shireSat, 21 Nov 2009 05:40:16 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=291108
>
> Log:
> MFH: Fix phar regex test when '.php' is part of the path, instead be more
> specific with '.php$' regex.
>
> Changed paths:
> U
> php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
>
> Modified:
> php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
> ===
> --- php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
> 2009-11-21 05:38:58 UTC (rev 291107)
> +++ php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
> 2009-11-21 05:40:16 UTC (rev 291108)
> @@ -15,7 +15,7 @@
>
> try {
> $phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar');
> - var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir',
> '/\.php/'));
> + var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir',
> '/\.php$/'));
> } catch (Exception $e) {
> var_dump(get_class($e));
> echo $e->getMessage() . "\n";
Hi,
Thanks for this fix, do you mind merging to pecl/phar/trunk?
Thanks,
Greg
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: svn: /php/php-src/branches/PHP_5_3/ext/phar/tests/ phar_buildfromdirectory6.phpt
Greg Beaver wrote:
Brian Shire wrote:
shireSat, 21 Nov 2009 05:40:16 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291108
Log:
MFH: Fix phar regex test when '.php' is part of the path, instead be more
specific with '.php$' regex.
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
===
--- php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
2009-11-21 05:38:58 UTC (rev 291107)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt
2009-11-21 05:40:16 UTC (rev 291108)
@@ -15,7 +15,7 @@
try {
$phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar');
- var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir',
'/\.php/'));
+ var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir',
'/\.php$/'));
} catch (Exception $e) {
var_dump(get_class($e));
echo $e->getMessage() . "\n";
Hi,
Thanks for this fix, do you mind merging to pecl/phar/trunk?
Yeah sorry about that, done.
-shire
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
