Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/configure.in PHP_5_2/ext/standard/file.c PHP_5_2/main/SAPI.c PHP_5_2/main/SAPI.h PHP_5_2/main/rfc1867.c PHP_5_3/configure.in PHP_5_3/ext/standard/file
Hi! Dude, you need to write a RFC first, then mail the RMs and wait for a reply which you quite likely will never get, then try same on the list and see nobody is interested. Fun, isn't it? :D It's much more fun when you upgrade your php 5.2.X to 5.2.X+1 and suddenly get extensions crashing on some system and when you wonder wtf it turns out some structure size changed in a minor version and some packager decided it'd be a cool thing to turn on by default. That's where the real fun is. -- Stanislav Malyshev, Zend Software Architect s...@zend.com http://www.zend.com/ (408)253-8829 MSN: s...@zend.com -- 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/configure.in PHP_5_2/ext/standard/file.c PHP_5_2/main/SAPI.c PHP_5_2/main/SAPI.h PHP_5_2/main/rfc1867.c PHP_5_3/configure.in PHP_5_3/ext/standard/fi
On Thu, Mar 18, 2010 at 11:37 PM, Andrei Zmievski wrote: > andrei Thu, 18 Mar 2010 22:37:25 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=296362 > > Log: > I am sorry I tried fixing PHP without extensive discussion on the mailing > list. I'm sorry that you did consider valid questions as a waste of time. I'm also sorry that you did not consider the other developers as good enough to discuss an ABI break in stable branches, even an optional one. Thanks for reverting it, discussions can still happen. Cheers, -- Pierre @pierrejoye | 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] svn: /php/php-src/branches/ PHP_5_2/configure.in PHP_5_2/ext/standard/file.c PHP_5_2/main/SAPI.c PHP_5_2/main/SAPI.h PHP_5_2/main/rfc1867.c PHP_5_3/configure.in PHP_5_3/ext/standard/file
Dude, you need to write a RFC first, then mail the RMs and wait for a reply which you quite likely will never get, then try same on the list and see nobody is interested. Fun, isn't it? :D --Jani 19.3.2010 0:37, Andrei Zmievski wrote: andrei Thu, 18 Mar 2010 22:37:25 + Revision: http://svn.php.net/viewvc?view=revision&revision=296362 Log: I am sorry I tried fixing PHP without extensive discussion on the mailing list. I am sorry I tried fixing PHP without extensive discussion on the mailing list. I am sorry I tried fixing PHP without extensive discussion on the mailing list. Hope all the relevant parties are satisfied. Changed paths: U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/ext/standard/file.c U php/php-src/branches/PHP_5_2/main/SAPI.c U php/php-src/branches/PHP_5_2/main/SAPI.h U php/php-src/branches/PHP_5_2/main/rfc1867.c U php/php-src/branches/PHP_5_3/configure.in U php/php-src/branches/PHP_5_3/ext/standard/file.c U php/php-src/branches/PHP_5_3/main/SAPI.c U php/php-src/branches/PHP_5_3/main/SAPI.h U php/php-src/branches/PHP_5_3/main/rfc1867.c -- 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
felipe Thu, 18 Mar 2010 22:40:29 + Revision: http://svn.php.net/viewvc?view=revision&revision=296363 Log: - BFN Changed paths: U php/php-src/branches/PHP_5_2/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2010-03-18 22:37:25 UTC (rev 296362) +++ php/php-src/branches/PHP_5_2/NEWS 2010-03-18 22:40:29 UTC (rev 296363) @@ -1,6 +1,9 @@ PHPNEWS ||| ?? ??? 2010, PHP 5.2.14 +- Reverted bug fix #49521 (PDO fetchObject sets values before calling + constructor). (Felipe) + - Updated timezone database to version 2010.5. (Derick) - Fixed a NULL pointer dereference when processing invalid XML-RPC -- 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/configure.in PHP_5_2/ext/standard/file.c PHP_5_2/main/SAPI.c PHP_5_2/main/SAPI.h PHP_5_2/main/rfc1867.c PHP_5_3/configure.in PHP_5_3/ext/standard/file.c P
andrei Thu, 18 Mar 2010 22:37:25 +
Revision: http://svn.php.net/viewvc?view=revision&revision=296362
Log:
I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.
Hope all the relevant parties are satisfied.
Changed paths:
U php/php-src/branches/PHP_5_2/configure.in
U php/php-src/branches/PHP_5_2/ext/standard/file.c
U php/php-src/branches/PHP_5_2/main/SAPI.c
U php/php-src/branches/PHP_5_2/main/SAPI.h
U php/php-src/branches/PHP_5_2/main/rfc1867.c
U php/php-src/branches/PHP_5_3/configure.in
U php/php-src/branches/PHP_5_3/ext/standard/file.c
U php/php-src/branches/PHP_5_3/main/SAPI.c
U php/php-src/branches/PHP_5_3/main/SAPI.h
U php/php-src/branches/PHP_5_3/main/rfc1867.c
Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in 2010-03-18 22:07:51 UTC (rev 296361)
+++ php/php-src/branches/PHP_5_2/configure.in 2010-03-18 22:37:25 UTC (rev 296362)
@@ -896,12 +896,6 @@
AC_MSG_RESULT([using system default])
fi
-PHP_ARG_ENABLE(large-uploads-fix, whether to enable large files (2G-4G) uploads fix,
-[ --enable-large-uploads-fix Enable large files (2G-4G) uploads fix], no, no)
-if test "$PHP_LARGE_UPLOADS_FIX" = "yes"; then
- AC_DEFINE(HAVE_LARGE_UPLOADS_FIX, 1, [Whether to enable large files (2G-4G) uploads fix])
-fi
-
divert(5)
dnl ## In diversion 5 we check which extensions should be compiled.
Modified: php/php-src/branches/PHP_5_2/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/file.c 2010-03-18 22:07:51 UTC (rev 296361)
+++ php/php-src/branches/PHP_5_2/ext/standard/file.c 2010-03-18 22:37:25 UTC (rev 296362)
@@ -579,8 +579,7 @@
char *filename;
int filename_len;
zval *data;
- size_t numbytes = 0;
- int result = SUCCESS;
+ int numbytes = 0;
long flags = 0;
zval *zcontext = NULL;
php_stream_context *context = NULL;
@@ -623,7 +622,7 @@
case IS_RESOURCE: {
size_t len;
if (php_stream_copy_to_stream_ex(srcstream, stream, PHP_STREAM_COPY_ALL, &len) != SUCCESS) {
-result = FAILURE;
+numbytes = -1;
} else {
numbytes = len;
}
@@ -641,7 +640,7 @@
numbytes = php_stream_write(stream, Z_STRVAL_P(data), Z_STRLEN_P(data));
if (numbytes != Z_STRLEN_P(data)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only %d of %d bytes written, possibly out of free disk space", numbytes, Z_STRLEN_P(data));
- result = FAILURE;
+ numbytes = -1;
}
}
break;
@@ -667,7 +666,7 @@
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only %d of %d bytes written, possibly out of free disk space", bytes_written, Z_STRLEN_PP(tmp));
}
- result = FAILURE;
+ numbytes = -1;
break;
}
}
@@ -684,19 +683,19 @@
numbytes = php_stream_write(stream, Z_STRVAL(out), Z_STRLEN(out));
if (numbytes != Z_STRLEN(out)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only %d of %d bytes written, possibly out of free disk space", numbytes, Z_STRLEN(out));
- result = FAILURE;
+ numbytes = -1;
}
zval_dtor(&out);
break;
}
}
default:
- result = FAILURE;
+ numbytes = -1;
break;
}
php_stream_close(stream);
- if (result == FAILURE) {
+ if (numbytes < 0) {
RETURN_FALSE;
}
Modified: php/php-src/branches/PHP_5_2/main/SAPI.c
===
--- php/php-src/branches/PHP_5_2/main/SAPI.c 2010-03-18 22:07:51 UTC (rev 296361)
+++ php/php-src/branches/PHP_5_2/main/SAPI.c 2010-03-18 22:37:25 UTC (rev 296362)
@@ -191,8 +191,8 @@
SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
{
- size_t read_bytes;
- size_t allocated_bytes=SAPI_POST_BLOCK_SIZE+1;
+ int read_bytes;
+ int allocated_bytes=SAPI_POST_BLOCK_SIZE+1;
if (SG(request_info).content_length > SG(post_max_size)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "POST Content-Length of %ld bytes exceeds the limit of %ld bytes",
Modified: php/php-src/branches/PHP_5_2/main/SAPI.h
===
--- php/php-src/branches/PHP_5_2/main/SAPI.h 2010-03-18 22:07:51 UTC (rev 296361)
+++ php/php-src/branches/PHP_5_2/main/SAPI.h 2010-03-18 22:37:25 UTC (rev 296362)
@@ -118,11 +118,7 @@
void *server_context;
sapi_request_info request_info;
sapi_headers_struct sapi_headers;
-#ifdef HAVE_LARGE_UPLOADS_FIX
- size_t read_post_bytes;
-#else
int read_post_bytes;
-#endif
unsigned char headers_sent;
struct stat global_stat;
char *default_mimetype;
Modified: php/php-src/branches/PHP_5_2/main/rfc1867.c
=
Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/configure.in PHP_5_2/ext/standard/file.c PHP_5_2/main/SAPI.c PHP_5_2/main/SAPI.h PHP_5_2/main/rfc1867.c PHP_5_3/configure.in PHP_5_3/ext/standard/fi
On Thu, Mar 18, 2010 at 22:07, Andrei Zmievski wrote: > andrei Thu, 18 Mar 2010 21:07:38 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=296358 > > Log: > Fix a few problems with large (2G-4G) file uploads. Added > --enable-large-uploads-fix switch because one change was in SAPI.h structure. That deserves a NEWS entry.. -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_2/ext/ pdo/pdo_stmt.c pdo_sqlite/tests/bug49521.phpt
felipe Thu, 18 Mar 2010 22:07:51 +
Revision: http://svn.php.net/viewvc?view=revision&revision=296361
Log:
Revert 290786: Fixed bug #49521 (PDO fetchObject sets values before calling
constructor)
Bug: http://bugs.php.net/49521 (Re-Opened) PDO fetchObject sets values before
calling constructor
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pdo/pdo_stmt.c
U php/php-src/branches/PHP_5_2/ext/pdo_sqlite/tests/bug49521.phpt
Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_stmt.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo_stmt.c 2010-03-18 21:53:50 UTC
(rev 296360)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_stmt.c 2010-03-18 22:07:51 UTC
(rev 296361)
@@ -1103,32 +1103,6 @@
}
}
- switch (how) {
- case PDO_FETCH_CLASS:
- if (ce->constructor && !(flags &
PDO_FETCH_PROPS_LATE)) {
- stmt->fetch.cls.fci.object_pp =
&return_value;
- stmt->fetch.cls.fcc.object_pp =
&return_value;
- if
(zend_call_function(&stmt->fetch.cls.fci, &stmt->fetch.cls.fcc TSRMLS_CC) ==
FAILURE) {
- pdo_raise_impl_error(stmt->dbh,
stmt, "HY000", "could not call class constructor" TSRMLS_CC);
- return 0;
- } else {
- if (stmt->fetch.cls.retval_ptr)
{
-
zval_ptr_dtor(&stmt->fetch.cls.retval_ptr);
- }
- }
- }
- if (flags & PDO_FETCH_CLASSTYPE) {
- do_fetch_opt_finish(stmt, 0 TSRMLS_CC);
- stmt->fetch.cls.ce = old_ce;
- stmt->fetch.cls.ctor_args =
old_ctor_args;
- stmt->fetch.cls.fci.param_count =
old_arg_count;
- }
- break;
-
- default:
- break;
- }
-
for (idx = 0; i < stmt->column_count; i++, idx++) {
zval *val;
MAKE_STD_ZVAL(val);
@@ -1262,6 +1236,27 @@
}
switch (how) {
+ case PDO_FETCH_CLASS:
+ if (ce->constructor && !(flags &
PDO_FETCH_PROPS_LATE)) {
+ stmt->fetch.cls.fci.object_pp =
&return_value;
+ stmt->fetch.cls.fcc.object_pp =
&return_value;
+ if
(zend_call_function(&stmt->fetch.cls.fci, &stmt->fetch.cls.fcc TSRMLS_CC) ==
FAILURE) {
+ pdo_raise_impl_error(stmt->dbh,
stmt, "HY000", "could not call class constructor" TSRMLS_CC);
+ return 0;
+ } else {
+ if (stmt->fetch.cls.retval_ptr)
{
+
zval_ptr_dtor(&stmt->fetch.cls.retval_ptr);
+ }
+ }
+ }
+ if (flags & PDO_FETCH_CLASSTYPE) {
+ do_fetch_opt_finish(stmt, 0 TSRMLS_CC);
+ stmt->fetch.cls.ce = old_ce;
+ stmt->fetch.cls.ctor_args =
old_ctor_args;
+ stmt->fetch.cls.fci.param_count =
old_arg_count;
+ }
+ break;
+
case PDO_FETCH_FUNC:
stmt->fetch.func.fci.param_count = idx;
stmt->fetch.func.fci.retval_ptr_ptr = &retval;
Modified: php/php-src/branches/PHP_5_2/ext/pdo_sqlite/tests/bug49521.phpt
===
--- php/php-src/branches/PHP_5_2/ext/pdo_sqlite/tests/bug49521.phpt
2010-03-18 21:53:50 UTC (rev 296360)
+++ php/php-src/branches/PHP_5_2/ext/pdo_sqlite/tests/bug49521.phpt
2010-03-18 22:07:51 UTC (rev 296361)
@@ -33,7 +33,7 @@
Book::__construct
object(Book)#%d (2) {
[%u|b%"title"]=>
- string(3) "PHP"
+ string(0) ""
[%u|b%"author"]=>
string(6) "Rasmus"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/
That was fun while it lasted. On 3/16/10 8:45 AM, Derick Rethans wrote: derick Tue, 16 Mar 2010 15:45:24 + Revision: http://svn.php.net/viewvc?view=revision&revision=296284 Log: - Moved the Unicode experiment from trunk to its own branch for reference. Changed paths: A + php/php-src/branches/FIRST_UNICODE_IMPLEMENTATION/ (from php/php-src/trunk/:r296283) D php/php-src/trunk/ -- 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/configure.in PHP_5_2/ext/standard/file.c PHP_5_2/main/SAPI.c PHP_5_2/main/SAPI.h PHP_5_2/main/rfc1867.c PHP_5_3/configure.in PHP_5_3/ext/standard/file.c P
andrei Thu, 18 Mar 2010 21:07:38 +
Revision: http://svn.php.net/viewvc?view=revision&revision=296358
Log:
Fix a few problems with large (2G-4G) file uploads. Added
--enable-large-uploads-fix switch because one change was in SAPI.h structure.
Changed paths:
U php/php-src/branches/PHP_5_2/configure.in
U php/php-src/branches/PHP_5_2/ext/standard/file.c
U php/php-src/branches/PHP_5_2/main/SAPI.c
U php/php-src/branches/PHP_5_2/main/SAPI.h
U php/php-src/branches/PHP_5_2/main/rfc1867.c
U php/php-src/branches/PHP_5_3/configure.in
U php/php-src/branches/PHP_5_3/ext/standard/file.c
U php/php-src/branches/PHP_5_3/main/SAPI.c
U php/php-src/branches/PHP_5_3/main/SAPI.h
U php/php-src/branches/PHP_5_3/main/rfc1867.c
Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in 2010-03-18 19:42:55 UTC (rev 296357)
+++ php/php-src/branches/PHP_5_2/configure.in 2010-03-18 21:07:38 UTC (rev 296358)
@@ -896,6 +896,12 @@
AC_MSG_RESULT([using system default])
fi
+PHP_ARG_ENABLE(large-uploads-fix, whether to enable large files (2G-4G) uploads fix,
+[ --enable-large-uploads-fix Enable large files (2G-4G) uploads fix], no, no)
+if test "$PHP_LARGE_UPLOADS_FIX" = "yes"; then
+ AC_DEFINE(HAVE_LARGE_UPLOADS_FIX, 1, [Whether to enable large files (2G-4G) uploads fix])
+fi
+
divert(5)
dnl ## In diversion 5 we check which extensions should be compiled.
Modified: php/php-src/branches/PHP_5_2/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/file.c 2010-03-18 19:42:55 UTC (rev 296357)
+++ php/php-src/branches/PHP_5_2/ext/standard/file.c 2010-03-18 21:07:38 UTC (rev 296358)
@@ -579,7 +579,8 @@
char *filename;
int filename_len;
zval *data;
- int numbytes = 0;
+ size_t numbytes = 0;
+ int result = SUCCESS;
long flags = 0;
zval *zcontext = NULL;
php_stream_context *context = NULL;
@@ -622,7 +623,7 @@
case IS_RESOURCE: {
size_t len;
if (php_stream_copy_to_stream_ex(srcstream, stream, PHP_STREAM_COPY_ALL, &len) != SUCCESS) {
-numbytes = -1;
+result = FAILURE;
} else {
numbytes = len;
}
@@ -640,7 +641,7 @@
numbytes = php_stream_write(stream, Z_STRVAL_P(data), Z_STRLEN_P(data));
if (numbytes != Z_STRLEN_P(data)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only %d of %d bytes written, possibly out of free disk space", numbytes, Z_STRLEN_P(data));
- numbytes = -1;
+ result = FAILURE;
}
}
break;
@@ -666,7 +667,7 @@
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only %d of %d bytes written, possibly out of free disk space", bytes_written, Z_STRLEN_PP(tmp));
}
- numbytes = -1;
+ result = FAILURE;
break;
}
}
@@ -683,19 +684,19 @@
numbytes = php_stream_write(stream, Z_STRVAL(out), Z_STRLEN(out));
if (numbytes != Z_STRLEN(out)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only %d of %d bytes written, possibly out of free disk space", numbytes, Z_STRLEN(out));
- numbytes = -1;
+ result = FAILURE;
}
zval_dtor(&out);
break;
}
}
default:
- numbytes = -1;
+ result = FAILURE;
break;
}
php_stream_close(stream);
- if (numbytes < 0) {
+ if (result == FAILURE) {
RETURN_FALSE;
}
Modified: php/php-src/branches/PHP_5_2/main/SAPI.c
===
--- php/php-src/branches/PHP_5_2/main/SAPI.c 2010-03-18 19:42:55 UTC (rev 296357)
+++ php/php-src/branches/PHP_5_2/main/SAPI.c 2010-03-18 21:07:38 UTC (rev 296358)
@@ -191,8 +191,8 @@
SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
{
- int read_bytes;
- int allocated_bytes=SAPI_POST_BLOCK_SIZE+1;
+ size_t read_bytes;
+ size_t allocated_bytes=SAPI_POST_BLOCK_SIZE+1;
if (SG(request_info).content_length > SG(post_max_size)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "POST Content-Length of %ld bytes exceeds the limit of %ld bytes",
Modified: php/php-src/branches/PHP_5_2/main/SAPI.h
===
--- php/php-src/branches/PHP_5_2/main/SAPI.h 2010-03-18 19:42:55 UTC (rev 296357)
+++ php/php-src/branches/PHP_5_2/main/SAPI.h 2010-03-18 21:07:38 UTC (rev 296358)
@@ -118,7 +118,11 @@
void *server_context;
sapi_request_info request_info;
sapi_headers_struct sapi_headers;
+#ifdef HAVE_LARGE_UPLOADS_FIX
+ size_t read_post_bytes;
+#else
int read_post_bytes;
+#endif
unsigned char headers_sent;
struct stat global_stat;
char *default_mimetype;
Modified: php/php-src/branches/PHP_5_2/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_2/main/rfc1867.c 2010-03-18 19:42:55 UTC (rev 296357)
+++ php/php-src/branches/PHP_5
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS
On Mon, 15 Mar 2010, Ilia Alshanetsky wrote: > ?? ??? 2010, PHP 5.2.14 > -- Updated timezone database to version 2010.3. (Derick) > +- Updated timezone database to version 2010.5. (Derick) I still haven't figured out to script this without messing something up :-) regards, Derick -- http://derickrethans.nl | http://xdebug.org Like Xdebug? Consider a donation: http://xdebug.org/donate.php twitter: @derickr and @xdebug -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
