[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/gd/libgd/gdft.c branches/PHP_5_2/ext/gd/tests/bug51263.phpt branches/PHP_5_3/ext/gd/libgd/gdft.c branches/PHP_5_3/ext/gd/tests/b
tabe Wed, 24 Mar 2010 04:12:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=296693 Log: Fixed bug #51263 (imagettftext and rotated text uses wrong baseline) Bug: http://bugs.php.net/51263 (Open) imagettftext and rotated text uses wrong baseline (regression) Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/gd/libgd/gdft.c A php/php-src/branches/PHP_5_2/ext/gd/tests/bug51263.phpt U php/php-src/branches/PHP_5_3/ext/gd/libgd/gdft.c A php/php-src/branches/PHP_5_3/ext/gd/tests/bug51263.phpt U php/php-src/trunk/ext/gd/libgd/gdft.c A php/php-src/trunk/ext/gd/tests/bug51263.phpt Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2010-03-23 23:39:09 UTC (rev 296692) +++ php/php-src/branches/PHP_5_2/NEWS 2010-03-24 04:12:19 UTC (rev 296693) @@ -12,6 +12,8 @@ - Fixed bug #51338 (URL-Rewriter is still enabled if use_only_cookies is on). (Ilia, j dot jeising at gmail dot com) - Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). (Adam) +- Fixed bug #51263 (imagettftext and rotated text uses wrong baseline) + (cschneid at cschneid dot com, Takeshi Abe) - Fixed bug #51237 (milter SAPI crash on startup). (igmar at palsenberg dot com) - Fixed bug #51213 (pdo_mssql is trimming value of the money column). (Ilia, alexr at oplot dot com) Modified: php/php-src/branches/PHP_5_2/ext/gd/libgd/gdft.c === --- php/php-src/branches/PHP_5_2/ext/gd/libgd/gdft.c2010-03-23 23:39:09 UTC (rev 296692) +++ php/php-src/branches/PHP_5_2/ext/gd/libgd/gdft.c2010-03-24 04:12:19 UTC (rev 296693) @@ -1101,7 +1101,7 @@ /* now, draw to our target surface */ bm = (FT_BitmapGlyph) image; - gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 + ((pen.x + 31) >> 6), y + y1 + ((pen.y + 31) >> 6) - bm->top); + gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 + ((pen.x + 31) >> 6) + bm->left, y + y1 + ((pen.y + 31) >> 6) - bm->top); } /* record current glyph index for kerning */ Added: php/php-src/branches/PHP_5_2/ext/gd/tests/bug51263.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/bug51263.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/bug51263.phpt 2010-03-24 04:12:19 UTC (rev 296693) @@ -0,0 +1,32 @@ +--TEST-- +Bug #51263 (imagettftext and rotated text uses wrong baseline) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +OK Modified: php/php-src/branches/PHP_5_3/ext/gd/libgd/gdft.c === --- php/php-src/branches/PHP_5_3/ext/gd/libgd/gdft.c2010-03-23 23:39:09 UTC (rev 296692) +++ php/php-src/branches/PHP_5_3/ext/gd/libgd/gdft.c2010-03-24 04:12:19 UTC (rev 296693) @@ -1101,7 +1101,7 @@ /* now, draw to our target surface */ bm = (FT_BitmapGlyph) image; - gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 + ((pen.x + 31) >> 6), y + y1 + ((pen.y + 31) >> 6) - bm->top); + gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 + ((pen.x + 31) >> 6) + bm->left, y + y1 + ((pen.y + 31) >> 6) - bm->top); } /* record current glyph index for kerning */ Added: php/php-src/branches/PHP_5_3/ext/gd/tests/bug51263.phpt === --- php/php-src/branches/PHP_5_3/ext/gd/tests/bug51263.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/gd/tests/bug51263.phpt 2010-03-24 04:12:19 UTC (rev 296693) @@ -0,0 +1,32 @@ +--TEST-- +Bug #51263 (imagettftext and rotated text uses wrong baseline) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +OK Modified: php/php-src/trunk/ext/gd/libgd/gdft.c === --- php/php-src/trunk/ext/gd/libgd/gdft.c 2010-03-23 23:39:09 UTC (rev 296692) +++ php/php-src/trunk/ext/gd/libgd/gdft.c 2010-03-24 04:12:19 UTC (rev 296693) @@ -1101,7 +1101,7 @@ /* now, draw to our target surface */ bm = (FT_BitmapGlyph) image; - gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 + ((pen.x + 31) >> 6), y + y1 + ((pen.y + 31) >> 6) - bm->top); + gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 + ((pen.x + 31) >> 6) + bm->left, y + y1 + ((pen.y + 31) >> 6) - bm->top); } /* record current glyph index for kerning */ Added: php/php-src/trunk/ext/gd/tests/bug51263.phpt =
[PHP-CVS] svn: /php/php-src/trunk/ configure.in
sebastianTue, 23 Mar 2010 21:19:18 + Revision: http://svn.php.net/viewvc?view=revision&revision=296689 Log: Fix version. Changed paths: U php/php-src/trunk/configure.in Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2010-03-23 19:56:53 UTC (rev 296688) +++ php/php-src/trunk/configure.in 2010-03-23 21:19:18 UTC (rev 296689) @@ -41,7 +41,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=3 +PHP_RELEASE_VERSION=99 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/hash/hash.c
mgdm Tue, 23 Mar 2010 23:39:09 +
Revision: http://svn.php.net/viewvc?view=revision&revision=296692
Log:
Minor fix to constants registered in ext/hash, and update NEWS
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/hash/hash.c
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2010-03-23 22:21:39 UTC (rev 296691)
+++ php/php-src/trunk/NEWS 2010-03-23 23:39:09 UTC (rev 296692)
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 201?, PHP 5.3.99
+- Added FNV-1 hash support to ext/hash. (Michael Maclean)
- default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)
?? ??? 20??, PHP 5.3.3
Modified: php/php-src/trunk/ext/hash/hash.c
===
--- php/php-src/trunk/ext/hash/hash.c 2010-03-23 22:21:39 UTC (rev 296691)
+++ php/php-src/trunk/ext/hash/hash.c 2010-03-23 23:39:09 UTC (rev 296692)
@@ -76,9 +76,9 @@
{"SNEFRU256", "snefru256", 27},
{"MD2", "md2", 28},
{"FNV132", "fnv132", 29},
- {"FNV1a32", "fnv1a32", 30},
+ {"FNV1A32", "fnv1a32", 30},
{"FNV164", "fnv164", 31},
- {"FNV1a64", "fnv1a64", 32},
+ {"FNV1A64", "fnv1a64", 32},
};
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ext/hash/ config.m4 hash.c hash_fnv.c php_hash.h php_hash_fnv.h tests/fnv132.phpt tests/fnv164.phpt
Heya,
+ {"FNV1a32", "fnv1a32", 30},
+ {"FNV1a64", "fnv1a64", 32},
I think those two should be FNV1A32/64, since they seem to be used to
define MHASH_* constants, and constants with lowercased letter are
really non-standard.
Other than that, as mentionned on irc, thanks for the patch, and I'd
be interested if you could run a hash benchmark [1] on it, if you have
it compiled, to see how it compares to other fast algos.
Cheers,
Jordi
[1] http://www.php.net/manual/en/function.hash.php#89574
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/hash/ config.m4 hash.c hash_fnv.c php_hash.h php_hash_fnv.h tests/fnv132.phpt tests/fnv164.phpt
mgdm Tue, 23 Mar 2010 22:21:39 +
Revision: http://svn.php.net/viewvc?view=revision&revision=296691
Log:
Add FNV-1 support to ext/hash
Changed paths:
U php/php-src/trunk/ext/hash/config.m4
U php/php-src/trunk/ext/hash/hash.c
A php/php-src/trunk/ext/hash/hash_fnv.c
U php/php-src/trunk/ext/hash/php_hash.h
A php/php-src/trunk/ext/hash/php_hash_fnv.h
A php/php-src/trunk/ext/hash/tests/fnv132.phpt
A php/php-src/trunk/ext/hash/tests/fnv164.phpt
Modified: php/php-src/trunk/ext/hash/config.m4
===
--- php/php-src/trunk/ext/hash/config.m4 2010-03-23 22:08:17 UTC (rev 296690)
+++ php/php-src/trunk/ext/hash/config.m4 2010-03-23 22:21:39 UTC (rev 296691)
@@ -27,11 +27,11 @@
EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \
hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \
-hash_crc32.c hash_salsa.c"
+hash_crc32.c hash_salsa.c hash_fnv.c"
EXT_HASH_HEADERS="php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \
php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \
php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_salsa.h \
-php_hash_types.h"
+php_hash_fnv.h php_hash_types.h"
PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, $ext_shared)
ifdef([PHP_INSTALL_HEADERS], [
Modified: php/php-src/trunk/ext/hash/hash.c
===
--- php/php-src/trunk/ext/hash/hash.c 2010-03-23 22:08:17 UTC (rev 296690)
+++ php/php-src/trunk/ext/hash/hash.c 2010-03-23 22:21:39 UTC (rev 296691)
@@ -74,7 +74,11 @@
{"RIPEMD320", "ripemd320", 25},
{NULL, NULL, 26}, /* support needs to be added for snefru 128 */
{"SNEFRU256", "snefru256", 27},
- {"MD2", "md2", 28}
+ {"MD2", "md2", 28},
+ {"FNV132", "fnv132", 29},
+ {"FNV1a32", "fnv1a32", 30},
+ {"FNV164", "fnv164", 31},
+ {"FNV1a64", "fnv1a64", 32},
};
#endif
@@ -841,6 +845,8 @@
php_hash_register_algo("crc32b", &php_hash_crc32b_ops);
php_hash_register_algo("salsa10", &php_hash_salsa10_ops);
php_hash_register_algo("salsa20", &php_hash_salsa20_ops);
+ php_hash_register_algo("fnv132", &php_hash_fnv132_ops);
+ php_hash_register_algo("fnv164", &php_hash_fnv164_ops);
PHP_HASH_HAVAL_REGISTER(3,128);
PHP_HASH_HAVAL_REGISTER(3,160);
Added: php/php-src/trunk/ext/hash/hash_fnv.c
===
--- php/php-src/trunk/ext/hash/hash_fnv.c (rev 0)
+++ php/php-src/trunk/ext/hash/hash_fnv.c 2010-03-23 22:21:39 UTC (rev 296691)
@@ -0,0 +1,229 @@
+/*
+ +--+
+ | PHP Version 5|
+ +--+
+ | Copyright (c) 1997-2010 The PHP Group|
+ +--+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is|
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | lice...@php.net so we can mail you a copy immediately. |
+ +--+
+ | Author: Michael Maclean|
+ +--+
+*/
+
+/* $Id$ */
+
+/* Based on the public domain algorithm found at
+ http://www.isthe.com/chongo/tech/comp/fnv/index.html */
+
+#include "php_hash.h"
+#include "php_hash_fnv.h"
+
+const php_hash_ops php_hash_fnv132_ops = {
+ (php_hash_init_func_t) PHP_FNV132Init,
+ (php_hash_update_func_t) PHP_FNV132Update,
+ (php_hash_final_func_t) PHP_FNV132Final,
+ (php_hash_copy_func_t) php_hash_copy,
+ 4,
+ 4,
+ sizeof(PHP_FNV132_CTX)
+};
+
+ const php_hash_ops php_hash_fnv1a32_ops = {
+ (php_hash_init_func_t) PHP_FNV132Init,
+ (php_hash_update_func_t) PHP_FNV1a32Update,
+ (php_hash_final_func_t) PHP_FNV132Final,
+ (php_hash_copy_func_t) php_hash_copy,
+ 4,
+ 4,
+ sizeof(PHP_FNV132_CTX)
+};
+
+const php_hash_ops php_hash_fnv164_ops = {
+ (php_hash_init_func_t) PHP_FNV164Init,
+ (php_hash_update_func_t) PHP_FNV164Update,
+ (php_hash_final_func_t) PHP_FNV164Final,
+ (php_hash_copy_func_t) php_hash_copy,
+ 8,
+ 4,
+ sizeof(PHP_FNV164_CTX)
+};
+
+const php_hash_ops php_hash_fnv1a64_ops = {
+ (php_hash_init_func_t) PHP_FNV164Init,
+ (php_hash_update_func_t) PHP_FNV1a64Update,
+ (php_hash_final_func_t) PHP_FNV164Final,
+ (php_hash_copy_func_t) php_hash_copy,
[PHP-CVS] svn: /SVNROOT/ global_avail
derick Tue, 23 Mar 2010 22:08:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=296690 Log: - Give Michael php-src karma. Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2010-03-23 21:19:18 UTC (rev 296689) +++ SVNROOT/global_avail2010-03-23 22:08:17 UTC (rev 296690) @@ -16,7 +16,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,db! s,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor +avail|mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johann! es,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor # Engine karma is further restricted (this line MUST come after lines granting # php-src karma and before lines granting Zend/TSRM karma) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS main/php_version.h
On Tue, 2010-03-23 at 16:04 +, Derick Rethans wrote: > derick Tue, 23 Mar 2010 16:04:53 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=296680 > > Log: > - Set trunk version. > > Changed paths: > U php/php-src/trunk/NEWS > U php/php-src/trunk/main/php_version.h configure.in needs to be changed, too, else php_version.h will be overwritten. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/standard/html.c ext/standard/tests/strings/bug44703.phpt ext/standard/tests/strings/get_html_translation_table_basic1.phpt ext/standard/tests/strings/get_ht
rasmus Tue, 23 Mar 2010 18:08:06 +
Revision: http://svn.php.net/viewvc?view=revision&revision=296685
Log:
Switch default_charset, if not specified, from ISO-8859-1 to UTF-8
I have been wanting to make this change for years, but there is a small
chance of BC issues, so it shouldn't go into a minor release.
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/standard/html.c
U php/php-src/trunk/ext/standard/tests/strings/bug44703.phpt
UU
php/php-src/trunk/ext/standard/tests/strings/get_html_translation_table_basic1.phpt
UU
php/php-src/trunk/ext/standard/tests/strings/get_html_translation_table_basic2.phpt
UU
php/php-src/trunk/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
U php/php-src/trunk/ext/standard/tests/strings/htmlentities.phpt
U php/php-src/trunk/php.ini-development
U php/php-src/trunk/php.ini-production
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2010-03-23 18:01:11 UTC (rev 296684)
+++ php/php-src/trunk/NEWS 2010-03-23 18:08:06 UTC (rev 296685)
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 201?, PHP 5.3.99
+- default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)
?? ??? 20??, PHP 5.3.3
- Upgraded bundled PCRE to version 8.01. (Ilia)
Modified: php/php-src/trunk/ext/standard/html.c
===
--- php/php-src/trunk/ext/standard/html.c 2010-03-23 18:01:11 UTC (rev
296684)
+++ php/php-src/trunk/ext/standard/html.c 2010-03-23 18:08:06 UTC (rev
296685)
@@ -711,17 +711,17 @@
/* {{{ entity_charset determine_charset
* returns the charset identifier based on current locale or a hint.
- * defaults to iso-8859-1 */
+ * defaults to UTF-8 */
static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC)
{
int i;
- enum entity_charset charset = cs_8859_1;
+ enum entity_charset charset = cs_utf_8;
int len = 0;
zval *uf_result = NULL;
- /* Guarantee default behaviour for backwards compatibility */
+ /* Default is now UTF-8 */
if (charset_hint == NULL)
- return cs_8859_1;
+ return cs_utf_8;
if ((len = strlen(charset_hint)) != 0) {
goto det_charset;
@@ -855,7 +855,7 @@
}
}
if (!found) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "charset
`%s' not supported, assuming iso-8859-1",
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "charset
`%s' not supported, assuming utf-8",
charset_hint);
}
}
Modified: php/php-src/trunk/ext/standard/tests/strings/bug44703.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/bug44703.phpt 2010-03-23
18:01:11 UTC (rev 296684)
+++ php/php-src/trunk/ext/standard/tests/strings/bug44703.phpt 2010-03-23
18:08:06 UTC (rev 296685)
@@ -22,25 +22,25 @@
?>
--EXPECTF--
-Warning: htmlspecialchars(): charset `1' not supported, assuming iso-8859-1 in
%s on line %d
+Warning: htmlspecialchars(): charset `1' not supported, assuming utf-8 in %s
on line %d
string(35) "Test"
-Warning: htmlspecialchars(): charset `12' not supported, assuming iso-8859-1
in %s on line %d
+Warning: htmlspecialchars(): charset `12' not supported, assuming utf-8 in %s
on line %d
string(35) "Test"
-Warning: htmlspecialchars(): charset `125' not supported, assuming iso-8859-1
in %s on line %d
+Warning: htmlspecialchars(): charset `125' not supported, assuming utf-8 in %s
on line %d
string(35) "Test"
string(35) "Test"
-Warning: htmlspecialchars(): charset `12526' not supported, assuming
iso-8859-1 in %s on line %d
+Warning: htmlspecialchars(): charset `12526' not supported, assuming utf-8 in
%s on line %d
string(35) "Test"
string(8) "<>"
-Warning: htmlspecialchars(): charset `8666' not supported, assuming iso-8859-1
in %s on line %d
+Warning: htmlspecialchars(): charset `8666' not supported, assuming utf-8 in
%s on line %d
string(8) "<>"
string(8) "<>"
string(8) "<>"
string(8) "<>"
-Warning: htmlspecialchars(): charset
`'
not supported, assuming iso-8859-1 in %s on line %d
+Warning: htmlspecialchars(): charset
`'
not supported, assuming utf-8 in %s on line %d
string(8) "<>"
Modified:
php/php-src
[PHP-CVS] svn: /php/win-installer/trunk/
jmertic Tue, 23 Mar 2010 17:34:11 + Revision: http://svn.php.net/viewvc?view=revision&revision=296683 Log: Updated the ignored files. Changed paths: _U php/win-installer/trunk/ Property changes on: php/win-installer/trunk ___ Modified: svn:ignore - *.wixobj *.wixlib *.msi Files + *.wixobj *.wixlib *.msi Files ExtensionsComponents.wxs ExtensionsFeatures.wxs ExtensionsFeaturesBuild.wxs -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ NEWS main/php_version.h
derick Tue, 23 Mar 2010 16:04:53 + Revision: http://svn.php.net/viewvc?view=revision&revision=296680 Log: - Set trunk version. Changed paths: U php/php-src/trunk/NEWS U php/php-src/trunk/main/php_version.h Modified: php/php-src/trunk/NEWS === --- php/php-src/trunk/NEWS 2010-03-23 15:56:08 UTC (rev 296679) +++ php/php-src/trunk/NEWS 2010-03-23 16:04:53 UTC (rev 296680) @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 201?, PHP 5.3.99 + ?? ??? 20??, PHP 5.3.3 - Upgraded bundled PCRE to version 8.01. (Ilia) Modified: php/php-src/trunk/main/php_version.h === --- php/php-src/trunk/main/php_version.h2010-03-23 15:56:08 UTC (rev 296679) +++ php/php-src/trunk/main/php_version.h2010-03-23 16:04:53 UTC (rev 296680) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 3 +#define PHP_RELEASE_VERSION 99 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.3-dev" -#define PHP_VERSION_ID 50303 +#define PHP_VERSION "5.3.99-dev" +#define PHP_VERSION_ID 50399 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/
derick Tue, 23 Mar 2010 15:56:08 + Revision: http://svn.php.net/viewvc?view=revision&revision=296679 Log: - Resurrect trunk for branches/PHP_5_3 Changed paths: A + php/php-src/trunk/ (from php/php-src/branches/PHP_5_3/:r296678) Property changes on: php/php-src/trunk ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat configure.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini diff Added: svn:mergeinfo + /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd_wireprotocol.h
kalleTue, 23 Mar 2010 13:21:22 + Revision: http://svn.php.net/viewvc?view=revision&revision=296669 Log: Fix declaring Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h 2010-03-23 12:17:10 UTC (rev 296668) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h 2010-03-23 13:21:22 UTC (rev 296669) @@ -268,7 +268,7 @@ PHPAPI MYSQLND_PROTOCOL * mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC); -PHPAPI void mysqlnd_protocol_free(MYSQLND_PROTOCOL * net TSRMLS_DC); +PHPAPI void mysqlnd_protocol_free(MYSQLND_PROTOCOL * const protocol TSRMLS_DC) #endif /* MYSQLND_WIREPROTOCOL_H */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/ext/session/tests/bug51338.phpt PHP_5_3/ext/session/tests/bug51338.phpt
iliaaTue, 23 Mar 2010 11:51:38 + Revision: http://svn.php.net/viewvc?view=revision&revision=29 Log: Added test for bug #51338 Bug: http://bugs.php.net/51338 (Closed) URL-Rewriter should not get enabled if use_only_cookies is set to 1 Changed paths: A php/php-src/branches/PHP_5_2/ext/session/tests/bug51338.phpt A php/php-src/branches/PHP_5_3/ext/session/tests/bug51338.phpt Added: php/php-src/branches/PHP_5_2/ext/session/tests/bug51338.phpt === --- php/php-src/branches/PHP_5_2/ext/session/tests/bug51338.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/session/tests/bug51338.phpt 2010-03-23 11:51:38 UTC (rev 29) @@ -0,0 +1,15 @@ +--TEST-- +Bug #51338 (URL-Rewriter should not get enabled if use_only_cookies is set to 1) +--SKIPIF-- + +--INI-- +session.use_only_cookies=1 +session.use_trans_sid=1 +--FILE-- + +--INI-- +session.use_only_cookies=1 +session.use_trans_sid=1 +--FILE-- +-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
