[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Apr 21 01:32:40 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3379r2=1.3380diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3379 php-src/ChangeLog:1.3380 --- php-src/ChangeLog:1.3379Mon Apr 20 01:32:35 2009 +++ php-src/ChangeLog Tue Apr 21 01:32:39 2009 @@ -1,3 +1,218 @@ +2009-04-20 Jani Taskinen jani.taski...@sci.fi + +* ext/mbstring/libmbfl/tests/strwidth.c + ext/mbstring/libmbfl/tests/conv_kana.tests/Makefile.am + ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp + ext/mbstring/oniguruma/AUTHORS + ext/mbstring/oniguruma/enc/gb18030.c: + MFB: missed these + +* ext/mbstring/config.m4 + ext/mbstring/config.w32 + ext/mbstring/mbstring.c + ext/mbstring/mbstring.h + ext/mbstring/php_mbregex.c + ext/mbstring/php_unicode.c + ext/mbstring/libmbfl/AUTHORS + ext/mbstring/libmbfl/Makefile.am + ext/mbstring/libmbfl/configure.in + ext/mbstring/libmbfl/libmbfl.dsp + ext/mbstring/libmbfl/libmbfl.sln + ext/mbstring/libmbfl/libmbfl.vcproj + ext/mbstring/libmbfl/mbfl.rc + ext/mbstring/libmbfl/filters/Makefile.am + ext/mbstring/libmbfl/filters/Makefile.bcc32 + ext/mbstring/libmbfl/filters/mbfilter_cp1254.c + ext/mbstring/libmbfl/filters/mbfilter_cp1254.h + ext/mbstring/libmbfl/filters/mbfilter_cp850.c + ext/mbstring/libmbfl/filters/mbfilter_cp850.h + ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c + ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c + ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h + ext/mbstring/libmbfl/filters/mbfilter_jis.c + ext/mbstring/libmbfl/filters/mbfilter_jis.h + ext/mbstring/libmbfl/filters/mbfilter_koi8u.c + ext/mbstring/libmbfl/filters/mbfilter_koi8u.h + ext/mbstring/libmbfl/filters/unicode_table_cp1254.h + ext/mbstring/libmbfl/filters/unicode_table_cp850.h + ext/mbstring/libmbfl/filters/unicode_table_jis.h + ext/mbstring/libmbfl/filters/unicode_table_koi8u.h + ext/mbstring/libmbfl/mbfl/Makefile.am + ext/mbstring/libmbfl/mbfl/Makefile.bcc32 + ext/mbstring/libmbfl/mbfl/mbfilter.h + ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h + ext/mbstring/libmbfl/mbfl/mbfilter_pass.h + ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h + ext/mbstring/libmbfl/mbfl/mbfl_convert.c + ext/mbstring/libmbfl/mbfl/mbfl_encoding.c + ext/mbstring/libmbfl/mbfl/mbfl_encoding.h + ext/mbstring/libmbfl/mbfl/mbfl_ident.c + ext/mbstring/libmbfl/mbfl/mbfl_language.c + ext/mbstring/libmbfl/mbfl/mbfl_language.h + ext/mbstring/libmbfl/nls/Makefile.am + ext/mbstring/libmbfl/nls/Makefile.bcc32 + ext/mbstring/libmbfl/nls/nls_ua.c + ext/mbstring/libmbfl/nls/nls_ua.h + ext/mbstring/libmbfl/tests/Makefile.am + ext/mbstring/libmbfl/tests/conv_encoding.c + ext/mbstring/libmbfl/tests/conv_kana.c + ext/mbstring/libmbfl/tests/strcut.c + ext/mbstring/libmbfl/tests/conv_encoding.tests/Makefile.am + ext/mbstring/libmbfl/tests/conv_encoding.tests/cp51932_cp50220raw.exp + ext/mbstring/libmbfl/tests/conv_encoding.tests/ujis_sjis.exp + ext/mbstring/libmbfl/tests/conv_encoding.tests/utf8_sjis.exp + ext/mbstring/libmbfl/tests/strcut.tests/Makefile.am + ext/mbstring/libmbfl/tests/strcut.tests/iso2022jp.exp + ext/mbstring/libmbfl/tests/strcut.tests/ujis.exp + ext/mbstring/libmbfl/tests/strcut.tests/utf8.exp + ext/mbstring/libmbfl/tests/strwidth.tests/Makefile.am + ext/mbstring/libmbfl/tests/strwidth.tests/conv_encoding.c + ext/mbstring/libmbfl/tests/strwidth.tests/conv_kana.c + ext/mbstring/libmbfl/tests/strwidth.tests/strwidth.exp + ext/mbstring/libmbfl/tests/strwidth.tests/conv_encoding.tests/Makefile.am + ext/mbstring/libmbfl/tests/strwidth.tests/conv_encoding.tests/cp51932_cp50220raw.exp + ext/mbstring/libmbfl/tests/strwidth.tests/conv_encoding.tests/ujis_sjis.exp + ext/mbstring/libmbfl/tests/strwidth.tests/conv_encoding.tests/utf8_sjis.exp + ext/mbstring/libmbfl/tests/strwidth.tests/conv_kana.tests/Makefile.am + ext/mbstring/libmbfl/tests/strwidth.tests/conv_kana.tests/conv_kana.exp + ext/mbstring/oniguruma/COPYING + ext/mbstring/oniguruma/HISTORY + ext/mbstring/oniguruma/README + ext/mbstring/oniguruma/README.ja + ext/mbstring/oniguruma/config.h.in + ext/mbstring/oniguruma/index.html + ext/mbstring/oniguruma/onigcmpt200.h + ext/mbstring/oniguruma/oniggnu.h + ext/mbstring/oniguruma/oniguruma.h + ext/mbstring/oniguruma/regcomp.c + ext/mbstring/oniguruma/regenc.c + ext/mbstring/oniguruma/regenc.h + ext/mbstring/oniguruma/regerror.c + ext/mbstring/oniguruma/regexec.c + ext/mbstring/oniguruma/regext.c + ext/mbstring/oniguruma/reggnu.c +
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard exec.c
hi Ilia,
It is not related to ZTS but to the new output API in HEAD. For the
new struct, see main/php_output.h:126).
Cheers,
On Sun, Apr 19, 2009 at 4:59 PM, Ilia Alshanetsky il...@php.net wrote:
iliaa Sun Apr 19 14:59:52 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard exec.c
Log:
Fixed bug #47937 (system() calls sapi_flush() regardless of output
buffering)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1.2.15r2=1.113.2.3.2.1.2.16diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.15
php-src/ext/standard/exec.c:1.113.2.3.2.1.2.16
--- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.15 Wed Dec 31 11:15:45
2008
+++ php-src/ext/standard/exec.c Sun Apr 19 14:59:52 2009
@@ -16,7 +16,7 @@
| Ilia Alshanetsky il...@php.net |
+--+
*/
-/* $Id: exec.c,v 1.113.2.3.2.1.2.15 2008/12/31 11:15:45 sebastian Exp $ */
+/* $Id: exec.c,v 1.113.2.3.2.1.2.16 2009/04/19 14:59:52 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -131,7 +131,9 @@
if (type == 1) {
PHPWRITE(buf, bufl);
- sapi_flush(TSRMLS_C);
+ if (OG(ob_nesting_level) 1) {
+ sapi_flush(TSRMLS_C);
+ }
} else if (type == 2) {
/* strip trailing whitespaces */
l = bufl;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
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] cvs: php-src /ext/standard dns_win32.c
pajoye Mon Apr 20 06:35:43 2009 UTC
Modified files:
/php-src/ext/standard dns_win32.c
Log:
- nuke unused vars
- silent warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.7
php-src/ext/standard/dns_win32.c:1.8
--- php-src/ext/standard/dns_win32.c:1.7Tue Mar 10 23:39:39 2009
+++ php-src/ext/standard/dns_win32.cMon Apr 20 06:35:43 2009
@@ -97,7 +97,7 @@
int type = DNS_TYPE_MX;
DNS_STATUS status; /* Return value of DnsQuery_A()
function */
- PDNS_RECORD pResult, pRec; /* Pointer to DNS_RECORD
structure */
+ PDNS_RECORD pResult; /* Pointer to DNS_RECORD structure */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, hostname,
hostname_len, rectype, rectype_len) == FAILURE) {
return;
@@ -191,7 +191,7 @@
case DNS_TYPE_HINFO:
case DNS_TYPE_TEXT:
{
- int i = 0;
+ DWORD i = 0;
DNS_TXT_DATA *data_txt = pRec-Data.TXT;
DWORD count = data_txt-dwStringCount;
char *txt, *txt_dst;
@@ -302,7 +302,6 @@
zval *authns = NULL, *addtl = NULL;
int type, type_to_fetch, first_query = 1, store_results = 1;
int addtl_recs = 0;
- IN_ADDR ipaddr;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|lzz,
hostname, hostname_len, type_param, authns, addtl) == FAILURE) {
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard exec.c
pajoye Mon Apr 20 06:36:05 2009 UTC
Modified files:
/php-src/ext/standard exec.c
Log:
- use the new OB API (and fix build)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.141r2=1.142diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.141 php-src/ext/standard/exec.c:1.142
--- php-src/ext/standard/exec.c:1.141 Sun Apr 19 15:00:11 2009
+++ php-src/ext/standard/exec.c Mon Apr 20 06:36:05 2009
@@ -16,7 +16,7 @@
| Ilia Alshanetsky il...@php.net |
+--+
*/
-/* $Id: exec.c,v 1.141 2009/04/19 15:00:11 iliaa Exp $ */
+/* $Id: exec.c,v 1.142 2009/04/20 06:36:05 pajoye Exp $ */
#include stdio.h
#include php.h
@@ -111,8 +111,9 @@
}
if (type == 1) {
+ int ob_level;
PHPWRITE(buf, bufl);
- if (OG(ob_nesting_level) 1) {
+ if
((php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL, ob_level
TSRMLS_CC) == SUCCESS) ob_level 1) {
sapi_flush(TSRMLS_C);
}
} else if (type == 2) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard uniqid.c
pajoye Mon Apr 20 06:55:11 2009 UTC Modified files: /php-src/ext/standard uniqid.c Log: - silent compiler warning http://cvs.php.net/viewvc.cgi/php-src/ext/standard/uniqid.c?r1=1.54r2=1.55diff_format=u Index: php-src/ext/standard/uniqid.c diff -u php-src/ext/standard/uniqid.c:1.54 php-src/ext/standard/uniqid.c:1.55 --- php-src/ext/standard/uniqid.c:1.54 Thu Mar 26 20:02:29 2009 +++ php-src/ext/standard/uniqid.c Mon Apr 20 06:55:11 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: uniqid.c,v 1.54 2009/03/26 20:02:29 felipe Exp $ */ +/* $Id: uniqid.c,v 1.55 2009/04/20 06:55:11 pajoye Exp $ */ #include php.h @@ -27,6 +27,7 @@ #include string.h #include errno.h +#include unicode/ustdio.h #include stdio.h #ifdef PHP_WIN32 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] hello
*** WORM_MYTOB.AO was detected in the file (file.zip). The following action has been taken: remove *** The message cannot be represented in 7-bit ASCII encoding and has been sent as a binary attachment. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams cast.c
pajoye Mon Apr 20 08:28:14 2009 UTC
Modified files:
/php-src/main/streams cast.c
Log:
- silent compiler warning
http://cvs.php.net/viewvc.cgi/php-src/main/streams/cast.c?r1=1.22r2=1.23diff_format=u
Index: php-src/main/streams/cast.c
diff -u php-src/main/streams/cast.c:1.22 php-src/main/streams/cast.c:1.23
--- php-src/main/streams/cast.c:1.22Sun Apr 19 17:09:47 2009
+++ php-src/main/streams/cast.c Mon Apr 20 08:28:14 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: cast.c,v 1.22 2009/04/19 17:09:47 lbarnaud Exp $ */
+/* $Id: cast.c,v 1.23 2009/04/20 08:28:14 pajoye Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -219,7 +219,7 @@
if (ret != SUCCESS) {
php_stream_close(newstream);
} else {
- int retcode =
php_stream_cast(newstream, castas | flags, ret, show_err);
+ int retcode =
php_stream_cast(newstream, castas | flags, (void**)ret, show_err);
if (retcode == SUCCESS)
rewind(*(FILE**)ret);
--
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 cast.c
pajoye Mon Apr 20 08:28:44 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams cast.c
Log:
- silent compiler warning
http://cvs.php.net/viewvc.cgi/php-src/main/streams/cast.c?r1=1.12.2.1.2.1.2.5r2=1.12.2.1.2.1.2.6diff_format=u
Index: php-src/main/streams/cast.c
diff -u php-src/main/streams/cast.c:1.12.2.1.2.1.2.5
php-src/main/streams/cast.c:1.12.2.1.2.1.2.6
--- php-src/main/streams/cast.c:1.12.2.1.2.1.2.5Sun Apr 19 17:10:34 2009
+++ php-src/main/streams/cast.c Mon Apr 20 08:28:44 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: cast.c,v 1.12.2.1.2.1.2.5 2009/04/19 17:10:34 lbarnaud Exp $ */
+/* $Id: cast.c,v 1.12.2.1.2.1.2.6 2009/04/20 08:28:44 pajoye Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -219,7 +219,7 @@
if (ret != SUCCESS) {
php_stream_close(newstream);
} else {
- int retcode =
php_stream_cast(newstream, castas | flags, ret, show_err);
+ int retcode =
php_stream_cast(newstream, castas | flags, (void**)ret, show_err);
if (retcode == SUCCESS)
rewind(*(FILE**)ret);
--
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/standard dns_win32.c
pajoye Mon Apr 20 08:40:40 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns_win32.c
Log:
- nuke unused variable
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.1.2.6r2=1.1.2.7diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.1.2.6
php-src/ext/standard/dns_win32.c:1.1.2.7
--- php-src/ext/standard/dns_win32.c:1.1.2.6Mon Jan 12 20:07:28 2009
+++ php-src/ext/standard/dns_win32.cMon Apr 20 08:40:39 2009
@@ -303,7 +303,6 @@
zval *authns = NULL, *addtl = NULL;
int type, type_to_fetch, first_query = 1, store_results = 1;
int addtl_recs = 0;
- IN_ADDR ipaddr;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|lzz,
hostname, hostname_len, type_param, authns, addtl) == FAILURE) {
return;
--
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/standard dns_win32.c
pajoye Mon Apr 20 08:41:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns_win32.c
Log:
- silent compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.1.2.7r2=1.1.2.8diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.1.2.7
php-src/ext/standard/dns_win32.c:1.1.2.8
--- php-src/ext/standard/dns_win32.c:1.1.2.7Mon Apr 20 08:40:39 2009
+++ php-src/ext/standard/dns_win32.cMon Apr 20 08:41:39 2009
@@ -191,7 +191,7 @@
case DNS_TYPE_HINFO:
case DNS_TYPE_TEXT:
{
- int i = 0;
+ DWORD i = 0;
DNS_TXT_DATA *data_txt = pRec-Data.TXT;
DWORD count = data_txt-dwStringCount;
char *txt, *txt_dst;
--
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/openssl openssl.c
mkoppanen Mon Apr 20 09:44:30 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/opensslopenssl.c
Log:
MFH: Closes #47991 SSL streams fail if error stack contains items
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.28r2=1.98.2.5.2.41.2.29diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.28
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.29
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.28Sun Mar 29 23:32:34 2009
+++ php-src/ext/openssl/openssl.c Mon Apr 20 09:44:29 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.28 2009/03/29 23:32:34 scottmac Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.29 2009/04/20 09:44:29 mkoppanen Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4367,6 +4367,7 @@
char *cipherlist = NULL;
int ok = 1;
+ ERR_clear_error();
/* look at context options in the stream and set appropriate
verification flags */
if (GET_VER_OPT(verify_peer) zval_is_true(*val)) {
--
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) / NEWS /ext/mysqlnd mysqlnd_portability.h
On Mon, 2009-04-20 at 12:23 +0300, Jani Taskinen wrote: Does that fix it also on MacOSX? :) The MacOS issue was reported using a different bug, didn't see that one was bogussed in favor of this one. But I'll run it through our build farm to verify/fix on a few more systems ... johannes --Jani Johannes Schlüter wrote: johannesMon Apr 20 09:16:52 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlndmysqlnd_portability.h /php-srcNEWS Log: Fix #47535 Compilation failure in ps_fetch_from_1_to_8_bytes() http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.4.2.12r2=1.4.2.13diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_portability.h diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.12 php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.13 --- php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.12 Tue Nov 18 17:02:18 2008 +++ php-src/ext/mysqlnd/mysqlnd_portability.h Mon Apr 20 09:16:51 2009 @@ -199,6 +199,11 @@ #define MYSQLND_LLU_SPEC %llu #endif +#ifdef _AIX +#define MYSQLND_LL_SPEC %lli +#define MYSQLND_LLU_SPEC %llu +#endif + #define MYSQLND_SZ_T_SPEC %zd #ifndef L64 #define L64(x) x##LL http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.562r2=1.2027.2.547.2.965.2.563diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.562 php-src/NEWS:1.2027.2.547.2.965.2.563 --- php-src/NEWS:1.2027.2.547.2.965.2.562 Sun Apr 19 14:44:43 2009 +++ php-src/NEWSMon Apr 20 09:16:51 2009 @@ -30,6 +30,8 @@ - Fixed bug #47662 (Support more than 127 subpatterns in preg_match). (Nuno) - Fixed bug #47596 (Bus error on parsing file). (Dmitry) - Fixed bug #47560 (explode()'s limit parameter odd behaviour). (Matt) +- Fixed bug #47535 (Compilation failure in ps_fetch_from_1_to_8_bytes()). + (Johannes) - Fixed bug #47516 (nowdoc can not be embed in heredoc but can be embed in double quote). (Dmitry) - Fixed bug #47038 (Memory leak in include). (Dmitry) -- 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/mysqlnd mysqlnd_portability.h
johannesMon Apr 20 09:16:52 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlndmysqlnd_portability.h /php-srcNEWS Log: Fix #47535 Compilation failure in ps_fetch_from_1_to_8_bytes() http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.4.2.12r2=1.4.2.13diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_portability.h diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.12 php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.13 --- php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.12 Tue Nov 18 17:02:18 2008 +++ php-src/ext/mysqlnd/mysqlnd_portability.h Mon Apr 20 09:16:51 2009 @@ -199,6 +199,11 @@ #define MYSQLND_LLU_SPEC %llu #endif +#ifdef _AIX +#define MYSQLND_LL_SPEC %lli +#define MYSQLND_LLU_SPEC %llu +#endif + #define MYSQLND_SZ_T_SPEC %zd #ifndef L64 #define L64(x) x##LL http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.562r2=1.2027.2.547.2.965.2.563diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.562 php-src/NEWS:1.2027.2.547.2.965.2.563 --- php-src/NEWS:1.2027.2.547.2.965.2.562 Sun Apr 19 14:44:43 2009 +++ php-src/NEWSMon Apr 20 09:16:51 2009 @@ -30,6 +30,8 @@ - Fixed bug #47662 (Support more than 127 subpatterns in preg_match). (Nuno) - Fixed bug #47596 (Bus error on parsing file). (Dmitry) - Fixed bug #47560 (explode()'s limit parameter odd behaviour). (Matt) +- Fixed bug #47535 (Compilation failure in ps_fetch_from_1_to_8_bytes()). + (Johannes) - Fixed bug #47516 (nowdoc can not be embed in heredoc but can be embed in double quote). (Dmitry) - Fixed bug #47038 (Memory leak in include). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_portability.h
johannesMon Apr 20 09:15:46 2009 UTC Modified files: /php-src/ext/mysqlndmysqlnd_portability.h Log: Fix #47535 Compilation failure in ps_fetch_from_1_to_8_bytes() http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.15r2=1.16diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_portability.h diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.15 php-src/ext/mysqlnd/mysqlnd_portability.h:1.16 --- php-src/ext/mysqlnd/mysqlnd_portability.h:1.15 Tue Nov 18 16:54:38 2008 +++ php-src/ext/mysqlnd/mysqlnd_portability.h Mon Apr 20 09:15:46 2009 @@ -199,6 +199,11 @@ #define MYSQLND_LLU_SPEC %llu #endif +#ifdef _AIX +#define MYSQLND_LL_SPEC %lli +#define MYSQLND_LLU_SPEC %llu +#endif + #define MYSQLND_SZ_T_SPEC %zd #ifndef L64 #define L64(x) x##LL -- 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) / NEWS /ext/mysqlnd mysqlnd_portability.h
Does that fix it also on MacOSX? :) --Jani Johannes Schlüter wrote: johannesMon Apr 20 09:16:52 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlnd mysqlnd_portability.h /php-src NEWS Log: Fix #47535 Compilation failure in ps_fetch_from_1_to_8_bytes() http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.4.2.12r2=1.4.2.13diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_portability.h diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.12 php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.13 --- php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.12 Tue Nov 18 17:02:18 2008 +++ php-src/ext/mysqlnd/mysqlnd_portability.h Mon Apr 20 09:16:51 2009 @@ -199,6 +199,11 @@ #define MYSQLND_LLU_SPEC %llu #endif +#ifdef _AIX +#define MYSQLND_LL_SPEC %lli +#define MYSQLND_LLU_SPEC %llu +#endif + #define MYSQLND_SZ_T_SPEC %zd #ifndef L64 #define L64(x) x##LL http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.562r2=1.2027.2.547.2.965.2.563diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.562 php-src/NEWS:1.2027.2.547.2.965.2.563 --- php-src/NEWS:1.2027.2.547.2.965.2.562 Sun Apr 19 14:44:43 2009 +++ php-src/NEWSMon Apr 20 09:16:51 2009 @@ -30,6 +30,8 @@ - Fixed bug #47662 (Support more than 127 subpatterns in preg_match). (Nuno) - Fixed bug #47596 (Bus error on parsing file). (Dmitry) - Fixed bug #47560 (explode()'s limit parameter odd behaviour). (Matt) +- Fixed bug #47535 (Compilation failure in ps_fetch_from_1_to_8_bytes()). + (Johannes) - Fixed bug #47516 (nowdoc can not be embed in heredoc but can be embed in double quote). (Dmitry) - Fixed bug #47038 (Memory leak in include). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
mkoppanen Mon Apr 20 09:43:45 2009 UTC
Modified files:
/php-src/ext/opensslopenssl.c
Log:
Closes #47991 SSL streams fail if error stack contains items
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.180r2=1.181diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.180 php-src/ext/openssl/openssl.c:1.181
--- php-src/ext/openssl/openssl.c:1.180 Sun Mar 29 23:32:17 2009
+++ php-src/ext/openssl/openssl.c Mon Apr 20 09:43:45 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.180 2009/03/29 23:32:17 scottmac Exp $ */
+/* $Id: openssl.c,v 1.181 2009/04/20 09:43:45 mkoppanen Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4628,6 +4628,7 @@
char *cipherlist = NULL;
int ok = 1;
+ ERR_clear_error();
/* look at context options in the stream and set appropriate
verification flags */
if (GET_VER_OPT(verify_peer) zval_is_true(*val)) {
--
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/openssl openssl.c
mkoppanen Mon Apr 20 10:00:41 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/opensslopenssl.c
Log:
MFH: Closes #47991 SSL streams fail if error stack contains items
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.52r2=1.98.2.5.2.53diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.52
php-src/ext/openssl/openssl.c:1.98.2.5.2.53
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.52 Sun Mar 29 23:33:01 2009
+++ php-src/ext/openssl/openssl.c Mon Apr 20 10:00:41 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.52 2009/03/29 23:33:01 scottmac Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.53 2009/04/20 10:00:41 mkoppanen Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3894,6 +3894,7 @@
char *cipherlist = NULL;
int ok = 1;
+ ERR_clear_error();
/* look at context options in the stream and set appropriate
verification flags */
if (GET_VER_OPT(verify_peer) zval_is_true(*val)) {
--
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
mkoppanen Mon Apr 20 10:03:21 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: NEWS entry related to #47991 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1473r2=1.2027.2.547.2.1474diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1473 php-src/NEWS:1.2027.2.547.2.1474 --- php-src/NEWS:1.2027.2.547.2.1473Sun Apr 19 15:01:11 2009 +++ php-src/NEWSMon Apr 20 10:03:21 2009 @@ -11,6 +11,7 @@ - Fixed segfault on invalid session.save_path. (Hannes) - Fixed bug #47997 (stream_copy_to_stream returns 1 on empty streams). (Arnaud) +- Fixed bug #47991 (SSL streams fail if error stack contains items). (Mikko) - Fixed bug #47981 (error handler not called regardless). (Hannes) - Fixed bug #47969 (ezmlm_hash() returns different values depend on OS). (Ilia) -- 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
iliaa Mon Apr 20 14:08:43 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Fixed typo http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.563r2=1.2027.2.547.2.965.2.564diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.563 php-src/NEWS:1.2027.2.547.2.965.2.564 --- php-src/NEWS:1.2027.2.547.2.965.2.563 Mon Apr 20 09:16:51 2009 +++ php-src/NEWSMon Apr 20 14:08:43 2009 @@ -6,9 +6,9 @@ - Upgraded bundled PCRE to version 7.9. (Nuno) - Added 'n' flag to fopen to allow passing O_NONBLOCK to the underlying open(2) system call. (Mikko) -- Added dechunk filter which can decode HTTP responces with chunked +- Added dechunk filter which can decode HTTP responses with chunked transfer-encoding. HTTP streams use this filter automatically in case - Transfer-Encoding: chunked header presents in responce. It's possible to + Transfer-Encoding: chunked header presents in response. It's possible to disable this behaviour using http=array(auto_decode=0) in stream context. (Dmitry) -- 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/spl php_spl.c /ext/spl/tests bug48023.phpt
colder Mon Apr 20 14:20:20 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests bug48023.phpt
Modified files:
/php-src/ext/splphp_spl.c
/php-srcNEWS
Log:
MFH: Fix #48023 (spl_autoload_register didn't store closures)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.35r2=1.52.2.28.2.17.2.36diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.35
php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.36
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.35 Mon Jan 26 11:38:03 2009
+++ php-src/ext/spl/php_spl.c Mon Apr 20 14:20:20 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.28.2.17.2.35 2009/01/26 11:38:03 colder Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.17.2.36 2009/04/20 14:20:20 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -353,6 +353,7 @@
typedef struct {
zend_function *func_ptr;
zval *obj;
+ zval *closure;
zend_class_entry *ce;
} autoload_func_info;
@@ -361,6 +362,9 @@
if (alfi-obj) {
zval_ptr_dtor(alfi-obj);
}
+ if (alfi-closure) {
+ zval_ptr_dtor(alfi-closure);
+ }
}
/* {{{ proto void spl_autoload_call(string class_name)
@@ -488,9 +492,14 @@
RETURN_FALSE;
}
}
+ alfi.closure = NULL;
alfi.ce = fcc.calling_scope;
alfi.func_ptr = fcc.function_handler;
obj_ptr = fcc.object_ptr;
+ if (Z_TYPE_P(zcallable) == IS_OBJECT) {
+ alfi.closure = zcallable;
+ Z_ADDREF_P(zcallable);
+ }
if (error) {
efree(error);
}
@@ -527,6 +536,7 @@
spl_alfi.func_ptr = spl_func_ptr;
spl_alfi.obj = NULL;
spl_alfi.ce = NULL;
+ spl_alfi.closure = NULL;
zend_hash_add(SPL_G(autoload_functions),
spl_autoload, sizeof(spl_autoload), spl_alfi, sizeof(autoload_func_info),
NULL);
if (prepend
SPL_G(autoload_functions)-nNumOfElements 1) {
/* Move the newly created element to the head
of the hashtable */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.564r2=1.2027.2.547.2.965.2.565diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.564
php-src/NEWS:1.2027.2.547.2.965.2.565
--- php-src/NEWS:1.2027.2.547.2.965.2.564 Mon Apr 20 14:08:43 2009
+++ php-src/NEWSMon Apr 20 14:20:20 2009
@@ -12,6 +12,7 @@
disable this behaviour using http=array(auto_decode=0) in stream
context. (Dmitry)
+- Fixed bug #48023 (spl_autoload_register didn't store closures). (Etienne)
- Fixed bug #47880 (crashes in call_user_func_array()). (Dmitry)
- Fixed bug #47856 (stristr() converts needle to lower-case). (Ilia)
- Fixed bug #47851 (is_callable throws fatal error). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug48023.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug48023.phpt
+++ php-src/ext/spl/tests/bug48023.phpt
--TEST--
Bug #48023 (spl_autoload_register didn't addref closures)
--FILE--
?php
spl_autoload_register(function(){});
new Foo;
?
===DONE===
--EXPECTF--
Fatal error: Class 'Foo' not found in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c /ext/spl/tests bug48023.phpt
colder Mon Apr 20 14:18:46 2009 UTC
Added files:
/php-src/ext/spl/tests bug48023.phpt
Modified files:
/php-src/ext/splphp_spl.c
Log:
Fix #48023 (spl_autoload_register didn't store closures)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.152r2=1.153diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.152 php-src/ext/spl/php_spl.c:1.153
--- php-src/ext/spl/php_spl.c:1.152 Thu Mar 26 20:02:12 2009
+++ php-src/ext/spl/php_spl.c Mon Apr 20 14:18:46 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.152 2009/03/26 20:02:12 felipe Exp $ */
+/* $Id: php_spl.c,v 1.153 2009/04/20 14:18:46 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -337,6 +337,7 @@
typedef struct {
zend_function *func_ptr;
zval *obj;
+ zval *closure;
zend_class_entry *ce;
} autoload_func_info;
@@ -345,6 +346,9 @@
if (alfi-obj) {
zval_ptr_dtor(alfi-obj);
}
+ if (alfi-closure) {
+ zval_ptr_dtor(alfi-closure);
+ }
}
/* {{{ proto void spl_autoload_call(string class_name) U
@@ -485,9 +489,14 @@
RETURN_FALSE;
}
}
+ alfi.closure = NULL;
alfi.ce = fcc.calling_scope;
alfi.func_ptr = fcc.function_handler;
obj_ptr = fcc.object_ptr;
+ if (Z_TYPE_P(zcallable) == IS_OBJECT) {
+ alfi.closure = zcallable;
+ Z_ADDREF_P(zcallable);
+ }
if (error) {
efree(error);
}
@@ -531,6 +540,7 @@
spl_alfi.func_ptr = spl_func_ptr;
spl_alfi.obj = NULL;
spl_alfi.ce = NULL;
+ spl_alfi.closure = NULL;
zend_hash_add(SPL_G(autoload_functions),
spl_autoload, sizeof(spl_autoload), spl_alfi, sizeof(autoload_func_info),
NULL);
if (prepend
SPL_G(autoload_functions)-nNumOfElements 1) {
/* Move the newly created element to the head
of the hashtable */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug48023.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug48023.phpt
+++ php-src/ext/spl/tests/bug48023.phpt
--TEST--
Bug #48023 (spl_autoload_register didn't addref closures)
--FILE--
?php
spl_autoload_register(function(){});
new Foo;
?
===DONE===
--EXPECTF--
Fatal error: Class 'Foo' not found in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /scripts phpize.in
janiMon Apr 20 15:02:50 2009 UTC Modified files: /php-src/scriptsphpize.in Log: - Added path sanity check (autotools + libtool do not cope with whitespace..) http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.in?r1=1.34r2=1.35diff_format=u Index: php-src/scripts/phpize.in diff -u php-src/scripts/phpize.in:1.34 php-src/scripts/phpize.in:1.35 --- php-src/scripts/phpize.in:1.34 Fri Jun 29 01:09:54 2007 +++ php-src/scripts/phpize.in Mon Apr 20 15:02:49 2009 @@ -80,6 +80,24 @@ EOF exit 1 fi + + case $phpdir in + *\ * | *\*) +cat EOF +Invalid source path '$phpdir'. Whitespace is not allowed in source path. + +EOF +exit 1;; + esac + + case $builddir in + *\ * | *\*) +cat EOF +Invalid build path '$builddir'. Whitespace is not allowed in build path. + +EOF + exit 1;; + esac } phpize_check_shtool() @@ -103,7 +121,7 @@ test -z $PHP_AUTOCONF PHP_AUTOCONF=autoconf test -z $PHP_AUTOHEADER PHP_AUTOHEADER=autoheader - if ! test -x $PHP_AUTOCONF ! test -x `$php_shtool path $PHP_AUTOCONF`; then + if ! test -x $PHP_AUTOCONF ! test -x `$php_shtool path $PHP_AUTOCONF`; then cat EOF Cannot find autoconf. Please check your autoconf installation and the \$PHP_AUTOCONF environment variable. Then, rerun this script. @@ -111,7 +129,7 @@ EOF exit 1 fi - if ! test -x $PHP_AUTOHEADER ! test -x `$php_shtool path $PHP_AUTOHEADER`; then + if ! test -x $PHP_AUTOHEADER ! test -x `$php_shtool path $PHP_AUTOHEADER`; then cat EOF Cannot find autoheader. Please check your autoconf installation and the \$PHP_AUTOHEADER environment variable. Then, rerun this script. -- 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) /scripts phpize.in
janiMon Apr 20 15:03:21 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/scriptsphpize.in Log: MFH:- Added path sanity check (autotools + libtool do not cope with whitespace..) http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.in?r1=1.28.2.3.2.1r2=1.28.2.3.2.1.2.1diff_format=u Index: php-src/scripts/phpize.in diff -u php-src/scripts/phpize.in:1.28.2.3.2.1 php-src/scripts/phpize.in:1.28.2.3.2.1.2.1 --- php-src/scripts/phpize.in:1.28.2.3.2.1 Fri Jun 29 01:10:35 2007 +++ php-src/scripts/phpize.in Mon Apr 20 15:03:21 2009 @@ -80,6 +80,24 @@ EOF exit 1 fi + + case $phpdir in + *\ * | *\*) +cat EOF +Invalid source path '$phpdir'. Whitespace is not allowed in source path. + +EOF +exit 1;; + esac + + case $builddir in + *\ * | *\*) +cat EOF +Invalid build path '$builddir'. Whitespace is not allowed in build path. + +EOF + exit 1;; + esac } phpize_check_shtool() @@ -103,18 +121,18 @@ test -z $PHP_AUTOCONF PHP_AUTOCONF=autoconf test -z $PHP_AUTOHEADER PHP_AUTOHEADER=autoheader - if test ! -x `$php_shtool path $PHP_AUTOCONF`; then + if ! test -x $PHP_AUTOCONF ! test -x `$php_shtool path $PHP_AUTOCONF`; then cat EOF -Cannot find autoconf. Please check your autoconf installation and the \$PHP_AUTOCONF -environment variable is set correctly and then rerun this script. +Cannot find autoconf. Please check your autoconf installation and the +\$PHP_AUTOCONF environment variable. Then, rerun this script. EOF exit 1 fi - if test ! -x `$php_shtool path $PHP_AUTOHEADER`; then + if ! test -x $PHP_AUTOHEADER ! test -x `$php_shtool path $PHP_AUTOHEADER`; then cat EOF -Cannot find autoheader. Please check your autoconf installation and the \$PHP_AUTOHEADER -environment variable is set correctly and then rerun this script. +Cannot find autoheader. Please check your autoconf installation and the +\$PHP_AUTOHEADER environment variable. Then, rerun this script. EOF exit 1 -- 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) /scripts phpize.in
janiMon Apr 20 15:03:57 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/scriptsphpize.in Log: MFH:- Added path sanity check (autotools + libtool do not cope with whitespace..) http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.in?r1=1.28.2.3.2.1r2=1.28.2.3.2.2diff_format=u Index: php-src/scripts/phpize.in diff -u php-src/scripts/phpize.in:1.28.2.3.2.1 php-src/scripts/phpize.in:1.28.2.3.2.2 --- php-src/scripts/phpize.in:1.28.2.3.2.1 Fri Jun 29 01:10:35 2007 +++ php-src/scripts/phpize.in Mon Apr 20 15:03:57 2009 @@ -80,6 +80,24 @@ EOF exit 1 fi + + case $phpdir in + *\ * | *\*) +cat EOF +Invalid source path '$phpdir'. Whitespace is not allowed in source path. + +EOF +exit 1;; + esac + + case $builddir in + *\ * | *\*) +cat EOF +Invalid build path '$builddir'. Whitespace is not allowed in build path. + +EOF + exit 1;; + esac } phpize_check_shtool() @@ -103,18 +121,18 @@ test -z $PHP_AUTOCONF PHP_AUTOCONF=autoconf test -z $PHP_AUTOHEADER PHP_AUTOHEADER=autoheader - if test ! -x `$php_shtool path $PHP_AUTOCONF`; then + if ! test -x $PHP_AUTOCONF ! test -x `$php_shtool path $PHP_AUTOCONF`; then cat EOF -Cannot find autoconf. Please check your autoconf installation and the \$PHP_AUTOCONF -environment variable is set correctly and then rerun this script. +Cannot find autoconf. Please check your autoconf installation and the +\$PHP_AUTOCONF environment variable. Then, rerun this script. EOF exit 1 fi - if test ! -x `$php_shtool path $PHP_AUTOHEADER`; then + if ! test -x $PHP_AUTOHEADER ! test -x `$php_shtool path $PHP_AUTOHEADER`; then cat EOF -Cannot find autoheader. Please check your autoconf installation and the \$PHP_AUTOHEADER -environment variable is set correctly and then rerun this script. +Cannot find autoheader. Please check your autoconf installation and the +\$PHP_AUTOHEADER environment variable. Then, rerun this script. EOF exit 1 -- 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/mbstring config.m4
janiMon Apr 20 15:39:48 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring config.m4 Log: ws http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.11.2.7r2=1.58.2.4.2.11.2.8diff_format=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.11.2.7 php-src/ext/mbstring/config.m4:1.58.2.4.2.11.2.8 --- php-src/ext/mbstring/config.m4:1.58.2.4.2.11.2.7Wed Mar 18 17:43:55 2009 +++ php-src/ext/mbstring/config.m4 Mon Apr 20 15:39:48 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.58.2.4.2.11.2.7 2009/03/18 17:43:55 moriyoshi Exp $ +dnl $Id: config.m4,v 1.58.2.4.2.11.2.8 2009/04/20 15:39:48 jani Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -191,7 +191,7 @@ AC_MSG_RESULT([yes]) AC_DEFINE([PHP_ONIG_BAD_KOI8_ENTRY], [1], [define to 1 if oniguruma has an invalid entry for KOI8 encoding]) ]) - LDFLAGS=$save_old_LDFLAGS + LDFLAGS=$save_old_LDFLAGS fi PHP_MBSTRING_ADD_CFLAG([-DONIG_ESCAPE_UCHAR_COLLISION=1]) -- 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/mbstring mbstring.c
janiMon Apr 20 16:08:00 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c
Log:
- Sync with HEAD (just reorder to match HEAD order)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.52r2=1.224.2.22.2.25.2.53diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.52
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.53
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.52Sun Mar 15
20:42:56 2009
+++ php-src/ext/mbstring/mbstring.c Mon Apr 20 16:07:59 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.52 2009/03/15 20:42:56 moriyoshi Exp $
*/
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.53 2009/04/20 16:07:59 jani Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -933,169 +933,6 @@
/* }}} */
#endif
-#ifdef ZEND_MULTIBYTE
-/* {{{ char *php_mb_encoding_detector()
- * Interface for Zend Engine
- */
-static char* php_mb_encoding_detector(const unsigned char *arg_string, size_t
arg_length, char *arg_list TSRMLS_DC)
-{
- mbfl_string string;
- const char *ret;
- enum mbfl_no_encoding *elist;
- int size, *list;
-
- /* make encoding list */
- list = NULL;
- size = 0;
- php_mb_parse_encoding_list(arg_list, strlen(arg_list), list, size, 0
TSRMLS_CC);
- if (size = 0) {
- return NULL;
- }
- if (size 0 list != NULL) {
- elist = list;
- } else {
- elist = MBSTRG(current_detect_order_list);
- size = MBSTRG(current_detect_order_list_size);
- }
-
- mbfl_string_init(string);
- string.no_language = MBSTRG(language);
- string.val = (unsigned char *)arg_string;
- string.len = arg_length;
- ret = mbfl_identify_encoding_name(string, elist, size, 0);
- if (list != NULL) {
- efree((void *)list);
- }
- if (ret != NULL) {
- return estrdup(ret);
- } else {
- return NULL;
- }
-}
-/* }}} */
-
-/* {{{ int php_mb_encoding_converter() */
-static int php_mb_encoding_converter(unsigned char **to, size_t *to_length,
- const unsigned char *from, size_t from_length,
- const char *encoding_to, const char *encoding_from TSRMLS_DC)
-{
- mbfl_string string, result, *ret;
- enum mbfl_no_encoding from_encoding, to_encoding;
- mbfl_buffer_converter *convd;
-
- /* new encoding */
- to_encoding = mbfl_name2no_encoding(encoding_to);
- if (to_encoding == mbfl_no_encoding_invalid) {
- return -1;
- }
- /* old encoding */
- from_encoding = mbfl_name2no_encoding(encoding_from);
- if (from_encoding == mbfl_no_encoding_invalid) {
- return -1;
- }
- /* initialize string */
- mbfl_string_init(string);
- mbfl_string_init(result);
- string.no_encoding = from_encoding;
- string.no_language = MBSTRG(language);
- string.val = (unsigned char*)from;
- string.len = from_length;
-
- /* initialize converter */
- convd = mbfl_buffer_converter_new(from_encoding, to_encoding,
string.len);
- if (convd == NULL) {
- return -1;
- }
- mbfl_buffer_converter_illegal_mode(convd,
MBSTRG(current_filter_illegal_mode));
- mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar));
-
- /* do it */
- ret = mbfl_buffer_converter_feed_result(convd, string, result);
- if (ret != NULL) {
- *to = ret-val;
- *to_length = ret-len;
- }
-
- MBSTRG(illegalchars) += mbfl_buffer_illegalchars(convd);
- mbfl_buffer_converter_delete(convd);
-
- return ret ? 0 : -1;
-}
-/* }}} */
-
-/* {{{ int php_mb_oddlen()
- * returns number of odd (e.g. appears only first byte of multibyte
- * character) chars
- */
-static size_t php_mb_oddlen(const unsigned char *string, size_t length, const
char *encoding TSRMLS_DC)
-{
- mbfl_string mb_string;
-
- mbfl_string_init(mb_string);
- mb_string.no_language = MBSTRG(language);
- mb_string.no_encoding = mbfl_name2no_encoding(encoding);
- mb_string.val = (unsigned char *)string;
- mb_string.len = length;
-
- if (mb_string.no_encoding == mbfl_no_encoding_invalid) {
- return 0;
- }
- return mbfl_oddlen(mb_string);
-}
-/* }}} */
-
-/* {{{ php_mb_set_zend_encoding() */
-static int php_mb_set_zend_encoding(TSRMLS_D)
-{
- /* 'd better use mbfl_memory_device? */
- char *name, *list = NULL;
- int n, *entry, list_size = 0;
- zend_encoding_detector encoding_detector;
- zend_encoding_converter encoding_converter;
- zend_encoding_oddlen
[PHP-CVS] cvs: phpruntests /src rtAutoload.php rtDirectoryList.php rtPhptFilterIterator.php rtText.php rtUtil.php
spriebsch Mon Apr 20 16:57:32 2009 UTC
Modified files:
/phpruntests/srcrtAutoload.php rtDirectoryList.php
rtPhptFilterIterator.php rtText.php rtUtil.php
Log:
Reformatted to conform to PEAR coding standard.
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtAutoload.php?r1=1.1.1.1r2=1.2diff_format=u
Index: phpruntests/src/rtAutoload.php
diff -u phpruntests/src/rtAutoload.php:1.1.1.1
phpruntests/src/rtAutoload.php:1.2
--- phpruntests/src/rtAutoload.php:1.1.1.1 Wed Apr 15 16:30:18 2009
+++ phpruntests/src/rtAutoload.php Mon Apr 20 16:57:31 2009
@@ -8,55 +8,52 @@
*/
class rtAutoload
{
- /**
- * @var array
- */
- protected static $classMap;
-
- /**
- * @var string
- */
- protected static $classPath;
-
-
- /**
- * Initialize the autoloader
- *
- * @return null
- */
- public static function init()
- {
-self::$classPath = dirname(__FILE__);
+/**
+ * @var array
+ */
+protected static $classMap;
+
+/**
+ * @var string
+ */
+protected static $classPath;
+
+/**
+ * Initialize the autoloader
+ *
+ * @return null
+ */
+public static function init()
+{
+self::$classPath = dirname(__FILE__);
+
+if (substr(self::$classPath, -1) != '/') {
+self::$classPath .= '/';
+}
+
+if (file_exists(self::$classPath . 'rtClassMap.php')) {
+include self::$classPath . 'rtClassMap.php';
+self::$classMap = $rtClassMap;
+}
+
+if (function_exists('__autoload')) {
+spl_autoload_register('__autoload');
+}
-if (substr(self::$classPath, -1) != '/') {
- self::$classPath .= '/';
+spl_autoload_register(array('rtAutoload', 'autoload'));
}
-if (file_exists(self::$classPath . 'rtClassMap.php')) {
- include self::$classPath . 'rtClassMap.php';
- self::$classMap = $rtClassMap;
+/**
+ * Autoload method
+ *
+ * @param string $class Class name to autoload
+ * @return null
+ */
+public static function autoload($class)
+{
+if (isset(self::$classMap[$class])) {
+include self::$classPath . self::$classMap[$class];
+}
}
-
-if (function_exists('__autoload')) {
- spl_autoload_register('__autoload');
-}
-
-spl_autoload_register(array('rtAutoload', 'autoload'));
- }
-
-
- /**
- * Autoload method
- *
- * @param string $class Class name to autoload
- * @return null
- */
- public static function autoload($class)
- {
-if (isset(self::$classMap[$class])) {
- include self::$classPath . self::$classMap[$class];
-}
- }
}
-
?
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtDirectoryList.php?r1=1.1.1.1r2=1.2diff_format=u
Index: phpruntests/src/rtDirectoryList.php
diff -u phpruntests/src/rtDirectoryList.php:1.1.1.1
phpruntests/src/rtDirectoryList.php:1.2
--- phpruntests/src/rtDirectoryList.php:1.1.1.1 Wed Apr 15 16:30:18 2009
+++ phpruntests/src/rtDirectoryList.php Mon Apr 20 16:57:31 2009
@@ -1,29 +1,27 @@
?php
-
/**
* Lists all of the directories under a top level directory.
* This is currently not used for anything
*
*/
-class rtDirectoryList {
-
-
+class rtDirectoryList
+{
/**
* Finds a list of subdirectories under the top level ditectory and returns
the full path names in an array
*
* @param string $topDirectory
* @return array
*/
- public function getSubDirectoryPaths($topDirectory) {
-$result = array($topDirectory);
-
-foreach(new RecursiveIteratorIterator(new ParentIterator(new
RecursiveDirectoryIterator($topDirectory)), 1) as $dir) {
- $result[] = $dir-getPathName();
-}
-return $result;
+ public function getSubDirectoryPaths($topDirectory)
+ {
+ $result = array($topDirectory);
+
+ foreach (new RecursiveIteratorIterator(new ParentIterator(new
RecursiveDirectoryIterator($topDirectory)), 1) as $dir) {
+ $result[] = $dir-getPathName();
+ }
+
+ return $result;
}
-
-
}
-?
\ No newline at end of file
+?
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtPhptFilterIterator.php?r1=1.1.1.1r2=1.2diff_format=u
Index: phpruntests/src/rtPhptFilterIterator.php
diff -u phpruntests/src/rtPhptFilterIterator.php:1.1.1.1
phpruntests/src/rtPhptFilterIterator.php:1.2
--- phpruntests/src/rtPhptFilterIterator.php:1.1.1.1Wed Apr 15 16:30:18 2009
+++ phpruntests/src/rtPhptFilterIterator.phpMon Apr 20 16:57:31 2009
@@ -1,11 +1,13 @@
?php
-
+/**
+ *
+ */
class rtPhptFilterIterator extends FilterIterator
- {
+{
public function accept()
{
- return (substr($this-current(), -strlen('.phpt')) == '.phpt');
+return substr($this-current(), -strlen('.phpt')) == '.phpt';
}
- }
-?
\ No newline at end of file
+}
+?
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtText.php?r1=1.1.1.1r2=1.2diff_format=u
Index:
[PHP-CVS] cvs: phpruntests /phpt-tests sample_cookie.phpt sample_get.phpt sample_post.phpt
zoe Mon Apr 20 19:49:32 2009 UTC
Added files:
/phpruntests/phpt-tests sample_cookie.phpt sample_post.phpt
sample_get.phpt
Log:
sample tests for GET, POST and COOKIE sections
http://cvs.php.net/viewvc.cgi/phpruntests/phpt-tests/sample_cookie.phpt?view=markuprev=1.1
Index: phpruntests/phpt-tests/sample_cookie.phpt
+++ phpruntests/phpt-tests/sample_cookie.phpt
--TEST--
Sample COOKIE test
--COOKIE--
hello=World;goodbye=MrChips
--FILE--
?php
var_dump($_COOKIE);
?
--EXPECT--
array(2) {
[hello]=
string(5) World
[goodbye]=
string(7) MrChips
}
http://cvs.php.net/viewvc.cgi/phpruntests/phpt-tests/sample_post.phpt?view=markuprev=1.1
Index: phpruntests/phpt-tests/sample_post.phpt
+++ phpruntests/phpt-tests/sample_post.phpt
--TEST--
Sample POST test
--POST--
hello=Worldgoodbye=MrChips
--FILE--
?php
var_dump($_POST);
?
--EXPECT--
array(2) {
[hello]=
string(5) World
[goodbye]=
string(7) MrChips
}
http://cvs.php.net/viewvc.cgi/phpruntests/phpt-tests/sample_get.phpt?view=markuprev=1.1
Index: phpruntests/phpt-tests/sample_get.phpt
+++ phpruntests/phpt-tests/sample_get.phpt
--TEST--
Try a GET section
--GET--
hello=Worldgoodbye=MrChips
--FILE--
?php
var_dump($_GET);
?
--EXPECT--
array(2) {
[hello]=
string(5) World
[goodbye]=
string(7) MrChips
}
--
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) / UPGRADING
kalle Tue Apr 21 04:35:02 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: Added missing note about gethostname() (Re: #47839) http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.3r2=1.1.2.3.2.1.2.4diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.3 php-src/UPGRADING:1.1.2.3.2.1.2.4 --- php-src/UPGRADING:1.1.2.3.2.1.2.3 Fri Apr 3 23:56:26 2009 +++ php-src/UPGRADING Tue Apr 21 04:35:01 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.3 2009/04/03 23:56:26 felipe Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.4 2009/04/21 04:35:01 kalle Exp $ UPGRADE NOTES - PHP 5.3 @@ -287,6 +287,7 @@ mysqli_get_connection_stats() mysqli_poll() mysqli_reap_async_query() + - Network: gethostname() - OpenSSL: openssl_random_pseudo_bytes() - PCNTL: pcntl_signal_dispatch() pcntl_sigprocmask() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
