[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Aug 7 01:32:28 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3130r2=1.3131diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3130 php-src/ChangeLog:1.3131 --- php-src/ChangeLog:1.3130Wed Aug 6 01:32:23 2008 +++ php-src/ChangeLog Thu Aug 7 01:32:27 2008 @@ -1,3 +1,178 @@ +2008-08-06 Lukas Smith [EMAIL PROTECTED] + +* README.RELEASE_PROCESS: + separate tagging of the zend dir should not be necessary, fix reST + formatting of titles + +2008-08-06 Kalle Sommer Nielsen [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + Backport #45406 (session.serialize_handler declared by shared extension + fails) to PHP_5_2 + +* (PHP_5_3) + NEWS: + Backport fix for #45406 to PHP_5_2 + +* (PHP_5_2) + ext/session/session.c: + Backport fix for #45406 - Patch by oleg dot grenrus at dynamoid dot com + +2008-08-06 Lukas Smith [EMAIL PROTECTED] + +* README.RELEASE_PROCESS: + lets me all american :) + +* README.RELEASE_PROCESS: + updated in regards to windows, added some clarifications and addition tipps + +2008-08-06 Andrey Hristov [EMAIL PROTECTED] + +* (PHP_5_3) + ext/mysql/php_mysql.c + ext/mysql/php_mysql_structs.h: + Re-add mysql_set_charset. Missed during introduction of mysqlnd. Exists in + HEAD, thus no merge + +2008-08-06 Elizabeth Marie Smith [EMAIL PROTECTED] + +* ext/pdo_sqlite/config.w32 + ext/pdo_sqlite/config.w32: + Stupid typo + +* ext/pdo_sqlite/config.w32 + ext/pdo_sqlite/config.w32: + Fix include path + +2008-08-06 Felipe Pena [EMAIL PROTECTED] + +* ext/intl/msgformat/msgformat_attr.c: + - Fixed crash msgfmt_get_pattern + +2008-08-06 Derick Rethans [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS + ext/fileinfo/config.m4: + - MFH: Fixed bug #45636 (fileinfo ext duplicate strndup). + +* ext/fileinfo/config.m4: + - Fixed bug #45636 (fileinfo ext duplicate strndup). + +* (PHP_5_3) + NEWS + ext/fileinfo/config.m4: + - MFH: Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and +getopt.h). + +* ext/fileinfo/config.m4: + - Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and + getopt.h). + +2008-08-06 Scott MacVicar [EMAIL PROTECTED] + +* ext/sqlite3/libsqlite/sqlite3.c + ext/sqlite3/libsqlite/sqlite3.h + ext/sqlite3/libsqlite/sqlite3ext.h: + Sync libsqlite to 3.6.1 + +* ext/sqlite3/tests/sqlite3_22_loadextension.phpt: + Fix test on Windows + +* ext/sqlite3/sqlite3.c + ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt + ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt: + MFB: Update coding standards and fix a test, this was already in 5.3 alpha + 1 + +2008-08-06 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + main/streams/streams.c: + MFH: increase context refcount before open() to avoid crash when open() + fails and destroys the context + +* main/streams/streams.c: + increase context refcount before open() to avoid crash when open() fails + and destroys the context + +2008-08-06 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + configure.in + main/php_version.h: + - 4.4.9, rock and roll. + +* (PHP_4_4) + NEWS + Zend/zend_multibyte.c + ext/standard/php_string.h + ext/standard/tests/strings/explode_bug.phpt: + - MFH (manually): Fixed overflow in memnstr(). + +2008-08-06 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + ext/oci8/oci8.c: + fix 11g crap + +2008-08-06 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS + ext/session/php_session.h + ext/session/session.c + ext/session/tests/008-php4.2.3.phpt + ext/session/tests/014.phpt + ext/session/tests/session_decode_variation3.phpt + ext/session/tests/session_encode_error2.phpt + ext/session/tests/session_encode_variation1.phpt + ext/session/tests/session_encode_variation2.phpt + ext/session/tests/session_encode_variation3.phpt + ext/session/tests/session_encode_variation4.phpt + ext/session/tests/session_encode_variation5.phpt + ext/session/tests/session_encode_variation6.phpt + ext/session/tests/session_encode_variation7.phpt + ext/session/tests/session_encode_variation8.phpt + ext/session/tests/session_id_error4.phpt: + MFH: General sync. WS / CS / etc. crap some people didn't bother to merge + MFH: before this commit..bunnies thank you all.. + [DOC] - Added ext/hash support to ext/session's ID generator. (Sara) + [DOC] Ask Sara for explanation.. + +* NEWS: + - Old news + +* ext/session/session.c + ext/session/tests/session_decode_variation3.phpt +
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 oci8.c
On 06.08.2008 00:56, Pierre-Alain Joye wrote:
zend_module_entry oci8_module_entry = {
STANDARD_MODULE_HEADER,
- oci8, /* extension name */
+ oci8_11g, /* extension name */
WTF ?!
--
Wbr,
Antony Dovgal
--
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/oci8 oci8.c
tony2001Wed Aug 6 07:54:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 oci8.c
Log:
fix 11g crap
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.21r2=1.269.2.16.2.38.2.22diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.21
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.22
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.21Tue Aug 5 20:56:25 2008
+++ php-src/ext/oci8/oci8.c Wed Aug 6 07:54:40 2008
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.21 2008/08/05 20:56:25 pajoye Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.22 2008/08/06 07:54:40 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1018,7 +1018,7 @@
zend_module_entry oci8_module_entry = {
STANDARD_MODULE_HEADER,
- oci8_11g, /* extension name */
+ oci8, /* extension name */
php_oci_functions,/* extension function list */
PHP_MINIT(oci), /* extension-wide startup function */
PHP_MSHUTDOWN(oci), /* extension-wide shutdown function */
@@ -1311,7 +1311,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, PHP_OCI8_VERSION);
- php_info_print_table_row(2, Revision, $Revision:
1.269.2.16.2.38.2.21 $);
+ php_info_print_table_row(2, Revision, $Revision:
1.269.2.16.2.38.2.22 $);
snprintf(buf, sizeof(buf), %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
--
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/oci8 oci8.c
hi, On Wed, Aug 6, 2008 at 9:54 AM, Antony Dovgal [EMAIL PROTECTED] wrote: tony2001Wed Aug 6 07:54:41 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8 oci8.c Log: fix 11g crap Thanks, I was going to fix it. There is a bad habit to use crap, stupid or other fancy words to describe things that you don't like or disagree with. Is it too much asking to write complete phrases with relatively nice wording? wtf?!? and other stupid/crap/silly comments are pointless. -- 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] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
On Tue, 5 Aug 2008, Olivier Hill wrote: What should be MFH'ed? I haven't touched HEAD with this. I don't have cvs access here, will only be able to commit friday. Is there still regression issues or my last patch fixed it? Looks fine - I missed your patch on the list though. regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/standard php_string.h /ext/standard/tests/strings explode_bug.phpt Zend zend_multibyte.c
derick Wed Aug 6 08:09:07 2008 UTC
Added files: (Branch: PHP_4_4)
/php-src/ext/standard/tests/strings explode_bug.phpt
Modified files:
/php-srcNEWS
/Zend zend_multibyte.c
/php-src/ext/standard php_string.h
Log:
- MFH (manually): Fixed overflow in memnstr().
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.253r2=1.1247.2.920.2.254diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.253 php-src/NEWS:1.1247.2.920.2.254
--- php-src/NEWS:1.1247.2.920.2.253 Tue Jul 22 07:38:38 2008
+++ php-src/NEWSWed Aug 6 08:09:06 2008
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||
?? Aug 2008, Version 4.4.9
+- Fixed overflow in memnstr(). (Reported by Laurent Gaffie, Derick)
22 Jul 2008, Version 4.4.9RC1
- Updated PCRE to version 7.7. (Nuno)
http://cvs.php.net/viewvc.cgi/Zend/zend_multibyte.c?r1=1.4.2.1.8.2r2=1.4.2.1.8.3diff_format=u
Index: Zend/zend_multibyte.c
diff -u Zend/zend_multibyte.c:1.4.2.1.8.2 Zend/zend_multibyte.c:1.4.2.1.8.3
--- Zend/zend_multibyte.c:1.4.2.1.8.2 Sun Jan 1 13:46:49 2006
+++ Zend/zend_multibyte.c Wed Aug 6 08:09:07 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_multibyte.c,v 1.4.2.1.8.2 2006/01/01 13:46:49 sniper Exp $ */
+/* $Id: zend_multibyte.c,v 1.4.2.1.8.3 2008/08/06 08:09:07 derick Exp $ */
#include zend.h
#include zend_compile.h
@@ -654,6 +654,9 @@
char first = *needle;
/* let end point to the last character where needle may start */
+ if (needle_len end - haystack) {
+ return NULL;
+ }
end -= needle_len;
while (p = end) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_string.h?r1=1.65.2.5.2.3r2=1.65.2.5.2.4diff_format=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.65.2.5.2.3
php-src/ext/standard/php_string.h:1.65.2.5.2.4
--- php-src/ext/standard/php_string.h:1.65.2.5.2.3 Mon Dec 31 07:22:52 2007
+++ php-src/ext/standard/php_string.h Wed Aug 6 08:09:07 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_string.h,v 1.65.2.5.2.3 2007/12/31 07:22:52 sebastian Exp $ */
+/* $Id: php_string.h,v 1.65.2.5.2.4 2008/08/06 08:09:07 derick Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -137,6 +137,10 @@
char *p = haystack;
char ne = needle[needle_len-1];
+
+ if (needle_len end - haystack) {
+ return NULL;
+ }
end -= needle_len;
while (p = end) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_bug.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/explode_bug.phpt
+++ php-src/ext/standard/tests/strings/explode_bug.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Wed Aug 6 08:32:30 2008 UTC Modified files: (Branch: PHP_4_4) /php-src/main php_version.h /php-srcconfigure.in NEWS Log: - 4.4.9, rock and roll. http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.48r2=1.66.2.81.2.49diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.48 php-src/main/php_version.h:1.66.2.81.2.49 --- php-src/main/php_version.h:1.66.2.81.2.48 Tue Jul 22 07:38:38 2008 +++ php-src/main/php_version.h Wed Aug 6 08:32:30 2008 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION RC2-dev -#define PHP_VERSION 4.4.9RC2-dev +#define PHP_EXTRA_VERSION +#define PHP_VERSION 4.4.9 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.52r2=1.396.2.164.2.53diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.52 php-src/configure.in:1.396.2.164.2.53 --- php-src/configure.in:1.396.2.164.2.52 Tue Jul 22 07:38:38 2008 +++ php-src/configure.inWed Aug 6 08:32:30 2008 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.52 2008/07/22 07:38:38 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.53 2008/08/06 08:32:30 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -38,7 +38,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=9 -EXTRA_VERSION=RC2-dev +EXTRA_VERSION= VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.254r2=1.1247.2.920.2.255diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.254 php-src/NEWS:1.1247.2.920.2.255 --- php-src/NEWS:1.1247.2.920.2.254 Wed Aug 6 08:09:06 2008 +++ php-src/NEWSWed Aug 6 08:32:30 2008 @@ -1,10 +1,8 @@ PHP 4 NEWS ||| -?? Aug 2008, Version 4.4.9 -- Fixed overflow in memnstr(). (Reported by Laurent Gaffie, Derick) - -22 Jul 2008, Version 4.4.9RC1 +07 Aug 2008, Version 4.4.9 - Updated PCRE to version 7.7. (Nuno) +- Fixed overflow in memnstr(). (Reported by Laurent Gaffie, Derick) - Fixed crash in imageloadfont when an invalid font is given. (discovered by CzechSec, fixed by Pierre) - Fixed open_basedir handling issue in the curl extension. (Stas) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams streams.c
tony2001Wed Aug 6 09:03:37 2008 UTC
Modified files:
/php-src/main/streams streams.c
Log:
increase context refcount before open() to avoid crash when open() fails and
destroys the context
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.167r2=1.168diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.167
php-src/main/streams/streams.c:1.168
--- php-src/main/streams/streams.c:1.167Fri Jul 11 12:40:20 2008
+++ php-src/main/streams/streams.c Wed Aug 6 09:03:36 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.167 2008/07/11 12:40:20 tony2001 Exp $ */
+/* $Id: streams.c,v 1.168 2008/08/06 09:03:36 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -2414,14 +2414,22 @@
php_stream_wrapper_log_error(wrapper, options ^
REPORT_ERRORS TSRMLS_CC,
wrapper does not support stream open);
} else {
+ /* refcount++ to make sure the context doesn't get
destroyed
+* if open() fails and stream is closed */
+ if (context) {
+ zend_list_addref(context-rsrc_id);
+ }
+
stream = wrapper-wops-stream_opener(wrapper,
path_to_open, implicit_mode, options ^
REPORT_ERRORS,
opened_path, context STREAMS_REL_CC TSRMLS_CC);
- }
- /* increase context refcount only if the context is really used
*/
- if (stream stream-context) {
- zend_list_addref(stream-context-rsrc_id);
+ /* if open() succeeded and context was not used, do
refcount--
+* XXX if a wrapper didn't actually use context (no way
to know that)
+* and open() failed, refcount will stay increased */
+ if (context stream !stream-context) {
+ zend_list_delete(context-rsrc_id);
+ }
}
/* if the caller asked for a persistent stream but the wrapper
did not
--
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) /main/streams streams.c
tony2001Wed Aug 6 09:03:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams streams.c
Log:
MFH: increase context refcount before open() to avoid crash when open() fails
and destroys the context
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.12r2=1.82.2.6.2.18.2.13diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.12
php-src/main/streams/streams.c:1.82.2.6.2.18.2.13
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.12 Fri Jul 11 12:40:28 2008
+++ php-src/main/streams/streams.c Wed Aug 6 09:03:48 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18.2.12 2008/07/11 12:40:28 tony2001 Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.13 2008/08/06 09:03:48 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1801,14 +1801,22 @@
php_stream_wrapper_log_error(wrapper, options ^
REPORT_ERRORS TSRMLS_CC,
wrapper does not support stream open);
} else {
+ /* refcount++ to make sure the context doesn't get
destroyed
+* if open() fails and stream is closed */
+ if (context) {
+ zend_list_addref(context-rsrc_id);
+ }
+
stream = wrapper-wops-stream_opener(wrapper,
path_to_open, mode, options ^ REPORT_ERRORS,
opened_path, context STREAMS_REL_CC TSRMLS_CC);
- }
- /* increase context refcount only if the context is really used
*/
- if (stream stream-context) {
- zend_list_addref(stream-context-rsrc_id);
+ /* if open() succeeded and context was not used, do
refcount--
+* XXX if a wrapper didn't actually use context (no way
to know that)
+* and open() failed, refcount will stay increased */
+ if (context stream !stream-context) {
+ zend_list_delete(context-rsrc_id);
+ }
}
/* if the caller asked for a persistent stream but the wrapper
did not
--
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_2) / NEWS
Hello Stanislav, we should not mention the reported, unless they provided a patch, in which case they go into the braces part anyway. marcus Tuesday, August 5, 2008, 11:40:49 PM, you wrote: stasTue Aug 5 21:40:49 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: ok, clarify :) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1189r2=1.2027.2.547.2.1190diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1189 php-src/NEWS:1.2027.2.547.2.1190 --- php-src/NEWS:1.2027.2.547.2.1189Tue Aug 5 21:24:42 2008 +++ php-src/NEWSTue Aug 5 21:40:48 2008 @@ -13,7 +13,7 @@ functions. (Andrey) - Fixed a regression when using strip_tags() and is within an attribute. (Scott) -- Fixed memnstr bug by Laurent Gaffie (Stas) +- Fixed memnstr bug, reported by Laurent Gaffie (Stas) - Fixed bug #45705 (rfc822_parse_adrlist() modifies passed address parameter). (Jani) 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_2) / NEWS
hi Marcus, On Wed, Aug 6, 2008 at 1:07 PM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Stanislav, we should not mention the reported, unless they provided a patch, Except for security issue 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
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
On Wed, Aug 6, 2008 at 13:30, Pierre Joye [EMAIL PROTECTED] wrote: hi Marcus, On Wed, Aug 6, 2008 at 1:07 PM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Stanislav, we should not mention the reported, unless they provided a patch, Except for security issue In which case, it should be noted that it is a security issue. -Hannes -- 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_2) / NEWS
On Wed, 6 Aug 2008, Hannes Magnusson wrote: On Wed, Aug 6, 2008 at 13:30, Pierre Joye [EMAIL PROTECTED] wrote: hi Marcus, On Wed, Aug 6, 2008 at 1:07 PM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Stanislav, we should not mention the reported, unless they provided a patch, Except for security issue In which case, it should be noted that it is a security issue. No, we don't usually do that. There is no need to wake sleeping dogs. regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.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_2) / NEWS
On Wed, 6 Aug 2008, Hannes Magnusson wrote: On Wed, Aug 6, 2008 at 14:01, Derick Rethans [EMAIL PROTECTED] wrote: On Wed, 6 Aug 2008, Hannes Magnusson wrote: On Wed, Aug 6, 2008 at 13:30, Pierre Joye [EMAIL PROTECTED] wrote: hi Marcus, On Wed, Aug 6, 2008 at 1:07 PM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Stanislav, we should not mention the reported, unless they provided a patch, Except for security issue In which case, it should be noted that it is a security issue. No, we don't usually do that. There is no need to wake sleeping dogs. Security Enhancements and Fixes in PHP 5.2.6: Sure, but it's not in the NEWS file. The reason for this is that sometimes it can take months for security issues to hit a release. Announcing security issues at release time should of course be done. regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.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 sqlite3.c /ext/sqlite3/tests sqlite3_12_unfinalized_stmt_cleanup.phpt sqlite3_25_create_aggregate.phpt
scottmacWed Aug 6 14:02:44 2008 UTC
Modified files:
/php-src/ext/sqlite3sqlite3.c
/php-src/ext/sqlite3/tests sqlite3_12_unfinalized_stmt_cleanup.phpt
sqlite3_25_create_aggregate.phpt
Log:
MFB: Update coding standards and fix a test, this was already in 5.3 alpha 1
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.10 php-src/ext/sqlite3/sqlite3.c:1.11
--- php-src/ext/sqlite3/sqlite3.c:1.10 Sat Aug 2 04:40:45 2008
+++ php-src/ext/sqlite3/sqlite3.c Wed Aug 6 14:02:44 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.10 2008/08/02 04:40:45 felipe Exp $ */
+/* $Id: sqlite3.c,v 1.11 2008/08/06 14:02:44 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -375,7 +375,7 @@
}
/* }}} */
-/* {{{ proto sqlite3_stmt SQLite3::prepare(String Query)
+/* {{{ proto SQLite3Stmt SQLite3::prepare(String Query)
Returns a prepared SQL statement for execution. */
PHP_METHOD(sqlite3, prepare)
{
@@ -414,8 +414,8 @@
}
/* }}} */
-/* {{{ proto sqlite3_result SQLite3::query(String Query)
- Returns true or false, for queries that return data it will return a
sqlite3_result object. */
+/* {{{ proto SQLite3Result SQLite3::query(String Query)
+ Returns true or false, for queries that return data it will return a
SQLite3Result object. */
PHP_METHOD(sqlite3, query)
{
php_sqlite3_db_object *db_obj;
@@ -530,7 +530,7 @@
}
/* }}} */
-/* {{{ proto sqlite3_result SQLite3::querySingle(String Query [, entire_row =
false])
+/* {{{ proto SQLite3Result SQLite3::querySingle(String Query [, entire_row =
false])
Returns a string of the first column, or an array of the entire row. */
PHP_METHOD(sqlite3, querySingle)
{
@@ -893,9 +893,9 @@
}
/* }}} */
-/* {{{ proto int SQLite3_stmt::paramCount() U
+/* {{{ proto int SQLite3Stmt::paramCount() U
Returns the number of parameters within the prepared statement. */
-PHP_METHOD(sqlite3_stmt, paramCount)
+PHP_METHOD(sqlite3stmt, paramCount)
{
php_sqlite3_stmt *stmt_obj;
zval *object = getThis();
@@ -909,9 +909,9 @@
}
/* }}} */
-/* {{{ proto bool SQLite3_stmt::close() U
+/* {{{ proto bool SQLite3Stmt::close() U
Closes the prepared statement. */
-PHP_METHOD(sqlite3_stmt, close)
+PHP_METHOD(sqlite3stmt, close)
{
php_sqlite3_stmt *stmt_obj;
zval *object = getThis();
@@ -927,9 +927,9 @@
}
/* }}} */
-/* {{{ proto bool SQLite3_stmt::reset() U
+/* {{{ proto bool SQLite3Stmt::reset() U
Reset the prepared statement to the state before it was executed, bindings
still remain. */
-PHP_METHOD(sqlite3_stmt, reset)
+PHP_METHOD(sqlite3stmt, reset)
{
php_sqlite3_stmt *stmt_obj;
zval *object = getThis();
@@ -947,9 +947,9 @@
}
/* }}} */
-/* {{{ proto bool SQLite3_stmt::clear() U
+/* {{{ proto bool SQLite3Stmt::clear() U
Clear all current bound parameters. */
-PHP_METHOD(sqlite3_stmt, clear)
+PHP_METHOD(sqlite3stmt, clear)
{
php_sqlite3_stmt *stmt_obj;
zval *object = getThis();
@@ -1013,9 +1013,9 @@
}
/* }}} */
-/* {{{ proto bool SQLite3_stmt::bindParam(int parameter_number, mixed
parameter [, int type])
+/* {{{ proto bool SQLite3Stmt::bindParam(int parameter_number, mixed parameter
[, int type])
Bind Paramater to a stmt variable. */
-PHP_METHOD(sqlite3_stmt, bindParam)
+PHP_METHOD(sqlite3stmt, bindParam)
{
php_sqlite3_stmt *stmt_obj;
zval *object = getThis();
@@ -1044,9 +1044,9 @@
}
/* }}} */
-/* {{{ proto bool SQLite3_stmt::bindValue(inte parameter_number, mixed
parameter [, int type])
+/* {{{ proto bool SQLite3Stmt::bindValue(inte parameter_number, mixed
parameter [, int type])
Bind Value of a parameter to a stmt variable. */
-PHP_METHOD(sqlite3_stmt, bindValue)
+PHP_METHOD(sqlite3stmt, bindValue)
{
php_sqlite3_stmt *stmt_obj;
zval *object = getThis();
@@ -1075,9 +1075,9 @@
}
/* }}} */
-/* {{{ proto SQLite3_result SQLite3_stmt::execute()
+/* {{{ proto SQLite3Result SQLite3Stmt::execute()
Executes a prepared statement and returns a result set object. */
-PHP_METHOD(sqlite3_stmt, execute)
+PHP_METHOD(sqlite3stmt, execute)
{
php_sqlite3_stmt *stmt_obj;
php_sqlite3_result *result;
@@ -1194,15 +1194,15 @@
}
/* }}} */
-/* {{{ proto int SQLite3_result::numColumns() U
+/* {{{ proto int SQLite3Result::numColumns() U
Number of columns in the result set. */
-PHP_METHOD(sqlite3_result, numColumns)
+PHP_METHOD(sqlite3result, numColumns)
{
php_sqlite3_result *result_obj;
zval *object = getThis();
result_obj = (php_sqlite3_result *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(result_obj-stmt_obj-initialised,
SQLite3_result)
+
[PHP-CVS] cvs: php-src /ext/sqlite3/tests sqlite3_22_loadextension.phpt
scottmacWed Aug 6 14:07:21 2008 UTC Modified files: /php-src/ext/sqlite3/tests sqlite3_22_loadextension.phpt Log: Fix test on Windows http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt diff -u php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.2 php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.3 --- php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.2 Fri Jul 25 21:34:15 2008 +++ php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt Wed Aug 6 14:07:20 2008 @@ -21,7 +21,7 @@ echo Done\n; ? --EXPECTF-- -Warning: SQLite3::loadExtension(): Unable to load extension at './myext.txt' in %s on line %d +Warning: SQLite3::loadExtension(): Unable to load extension at '.%emyext.txt' in %s on line %d bool(false) bool(true) 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/sqlite3/tests sqlite3_22_loadextension.phpt
scottmacWed Aug 6 14:07:37 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3/tests sqlite3_22_loadextension.phpt Log: MFH: Fix test on Windows http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt diff -u php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.1.2.2 php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.1.2.3 --- php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt:1.1.2.2 Sun Jul 27 00:05:36 2008 +++ php-src/ext/sqlite3/tests/sqlite3_22_loadextension.phpt Wed Aug 6 14:07:37 2008 @@ -21,7 +21,7 @@ echo Done\n; ? --EXPECTF-- -Warning: SQLite3::loadExtension(): Unable to load extension at './myext.txt' in %s on line %d +Warning: SQLite3::loadExtension(): Unable to load extension at '.%emyext.txt' in %s on line %d bool(false) bool(true) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fileinfo config.m4
derick Wed Aug 6 14:29:27 2008 UTC Modified files: /php-src/ext/fileinfo config.m4 Log: - Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h). http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.12r2=1.13diff_format=u Index: php-src/ext/fileinfo/config.m4 diff -u php-src/ext/fileinfo/config.m4:1.12 php-src/ext/fileinfo/config.m4:1.13 --- php-src/ext/fileinfo/config.m4:1.12 Fri Jul 25 09:16:09 2008 +++ php-src/ext/fileinfo/config.m4 Wed Aug 6 14:29:27 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.12 2008/07/25 09:16:09 jani Exp $ +dnl $Id: config.m4,v 1.13 2008/08/06 14:29:27 derick Exp $ dnl config.m4 for extension fileinfo PHP_ARG_ENABLE(fileinfo, for fileinfo support, @@ -9,7 +9,7 @@ libmagic_sources= \ libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \ libmagic/compress.c libmagic/fsmagic.c libmagic/funcs.c \ -libmagic/getopt_long.c libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ +libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ libmagic/readelf.c libmagic/softmagic.c PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,[EMAIL PROTECTED]@/libmagic) -- 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 /ext/fileinfo config.m4
derick Wed Aug 6 14:30:04 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/ext/fileinfo config.m4 Log: - MFH: Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.250r2=1.2027.2.547.2.965.2.251diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.250 php-src/NEWS:1.2027.2.547.2.965.2.251 --- php-src/NEWS:1.2027.2.547.2.965.2.250 Wed Aug 6 05:53:30 2008 +++ php-src/NEWSWed Aug 6 14:30:03 2008 @@ -9,6 +9,8 @@ - Fixed a bug that caused miscalculations with the last weekday of n month relative time string. (Derick) +- Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h). + (Derick) - Fixed bug #45696 (Not all DateTime methods allow method chaining). (Derick) - Fixed bug #45545 (DateInterval has a limitation of 4 chars for ISO durations). (Derick) http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.11.2.1r2=1.11.2.2diff_format=u Index: php-src/ext/fileinfo/config.m4 diff -u php-src/ext/fileinfo/config.m4:1.11.2.1 php-src/ext/fileinfo/config.m4:1.11.2.2 --- php-src/ext/fileinfo/config.m4:1.11.2.1 Fri Jul 25 09:16:22 2008 +++ php-src/ext/fileinfo/config.m4 Wed Aug 6 14:30:04 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.11.2.1 2008/07/25 09:16:22 jani Exp $ +dnl $Id: config.m4,v 1.11.2.2 2008/08/06 14:30:04 derick Exp $ dnl config.m4 for extension fileinfo PHP_ARG_ENABLE(fileinfo, for fileinfo support, @@ -9,7 +9,7 @@ libmagic_sources= \ libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \ libmagic/compress.c libmagic/fsmagic.c libmagic/funcs.c \ -libmagic/getopt_long.c libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ +libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ libmagic/readelf.c libmagic/softmagic.c PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,[EMAIL PROTECTED]@/libmagic) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fileinfo config.m4
derick Wed Aug 6 14:42:06 2008 UTC Modified files: /php-src/ext/fileinfo config.m4 Log: - Fixed bug #45636 (fileinfo ext duplicate strndup). http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.13r2=1.14diff_format=u Index: php-src/ext/fileinfo/config.m4 diff -u php-src/ext/fileinfo/config.m4:1.13 php-src/ext/fileinfo/config.m4:1.14 --- php-src/ext/fileinfo/config.m4:1.13 Wed Aug 6 14:29:27 2008 +++ php-src/ext/fileinfo/config.m4 Wed Aug 6 14:42:06 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.13 2008/08/06 14:29:27 derick Exp $ +dnl $Id: config.m4,v 1.14 2008/08/06 14:42:06 derick Exp $ dnl config.m4 for extension fileinfo PHP_ARG_ENABLE(fileinfo, for fileinfo support, @@ -15,7 +15,7 @@ PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,[EMAIL PROTECTED]@/libmagic) PHP_ADD_BUILD_DIR($ext_builddir/libmagic) - AC_CHECK_FUNCS([utimes]) + AC_CHECK_FUNCS([utimes strndup]) PHP_ADD_MAKEFILE_FRAGMENT fi -- 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 /ext/fileinfo config.m4
derick Wed Aug 6 14:42:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/ext/fileinfo config.m4 Log: - MFH: Fixed bug #45636 (fileinfo ext duplicate strndup). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.251r2=1.2027.2.547.2.965.2.252diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.251 php-src/NEWS:1.2027.2.547.2.965.2.252 --- php-src/NEWS:1.2027.2.547.2.965.2.251 Wed Aug 6 14:30:03 2008 +++ php-src/NEWSWed Aug 6 14:42:38 2008 @@ -12,6 +12,7 @@ - Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h). (Derick) - Fixed bug #45696 (Not all DateTime methods allow method chaining). (Derick) +- Fixed bug #45636 (fileinfo ext duplicate strndup). (Derick) - Fixed bug #45545 (DateInterval has a limitation of 4 chars for ISO durations). (Derick) - Fixed bug #45406 (session.serialize_handler declared by shared extension http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.11.2.2r2=1.11.2.3diff_format=u Index: php-src/ext/fileinfo/config.m4 diff -u php-src/ext/fileinfo/config.m4:1.11.2.2 php-src/ext/fileinfo/config.m4:1.11.2.3 --- php-src/ext/fileinfo/config.m4:1.11.2.2 Wed Aug 6 14:30:04 2008 +++ php-src/ext/fileinfo/config.m4 Wed Aug 6 14:42:38 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.11.2.2 2008/08/06 14:30:04 derick Exp $ +dnl $Id: config.m4,v 1.11.2.3 2008/08/06 14:42:38 derick Exp $ dnl config.m4 for extension fileinfo PHP_ARG_ENABLE(fileinfo, for fileinfo support, @@ -15,7 +15,7 @@ PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,[EMAIL PROTECTED]@/libmagic) PHP_ADD_BUILD_DIR($ext_builddir/libmagic) - AC_CHECK_FUNCS([utimes]) + AC_CHECK_FUNCS([utimes strndup]) PHP_ADD_MAKEFILE_FRAGMENT fi -- 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_2) / NEWS
Hannes Magnusson kirjoitti: On Wed, Aug 6, 2008 at 14:01, Derick Rethans [EMAIL PROTECTED] wrote: On Wed, 6 Aug 2008, Hannes Magnusson wrote: On Wed, Aug 6, 2008 at 13:30, Pierre Joye [EMAIL PROTECTED] wrote: hi Marcus, On Wed, Aug 6, 2008 at 1:07 PM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Stanislav, we should not mention the reported, unless they provided a patch, Except for security issue In which case, it should be noted that it is a security issue. No, we don't usually do that. There is no need to wake sleeping dogs. Security Enhancements and Fixes in PHP 5.2.6: * Fixed possible stack buffer overflow in the FastCGI SAPI identified by Andrei Nigmatulin. * Fixed integer overflow in printf() identified by Maksymilian Aciemowicz. * Fixed security issue detailed in CVE-2008-0599 identified by Ryan Permeh. * Fixed a safe_mode bypass in cURL identified by Maksymilian Arciemowicz. * Properly address incomplete multibyte chars inside escapeshellcmd() identified by Stefan Esser. * Upgraded bundled PCRE to version 7.6 IMO, mentioning the founder of the issue is totally useless. There shouldn't be any difference between regular bug or possibly security related bug. And I don't think we need to start mentioning every single bug reportees name, do we? Bug is a bug. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/fileinfo config.m4
Derick Rethans kirjoitti: derick Wed Aug 6 14:29:27 2008 UTC Modified files: /php-src/ext/fileinfo config.m4 Log: - Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h). http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.12r2=1.13diff_format=u Index: php-src/ext/fileinfo/config.m4 diff -u php-src/ext/fileinfo/config.m4:1.12 php-src/ext/fileinfo/config.m4:1.13 --- php-src/ext/fileinfo/config.m4:1.12 Fri Jul 25 09:16:09 2008 +++ php-src/ext/fileinfo/config.m4 Wed Aug 6 14:29:27 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.12 2008/07/25 09:16:09 jani Exp $ +dnl $Id: config.m4,v 1.13 2008/08/06 14:29:27 derick Exp $ dnl config.m4 for extension fileinfo PHP_ARG_ENABLE(fileinfo, for fileinfo support, @@ -9,7 +9,7 @@ libmagic_sources= \ libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \ libmagic/compress.c libmagic/fsmagic.c libmagic/funcs.c \ -libmagic/getopt_long.c libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ +libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ libmagic/readelf.c libmagic/softmagic.c PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,[EMAIL PROTECTED]@/libmagic) Why not remove the whole file too..? --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) /main/streams streams.c
Antony Dovgal kirjoitti: tony2001Wed Aug 6 09:03:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main/streams streams.c Log: MFH: increase context refcount before open() to avoid crash when open() fails and destroys the context [snip] Isn't this a bug fix which should be MFH'd to PHP_5_2 as well? --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) /main/streams streams.c
On 06.08.2008 19:19, Jani Taskinen wrote: Antony Dovgal kirjoitti: tony2001Wed Aug 6 09:03:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main/streams streams.c Log: MFH: increase context refcount before open() to avoid crash when open() fails and destroys the context [snip] Isn't this a bug fix which should be MFH'd to PHP_5_2 as well? No, this is a fix for my previous patch, which I didn't commit to 5_2 (as it's a bugfix and an improvement in the same time). -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/fileinfo config.m4
On Wed, 6 Aug 2008, Jani Taskinen wrote: Derick Rethans kirjoitti: derick Wed Aug 6 14:29:27 2008 UTC Modified files: /php-src/ext/fileinfoconfig.m4 Log: - Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h). http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.12r2=1.13diff_format=u Index: php-src/ext/fileinfo/config.m4 diff -u php-src/ext/fileinfo/config.m4:1.12 php-src/ext/fileinfo/config.m4:1.13 --- php-src/ext/fileinfo/config.m4:1.12 Fri Jul 25 09:16:09 2008 +++ php-src/ext/fileinfo/config.m4 Wed Aug 6 14:29:27 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.12 2008/07/25 09:16:09 jani Exp $ +dnl $Id: config.m4,v 1.13 2008/08/06 14:29:27 derick Exp $ dnl config.m4 for extension fileinfo PHP_ARG_ENABLE(fileinfo, for fileinfo support, @@ -9,7 +9,7 @@ libmagic_sources= \ libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \ libmagic/compress.c libmagic/fsmagic.c libmagic/funcs.c \ -libmagic/getopt_long.c libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ +libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ libmagic/readelf.c libmagic/softmagic.c PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,[EMAIL PROTECTED]@/libmagic) Why not remove the whole file too..? I will, along with file.c which is also not used. More cleanups are on the way... no worries. regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/intl/msgformat msgformat_attr.c
felipe Wed Aug 6 16:16:16 2008 UTC
Modified files:
/php-src/ext/intl/msgformat msgformat_attr.c
Log:
- Fixed crash msgfmt_get_pattern
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat_attr.c?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/intl/msgformat/msgformat_attr.c
diff -u php-src/ext/intl/msgformat/msgformat_attr.c:1.3
php-src/ext/intl/msgformat/msgformat_attr.c:1.4
--- php-src/ext/intl/msgformat/msgformat_attr.c:1.3 Tue Jul 22 22:11:21 2008
+++ php-src/ext/intl/msgformat/msgformat_attr.c Wed Aug 6 16:16:16 2008
@@ -37,7 +37,7 @@
// Parse parameters.
if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
O, object, MessageFormatter_ce_ptr ) == FAILURE )
{
- intl_error_set( INTL_DATA_ERROR_P(mfo),
U_ILLEGAL_ARGUMENT_ERROR,
+ intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
msgfmt_get_pattern: unable to parse input params, 0
TSRMLS_CC );
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/fileinfo config.m4
Derick Rethans kirjoitti: On Wed, 6 Aug 2008, Jani Taskinen wrote: Derick Rethans kirjoitti: derick Wed Aug 6 14:29:27 2008 UTC Modified files: /php-src/ext/fileinfoconfig.m4 Log: - Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h). http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.12r2=1.13diff_format=u Index: php-src/ext/fileinfo/config.m4 diff -u php-src/ext/fileinfo/config.m4:1.12 php-src/ext/fileinfo/config.m4:1.13 --- php-src/ext/fileinfo/config.m4:1.12 Fri Jul 25 09:16:09 2008 +++ php-src/ext/fileinfo/config.m4 Wed Aug 6 14:29:27 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.12 2008/07/25 09:16:09 jani Exp $ +dnl $Id: config.m4,v 1.13 2008/08/06 14:29:27 derick Exp $ dnl config.m4 for extension fileinfo PHP_ARG_ENABLE(fileinfo, for fileinfo support, @@ -9,7 +9,7 @@ libmagic_sources= \ libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \ libmagic/compress.c libmagic/fsmagic.c libmagic/funcs.c \ -libmagic/getopt_long.c libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ +libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ libmagic/readelf.c libmagic/softmagic.c PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,[EMAIL PROTECTED]@/libmagic) Why not remove the whole file too..? I will, along with file.c which is also not used. More cleanups are on the way... no worries. Okay, nevermind then.. :) --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_2) / NEWS
Hi! No, we don't usually do that. There is no need to wake sleeping dogs. Actually, there's a number of reported by in NEWS. Don't know why this one is so different. -- Stanislav Malyshev, Zend Software Architect [EMAIL PROTECTED] http://www.zend.com/ (408)253-8829 MSN: [EMAIL PROTECTED] -- 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/pdo_sqlite config.w32
auroraeosrose Wed Aug 6 16:56:36 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite config.w32
Log:
Stupid typo
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.3.2.7r2=1.6.2.1.2.3.2.8diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.7
php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.8
--- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.7 Wed Aug 6 16:47:38 2008
+++ php-src/ext/pdo_sqlite/config.w32 Wed Aug 6 16:56:35 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.6.2.1.2.3.2.7 2008/08/06 16:47:38 auroraeosrose Exp $
+// $Id: config.w32,v 1.6.2.1.2.3.2.8 2008/08/06 16:56:35 auroraeosrose Exp $
// vim:ft=javascript
ARG_WITH(pdo-sqlite, for pdo_sqlite support, no);
if (PHP_PDO_SQLITE != no) {
- EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c
sqlite_statement.c, null, /DSQLITE_THREADSAFE=1 /I +
configure_module_dirname + /../sqlite3/libsqlite /I +
configure_module_dirname);
+ EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c
sqlite_statement.c, null, /DSQLITE_THREADSAFE=1 /I +
configure_module_dirname + /../sqlite3/libsqlite /I +
configure_module_dirname);
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
// If pdo_sqlite is static, and sqlite3 is also static, then we don't
add a second copy of the sqlite3 libs
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.w32
auroraeosrose Wed Aug 6 16:57:08 2008 UTC
Modified files:
/php-src/ext/pdo_sqlite config.w32
Log:
Stupid typo
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.14
php-src/ext/pdo_sqlite/config.w32:1.15
--- php-src/ext/pdo_sqlite/config.w32:1.14 Wed Aug 6 16:48:19 2008
+++ php-src/ext/pdo_sqlite/config.w32 Wed Aug 6 16:57:08 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.14 2008/08/06 16:48:19 auroraeosrose Exp $
+// $Id: config.w32,v 1.15 2008/08/06 16:57:08 auroraeosrose Exp $
// vim:ft=javascript
ARG_WITH(pdo-sqlite, for pdo_sqlite support, no);
if (PHP_PDO_SQLITE != no) {
- EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c
sqlite_statement.c, null, /DSQLITE_THREADSAFE=1 /I +
configure_module_dirname + /../sqlite3/libsqlite /I +
configure_module_dirname);
+ EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c
sqlite_statement.c, null, /DSQLITE_THREADSAFE=1 /I +
configure_module_dirname + /../sqlite3/libsqlite /I +
configure_module_dirname);
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
// If pdo_sqlite is static, and sqlite3 is also static, then we don't
add a second copy of the sqlite3 libs
--
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 spl_iterators.c
Hi,
was this issue dealt with?
regards,
Lukas
On 30.07.2008, at 02:46, Marcus Boerger wrote:
Hello Dmitry,
please revert. An array has no natural string representation. So we
do
want the message here as much as we see it in comparable
situations. This
is a design decision, I actually played with yout version and did not
like it really.
marcus
Tuesday, July 29, 2008, 1:50:05 PM, you wrote:
dmitry Tue Jul 29 11:50:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_iterators.c
Log:
Removed warning
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.10r2=1.73.2.30.2.28.2.11diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.10
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.11
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.10 Sat
Jul 19 19:45:55 2008
+++ php-src/ext/spl/spl_iterators.c Tue Jul 29 11:50:05 2008
@@ -16,7 +16,7 @@
+
--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.10 2008/07/19 19:45:55
colder Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.11 2008/07/29 11:50:05
dmitry Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -924,7 +924,12 @@
php_set_error_handling(EH_THROW,
spl_ce_UnexpectedValueException TSRMLS_CC);
RETVAL_ZVAL(*data, 1, 0);
- convert_to_string(return_value);
+ if (Z_TYPE_P(return_value) == IS_ARRAY) {
+ zval_dtor(return_value);
+ ZVAL_STRINGL(return_value, Array,
sizeof(Array)-1, 1);
+ } else {
+ convert_to_string(return_value);
+ }
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
}
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Lukas Kahwe Smith
[EMAIL PROTECTED]
--
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/mysql php_mysql.c php_mysql_structs.h
andrey Wed Aug 6 19:25:04 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c php_mysql_structs.h
Log:
Re-add mysql_set_charset. Missed during introduction of mysqlnd. Exists in
HEAD, thus no merge
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.25r2=1.213.2.6.2.16.2.26diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.25
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.26
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.25 Fri Jul 25 08:23:06 2008
+++ php-src/ext/mysql/php_mysql.c Wed Aug 6 19:25:03 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.25 2008/07/25 08:23:06 dmitry Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.26 2008/08/06 19:25:03 andrey Exp $ */
/* TODO:
*
@@ -192,7 +192,9 @@
#endif
PHP_FE(mysql_info,
NULL)
-
+#ifdef MYSQL_HAS_SET_CHARSET
+ PHP_FE(mysql_set_charset,
NULL)
+#endif
/* for downwards compatability */
PHP_FALIAS(mysql, mysql_db_query,
NULL)
PHP_FALIAS(mysql_fieldname, mysql_field_name, NULL)
@@ -1242,6 +1244,36 @@
/* }}} */
#endif
+#ifdef MYSQL_HAS_SET_CHARSET
+/* {{{ proto bool mysql_set_charset(string csname [, int link_identifier])
+ sets client character set */
+PHP_FUNCTION(mysql_set_charset)
+{
+ zval *mysql_link = NULL;
+ char *csname;
+ int id = -1, csname_len;
+ php_mysql_conn *mysql;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|r, csname,
csname_len, mysql_link) == FAILURE) {
+ return;
+ }
+
+ if (ZEND_NUM_ARGS() == 1) {
+ id =
php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+ CHECK_LINK(id);
+ }
+
+ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
MySQL-Link, le_link, le_plink);
+
+ if (!mysql_set_character_set(mysql-conn, csname)) {
+ RETURN_TRUE;
+ } else {
+ RETURN_FALSE;
+ }
+}
+/* }}} */
+#endif
+
#ifndef NETWARE/* The below two functions not supported on
NetWare */
#if MYSQL_VERSION_ID 4
/* {{{ proto bool mysql_create_db(string database_name [, int link_identifier])
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql_structs.h?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/mysql/php_mysql_structs.h
diff -u php-src/ext/mysql/php_mysql_structs.h:1.1.2.5
php-src/ext/mysql/php_mysql_structs.h:1.1.2.6
--- php-src/ext/mysql/php_mysql_structs.h:1.1.2.5 Mon Jul 21 12:58:51 2008
+++ php-src/ext/mysql/php_mysql_structs.h Wed Aug 6 19:25:03 2008
@@ -18,7 +18,7 @@
*/
-/* $Id: php_mysql_structs.h,v 1.1.2.5 2008/07/21 12:58:51 andrey Exp $ */
+/* $Id: php_mysql_structs.h,v 1.1.2.6 2008/08/06 19:25:03 andrey Exp $ */
#ifndef PHP_MYSQL_STRUCTS_H
#define PHP_MYSQL_STRUCTS_H
@@ -49,7 +49,7 @@
#define MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR
#endif
-#if (MYSQL_VERSION_ID = 40113 MYSQL_VERSION_ID 5) ||
MYSQL_VERSION_ID = 50007 || MYSQL_USE_MYSQLND
+#if (MYSQL_VERSION_ID = 40113 MYSQL_VERSION_ID 5) ||
MYSQL_VERSION_ID = 50007 || defined(MYSQL_USE_MYSQLND)
#define MYSQL_HAS_SET_CHARSET
#endif
@@ -106,6 +106,9 @@
PHP_FUNCTION(mysql_thread_id);
PHP_FUNCTION(mysql_client_encoding);
PHP_FUNCTION(mysql_ping);
+#ifdef MYSQL_HAS_SET_CHARSET
+PHP_FUNCTION(mysql_set_charset);
+#endif
ZEND_BEGIN_MODULE_GLOBALS(mysql)
long default_link;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.RELEASE_PROCESS
lsmith Wed Aug 6 19:34:35 2008 UTC Modified files: /php-srcREADME.RELEASE_PROCESS Log: updated in regards to windows, added some clarifications and addition tipps http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.5r2=1.6diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.5 php-src/README.RELEASE_PROCESS:1.6 --- php-src/README.RELEASE_PROCESS:1.5 Fri Mar 14 21:52:09 2008 +++ php-src/README.RELEASE_PROCESS Wed Aug 6 19:34:35 2008 @@ -2,18 +2,35 @@ PHP Release Process === -Rolling a release candidate +General notes and tipps +--- + +1. Do not release on Fridays, Saturdays or Sundays +because the sysadmins can not upgrade stuff then. + +2. Package the day before a release. So if the release is to be on Thursday, +package on Wednesday. + +3. Ensure that Windows builds will work before packaging + +4. Follow all steps to the letter. When unclear ask previous RM's (Derick/Ilia) +before proceeding. Ideally make sure that for the first releases one of the +previous RM's is around to answer questions. For the steps related to the +php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand. + +Rolling a non stable release (alpha/beta/RC) --- 1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.) 2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``. +Do not use abbreviations for alpha and beta. 3. Commit those changes -4. tag the repository with ``cvs tag php_4_4_1RC1`` (of course, you need to -change that to the version you're rolling an RC for). When making 5.X release, -you need to tag the Zend directory separately!! +4. tag the repository with the version f.e. ``cvs tag php_4_4_1RC1`` +(of course, you need to change that to the version you're rolling an RC for). +When making 5.X release, you need to tag the Zend directory separately!! 5. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS`` again, to the **next** version. F.e. if the release @@ -26,7 +43,7 @@ 7. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 branch if you're rolling 4.4.x releases). -8. You do not have to update the tree, but ofcourse you can with ``cvs up -dP``. +8. You do not have to update the tree, but of course you can with ``cvs up -dP``. 9. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure and build two tarballs (one gz and one bz2). @@ -38,11 +55,11 @@ 11. Now the RC can be found on http://downloads.php.net/yourname, f.e. http://downloads.php.net/derick/ -12. Once the release has been tagged, contact Edin Kadribasic (edink @ usual -php e-mail) so that Windows binaries can be created. Once those are made, they -should be placed into the same directory as the source snapshots. +12. Once the release has been tagged, contact the PHP Windows development team +([EMAIL PROTECTED]) so that Windows binaries can be created. Once +those are made, they should be placed into the same directory as the source snapshots. -Getting the Release Candidate out there +Getting the non stable release announced --- 1. Send an email (see example here: http://news.php.net/php.internals/19486) @@ -75,7 +92,7 @@ 1. Update in ``php-bugs-web/include/functions.inc`` the ``show_version_option`` function to include the new RC and commit. -2. Run the bumpRelease script for phpweb +2. Run the bumpRelease script for phpweb in your local checkout a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4) @@ -89,7 +106,7 @@ a. ``cvs commit include/version.inc include/releases.inc`` -Rolling a release +Rolling a stable release - 1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.) @@ -100,9 +117,9 @@ 4. Commit those changes -5. tag the repository with ``cvs tag php_4_4_1`` (of course, you need to -change that to the version you're rolling an RC for). When making 5.X release, -you need to tag the Zend directory separately!! +5. tag the repository with the version f.e. ``cvs tag php_4_4_1`` +(of course, you need to change that to the version you're rolling an RC for). +When making 5.X release, you need to tag the Zend directory separately!! 6. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate @@ -114,26 +131,26 @@ 8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 branch if you're rolling 4.4.x releases). -9. You do not have to update the tree, but ofcourse you can with ``cvs up -dP``. +9. You do not have to update the tree, but of course you can with ``cvs up -dP``. 10. run: ``./makedist php 4.4.1``,
[PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS
lsmith Wed Aug 6 19:35:20 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.RELEASE_PROCESS Log: MFH http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.5r2=1.1.2.6diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.1.2.5 php-src/README.RELEASE_PROCESS:1.1.2.6 --- php-src/README.RELEASE_PROCESS:1.1.2.5 Fri Mar 14 21:52:47 2008 +++ php-src/README.RELEASE_PROCESS Wed Aug 6 19:35:20 2008 @@ -2,18 +2,35 @@ PHP Release Process === -Rolling a release candidate +General notes and tipps +--- + +1. Do not release on Fridays, Saturdays or Sundays +because the sysadmins can not upgrade stuff then. + +2. Package the day before a release. So if the release is to be on Thursday, +package on Wednesday. + +3. Ensure that Windows builds will work before packaging + +4. Follow all steps to the letter. When unclear ask previous RM's (Derick/Ilia) +before proceeding. Ideally make sure that for the first releases one of the +previous RM's is around to answer questions. For the steps related to the +php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand. + +Rolling a non stable release (alpha/beta/RC) --- 1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.) 2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``. +Do not use abbreviations for alpha and beta. 3. Commit those changes -4. tag the repository with ``cvs tag php_4_4_1RC1`` (of course, you need to -change that to the version you're rolling an RC for). When making 5.X release, -you need to tag the Zend directory separately!! +4. tag the repository with the version f.e. ``cvs tag php_4_4_1RC1`` +(of course, you need to change that to the version you're rolling an RC for). +When making 5.X release, you need to tag the Zend directory separately!! 5. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS`` again, to the **next** version. F.e. if the release @@ -26,7 +43,7 @@ 7. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 branch if you're rolling 4.4.x releases). -8. You do not have to update the tree, but ofcourse you can with ``cvs up -dP``. +8. You do not have to update the tree, but of course you can with ``cvs up -dP``. 9. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure and build two tarballs (one gz and one bz2). @@ -38,11 +55,11 @@ 11. Now the RC can be found on http://downloads.php.net/yourname, f.e. http://downloads.php.net/derick/ -12. Once the release has been tagged, contact Edin Kadribasic (edink @ usual -php e-mail) so that Windows binaries can be created. Once those are made, they -should be placed into the same directory as the source snapshots. +12. Once the release has been tagged, contact the PHP Windows development team +([EMAIL PROTECTED]) so that Windows binaries can be created. Once +those are made, they should be placed into the same directory as the source snapshots. -Getting the Release Candidate out there +Getting the non stable release announced --- 1. Send an email (see example here: http://news.php.net/php.internals/19486) @@ -51,11 +68,11 @@ either the next RC, or the final release. 2. Send an email (see example here http://news.php.net/php.qa/26069) **To** [EMAIL PROTECTED] and **CC** [EMAIL PROTECTED] [EMAIL PROTECTED] and **CC** [EMAIL PROTECTED] This email is to notify the selected projects about a new RC so that they can make sure their projects keep working. Make sure that you have been setup -as a moderator for [EMAIL PROTECTED] by having someone (Wez, -Derick etc.) run the following commands for you: +as a moderator for [EMAIL PROTECTED] by having someone (Wez, +Derick) run the following commands for you: ``ssh lists.php.net`` @@ -75,7 +92,7 @@ 1. Update in ``php-bugs-web/include/functions.inc`` the ``show_version_option`` function to include the new RC and commit. -2. Run the bumpRelease script for phpweb +2. Run the bumpRelease script for phpweb in your local checkout a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4) @@ -89,7 +106,7 @@ a. ``cvs commit include/version.inc include/releases.inc`` -Rolling a release +Rolling a stable release - 1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.) @@ -100,9 +117,9 @@ 4. Commit those changes -5. tag the repository with ``cvs tag php_4_4_1`` (of course, you need to -change that to the version you're rolling an RC for). When making 5.X release, -you need to tag the Zend directory separately!! +5. tag the repository with the version f.e. ``cvs tag php_4_4_1`` +(of course, you need to change that to the version you're
Re: [PHP-CVS] cvs: php-src / README.RELEASE_PROCESS
Hi! +General notes and tipps I think you have a typpo here ;) -- Stanislav Malyshev, Zend Software Architect [EMAIL PROTECTED] http://www.zend.com/ (408)253-8829 MSN: [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / README.RELEASE_PROCESS
On 06.08.2008, at 21:37, Stanislav Malyshev wrote: Hi! +General notes and tipps I think you have a typpo here ;) Bah, why does english have to be different than german? :) regards, Lukas Kahwe Smith [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.RELEASE_PROCESS
lsmith Wed Aug 6 19:41:54 2008 UTC Modified files: /php-srcREADME.RELEASE_PROCESS Log: lets me all american :) http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.6r2=1.7diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.6 php-src/README.RELEASE_PROCESS:1.7 --- php-src/README.RELEASE_PROCESS:1.6 Wed Aug 6 19:34:35 2008 +++ php-src/README.RELEASE_PROCESS Wed Aug 6 19:41:54 2008 @@ -2,7 +2,7 @@ PHP Release Process === -General notes and tipps +General notes and tips --- 1. Do not release on Fridays, Saturdays or Sundays @@ -195,7 +195,7 @@ a. security fixes, - b. changes in behaviour (whether due to a bug fix or not) + b. changes in behavior (whether due to a bug fix or not) 7. Add a short notice to phpweb stating that there is a new release, and highlight the major important things (security fixes) and when it is important -- 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) / README.RELEASE_PROCESS
lsmith Wed Aug 6 19:42:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.RELEASE_PROCESS Log: MFH http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.6r2=1.1.2.7diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.1.2.6 php-src/README.RELEASE_PROCESS:1.1.2.7 --- php-src/README.RELEASE_PROCESS:1.1.2.6 Wed Aug 6 19:35:20 2008 +++ php-src/README.RELEASE_PROCESS Wed Aug 6 19:42:01 2008 @@ -2,7 +2,7 @@ PHP Release Process === -General notes and tipps +General notes and tips --- 1. Do not release on Fridays, Saturdays or Sundays @@ -195,7 +195,7 @@ a. security fixes, - b. changes in behaviour (whether due to a bug fix or not) + b. changes in behavior (whether due to a bug fix or not) 7. Add a short notice to phpweb stating that there is a new release, and highlight the major important things (security fixes) and when it is important -- 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/session session.c
kalle Wed Aug 6 21:28:39 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sessionsession.c
Log:
Backport fix for #45406 - Patch by oleg dot grenrus at dynamoid dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.43r2=1.417.2.8.2.44diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.43
php-src/ext/session/session.c:1.417.2.8.2.44
--- php-src/ext/session/session.c:1.417.2.8.2.43Wed Jun 11 07:46:43 2008
+++ php-src/ext/session/session.c Wed Aug 6 21:28:38 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.417.2.8.2.43 2008/06/11 07:46:43 dmitry Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.44 2008/08/06 21:28:38 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1925,6 +1925,21 @@
}
}
+ if (PS(serializer) == NULL) {
+ char *value;
+
+ value = zend_ini_string(session.serialize_handler,
sizeof(session.serialize_handler), 0);
+ if (value) {
+ PS(serializer) = _php_find_ps_serializer(value
TSRMLS_CC);
+ }
+ }
+
+ if (PS(mod) == NULL || PS(serializer) == NULL) {
+ /* current status is unusable */
+ PS(session_status) = php_session_disabled;
+ return SUCCESS;
+ }
+
if (PS(auto_start)) {
php_session_start(TSRMLS_C);
}
--
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
kalle Wed Aug 6 21:31:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Backport fix for #45406 to PHP_5_2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.252r2=1.2027.2.547.2.965.2.253diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.252 php-src/NEWS:1.2027.2.547.2.965.2.253 --- php-src/NEWS:1.2027.2.547.2.965.2.252 Wed Aug 6 14:42:38 2008 +++ php-src/NEWSWed Aug 6 21:31:45 2008 @@ -15,8 +15,6 @@ - Fixed bug #45636 (fileinfo ext duplicate strndup). (Derick) - Fixed bug #45545 (DateInterval has a limitation of 4 chars for ISO durations). (Derick) -- Fixed bug #45406 (session.serialize_handler declared by shared extension - fails). (Kalle, oleg dot grenrus at dynamoid dot com) - Fixed bug #44100 (Inconsistent handling of static array declarations with duplicate keys). (Dmitry) - Fixed bug #43008 (php://filter uris ignore url encoded filternames and can't -- 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
kalle Wed Aug 6 21:33:14 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Backport #45406 (session.serialize_handler declared by shared extension fails) to PHP_5_2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1191r2=1.2027.2.547.2.1192diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1191 php-src/NEWS:1.2027.2.547.2.1192 --- php-src/NEWS:1.2027.2.547.2.1191Tue Aug 5 21:48:18 2008 +++ php-src/NEWSWed Aug 6 21:33:13 2008 @@ -32,6 +32,8 @@ (crrodriguez at suse dot de) - Fixed bug #45423 (fastcgi parent process doesn't invoke php_module_shutdown before shutdown) (basant dot kukreja at sun dot com) +- Fixed bug #45406 (session.serialize_handler declared by shared extension + fails). (Kalle, oleg dot grenrus at dynamoid dot com) - Fixed bug #45352 (Segmentation fault because of tick function on second request). (Dmitry) - Fixed bug #45312 (Segmentation fault on second request for array functions). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.RELEASE_PROCESS
lsmith Wed Aug 6 21:49:37 2008 UTC Modified files: /php-srcREADME.RELEASE_PROCESS Log: separate tagging of the zend dir should not be necessary, fix reST formatting of titles http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.7r2=1.8diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.7 php-src/README.RELEASE_PROCESS:1.8 --- php-src/README.RELEASE_PROCESS:1.7 Wed Aug 6 19:41:54 2008 +++ php-src/README.RELEASE_PROCESS Wed Aug 6 21:49:37 2008 @@ -3,7 +3,7 @@ === General notes and tips +-- 1. Do not release on Fridays, Saturdays or Sundays because the sysadmins can not upgrade stuff then. @@ -18,8 +18,10 @@ previous RM's is around to answer questions. For the steps related to the php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand. +5. Verify the tags to be extra sure everything was tagged properly. + Rolling a non stable release (alpha/beta/RC) + 1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.) @@ -30,7 +32,6 @@ 4. tag the repository with the version f.e. ``cvs tag php_4_4_1RC1`` (of course, you need to change that to the version you're rolling an RC for). -When making 5.X release, you need to tag the Zend directory separately!! 5. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS`` again, to the **next** version. F.e. if the release @@ -60,7 +61,7 @@ those are made, they should be placed into the same directory as the source snapshots. Getting the non stable release announced + 1. Send an email (see example here: http://news.php.net/php.internals/19486) **To** [EMAIL PROTECTED] and [EMAIL PROTECTED] lists @@ -107,7 +108,7 @@ a. ``cvs commit include/version.inc include/releases.inc`` Rolling a stable release -- + 1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.) @@ -148,7 +149,7 @@ ([EMAIL PROTECTED]) to prepare the installer packages for Win32. Getting the stable release announced -- + 1. Run the bumpRelease script for phpweb on your local checkout -- 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) / README.RELEASE_PROCESS
lsmith Wed Aug 6 21:49:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.RELEASE_PROCESS Log: MFH http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.7r2=1.1.2.8diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.1.2.7 php-src/README.RELEASE_PROCESS:1.1.2.8 --- php-src/README.RELEASE_PROCESS:1.1.2.7 Wed Aug 6 19:42:01 2008 +++ php-src/README.RELEASE_PROCESS Wed Aug 6 21:49:47 2008 @@ -3,7 +3,7 @@ === General notes and tips +-- 1. Do not release on Fridays, Saturdays or Sundays because the sysadmins can not upgrade stuff then. @@ -18,8 +18,10 @@ previous RM's is around to answer questions. For the steps related to the php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand. +5. Verify the tags to be extra sure everything was tagged properly. + Rolling a non stable release (alpha/beta/RC) + 1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.) @@ -30,7 +32,6 @@ 4. tag the repository with the version f.e. ``cvs tag php_4_4_1RC1`` (of course, you need to change that to the version you're rolling an RC for). -When making 5.X release, you need to tag the Zend directory separately!! 5. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS`` again, to the **next** version. F.e. if the release @@ -60,7 +61,7 @@ those are made, they should be placed into the same directory as the source snapshots. Getting the non stable release announced + 1. Send an email (see example here: http://news.php.net/php.internals/19486) **To** [EMAIL PROTECTED] and [EMAIL PROTECTED] lists @@ -107,7 +108,7 @@ a. ``cvs commit include/version.inc include/releases.inc`` Rolling a stable release -- + 1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.) @@ -148,7 +149,7 @@ ([EMAIL PROTECTED]) to prepare the installer packages for Win32. Getting the stable release announced -- + 1. Run the bumpRelease script for phpweb on your local checkout -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
