[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Jul 31 01:32:13 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3123r2=1.3124diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3123 php-src/ChangeLog:1.3124 --- php-src/ChangeLog:1.3123Wed Jul 30 01:31:52 2008 +++ php-src/ChangeLog Thu Jul 31 01:32:12 2008 @@ -1,3 +1,165 @@ +2008-07-30 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_3) + scripts/phpize.m4: + MFH:- Detect whether debugging was enabled in PHP and drop optimizing flags + if so (merge from configure.in) + +* scripts/phpize.m4: + - Detect whether debugging was enabled in PHP and drop optimizing flags if + so (merge from configure.in) + +* configure.in: + CS + +2008-07-30 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ext/intl/locale/locale_methods.c: + - MFH: Fixed memory leak. + +* ext/intl/locale/locale_methods.c: + - Fixed memory leak. + +2008-07-30 Derick Rethans [EMAIL PROTECTED] + +* (PHP_5_3) + ext/date/php_date.c + ext/date/lib/parse_date.c + ext/date/lib/parse_date.re + ext/date/tests/012.phpt + ext/date/tests/013.phpt + ext/date/tests/date_parse_001.phpt: + - MFH: Fixed a bug with the -MM format not resetting the day correctly. + - MFH: Fixed a bug in the DateTime-modify() methods, it would not use the +advanced relative time strings. + - MFH: Fixed return values of all the modifying methods, they now properly +return the object itself. + +2008-07-30 Felipe Pena [EMAIL PROTECTED] + +* ext/intl/locale/locale_methods.c: + - MFB: Fixed crash when NULL is passed to locale_accept_from_http() + +2008-07-30 Stanislav Malyshev [EMAIL PROTECTED] + +* TSRM/readdir.h + TSRM/readdir.h + TSRM/tsrm_config.w32.h + TSRM/tsrm_config.w32.h: + fix warnings + +2008-07-30 Derick Rethans [EMAIL PROTECTED] + +* ext/date/php_date.c + ext/date/lib/parse_date.c + ext/date/lib/parse_date.re + ext/date/tests/012.phpt + ext/date/tests/013.phpt + ext/date/tests/date_parse_001.phpt: + - Fixed a bug with the -MM format not resetting the day correctly. + - Fixed a bug in the DateTime-modify() methods, it would not use the + advanced +relative time strings. + - Fixed return values of all the modifying methods, they now properly + return +the object itself. + +2008-07-30 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ext/intl/locale/locale_methods.c: + - Fixed crash when NULL is passed to locale_accept_from_http() + +2008-07-30 Rasmus Lerdorf [EMAIL PROTECTED] + +* ext/json/JSON_parser.c + ext/json/JSON_parser.c + ext/json/JSON_parser.c: + We can afford a larger stack here and other json parsers out there + go deeper than 128. + +2008-07-30 Felipe Pena [EMAIL PROTECTED] + +* ZendEngine2/tests/constants_006.phpt: + - New test + +* ZendEngine2/tests/constants_006.phpt + ZendEngine2/tests/constants_006.phpt: + + file constants_006.phpt was initially added on branch PHP_5_3. + +2008-07-30 Antony Dovgal [EMAIL PROTECTED] + +* ext/openssl/openssl.c + ext/openssl/openssl.c: + fix folding + +* (PHP_5_3) + ext/gd/tests/bug44849.phpt: + enable this test on all platforms, no reason to limit it windows only + +* ext/gd/tests/bug44849.phpt + ext/gd/tests/imagecolorclosesthwb.phpt: + fix tests + +* (PHP_5_3) + ext/gd/tests/imagecolorclosesthwb.phpt: + fix test + +2008-07-30 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_5_3) + ext/mbstring/config.w32: + - mbstring is built shared on windows +it looks like the idea was to have it static (but does not work) + +* (PHP_5_3) + ext/mbstring/oniguruma/regint.h: + - fix VC9 build (5.3+) +Please do not revert this fix again and to merge 5.3's changes to HEAD + +2008-07-30 Jani Taskinen [EMAIL PROTECTED] + +* ext/date/php_date.c + scripts/phpize.m4: + ws + +2008-07-30 Kalle Sommer Nielsen [EMAIL PROTECTED] + +* (PHP_5_3) + ext/gd/tests/imagecolorclosesthwb.phpt: + MFH: Add test for imagecolorclosesthwb() + +* ext/gd/tests/imagecolorclosesthwb.phpt + ext/gd/tests/imagecolorclosesthwb.phpt: + + Add test for imagecolorclosesthwb() + +* ext/gd/tests/bug44849.phpt: + MFB: Add test case for #44849 + +* ext/gd/tests/bug44849.phpt + ext/gd/tests/bug44849.phpt: + + file bug44849.phpt was initially added on branch PHP_5_3. + +2008-07-30 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/zend_language_scanner.c + ZendEngine2/zend_language_scanner.l: + - MFH: Fixed BC break: The magic constants must be case-insensitive. + +* ZendEngine2/zend_language_scanner.c +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Jul 31 01:32:17 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1348r2=1.1349diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1348 ZendEngine2/ChangeLog:1.1349 --- ZendEngine2/ChangeLog:1.1348Wed Jul 30 01:31:56 2008 +++ ZendEngine2/ChangeLog Thu Jul 31 01:32:16 2008 @@ -1,3 +1,22 @@ +2008-07-30 Felipe Pena [EMAIL PROTECTED] + +* tests/constants_006.phpt: + - New test + +* tests/constants_006.phpt + tests/constants_006.phpt: + + file constants_006.phpt was initially added on branch PHP_5_3. + +* (PHP_5_3) + zend_language_scanner.c + zend_language_scanner.l: + - MFH: Fixed BC break: The magic constants must be case-insensitive. + +* zend_language_scanner.c + zend_language_scanner.l: + - Fixed BC break: The magic constants must be case-insensitive. + 2008-07-29 Dmitry Stogov [EMAIL PROTECTED] * zend_exceptions.c @@ -25189,7 +25208,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1348 2008/07/30 01:31:56 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1349 2008/07/31 01:32:16 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -26913,7 +26932,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1348 2008/07/30 01:31:56 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1349 2008/07/31 01:32:16 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src / Makefile.gcov
hi, On Wed, Jul 30, 2008 at 2:43 AM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Pierre, but we are not creating tests for any of these, actually all of these have their own testing system which in most case is not even bundeled or executable through PHP. So the only way out is to run their respective test systems by bundling them and integrating them into our build and gcov runs. However our gcov runs are highly specialized. So I do not see any point in doing that. Nor do I see a point in having any of these pull pown or percentage and in that way making us look worse then we are and even keep us from increasing our limits and goals. It may be true for pcre or mbstring's libs not for GD for the reasons I stated earlier. 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 / Makefile.gcov
Hello Pierre, Wednesday, July 30, 2008, 8:56:41 AM, you wrote: hi, On Wed, Jul 30, 2008 at 2:43 AM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Pierre, but we are not creating tests for any of these, actually all of these have their own testing system which in most case is not even bundeled or executable through PHP. So the only way out is to run their respective test systems by bundling them and integrating them into our build and gcov runs. However our gcov runs are highly specialized. So I do not see any point in doing that. Nor do I see a point in having any of these pull pown or percentage and in that way making us look worse then we are and even keep us from increasing our limits and goals. It may be true for pcre or mbstring's libs not for GD for the reasons I stated earlier. So you are saying that PHP can use GD in a way that makes it brake which is not covered by GD's testing? Sounds very bad, actually having GD a PHP project makes it a really special case. So if you want to and can find a good way of integrating GD testing than I am happy to address that. Unless you deliver a solution that goes for our goal which is 90% required for green in the near future I however have to exclude it. 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 / Makefile.gcov
Hi, On Wed, Jul 30, 2008 at 9:18 AM, Marcus Boerger [EMAIL PROTECTED] wrote: So you are saying that PHP can use GD in a way that makes it brake which is not covered by GD's testing? That's not what I'm saying. First, GD in php is not the same library that you have in libgd.org and is better integrated with php (not possible to do so using an external library). Secondly, almost all tests available in libgd's tests suite have been ported or are in the process to be ported to php. Sounds very bad, actually having GD a PHP project makes it a really special case. It is irrelevant in this case, they are not the same. So if you want to and can find a good way of integrating GD testing than I am happy to address that. It is the case already. Unless you deliver a solution that goes for our goal which is 90% required for green in the near future I however have to exclude it. As I agree that good coverage is a noble cause. I prefer to have a slightly lower visible coverage and get the code actually covered marked as such. Please revert this change for GD. -- 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-internals-win /script phpsdk_setvars.bat
pajoye Wed Jul 30 07:35:19 2008 UTC Modified files: /php-internals-win/script phpsdk_setvars.bat Log: - bison.simple path http://cvs.php.net/viewvc.cgi/php-internals-win/script/phpsdk_setvars.bat?r1=1.1r2=1.2diff_format=u Index: php-internals-win/script/phpsdk_setvars.bat diff -u php-internals-win/script/phpsdk_setvars.bat:1.1 php-internals-win/script/phpsdk_setvars.bat:1.2 --- php-internals-win/script/phpsdk_setvars.bat:1.1 Tue Jul 29 13:38:00 2008 +++ php-internals-win/script/phpsdk_setvars.bat Wed Jul 30 07:35:19 2008 @@ -2,9 +2,10 @@ @ECHO OFF :: Add skd\bin directory to the path -SET PHP_SDK_BIN_PATH=%~dp0 +SET PHP_SDK_SCRIPT_PATH=%~dp0 +SET PHP_SDK_BIN_PATH=%PHP_SDK_SCRIPT_PATH%\..\bin\ -SET PATH=%PATH%;%PHP_SDK_BIN_PATH%;%PHP_SDK_BIN_PATH%\..\script +SET PATH=%PATH%;%PHP_SDK_SCRIPT_PATH%;%PHP_SDK_BIN_PATH% :: Set BISON_SIMPLE SET BISON_SIMPLE=%PHP_SDK_BIN_PATH%bison.simple -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / Makefile.gcov
On Tue, 29 Jul 2008, Pierre Joye wrote: On Tue, Jul 29, 2008 at 10:10 AM, Marcus Boerger [EMAIL PROTECTED] wrote: helly Tue Jul 29 08:10:31 2008 UTC Modified files: /php-srcMakefile.gcov Log: - Exclude bundled libs from gcov processing Why? It makes sense to keep it, for example for GD as the lib and php are well integrated. I'd like the same for libmagic (very new, unknown) and timelib (because it's well integrated). 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 / Makefile.gcov
Hello Pierre, Wednesday, July 30, 2008, 9:33:10 AM, you wrote: Hi, On Wed, Jul 30, 2008 at 9:18 AM, Marcus Boerger [EMAIL PROTECTED] wrote: So you are saying that PHP can use GD in a way that makes it brake which is not covered by GD's testing? That's not what I'm saying. First, GD in php is not the same library that you have in libgd.org and is better integrated with php (not possible to do so using an external library). Secondly, almost all tests available in libgd's tests suite have been ported or are in the process to be ported to php. Sounds very bad, actually having GD a PHP project makes it a really special case. It is irrelevant in this case, they are not the same. So if you want to and can find a good way of integrating GD testing than I am happy to address that. It is the case already. Unless you deliver a solution that goes for our goal which is 90% required for green in the near future I however have to exclude it. As I agree that good coverage is a noble cause. I prefer to have a slightly lower visible coverage and get the code actually covered marked as such. Please revert this change for GD. So it appears that gd is in the exact same situation as ext/dba/libcdb which I explicitly ported for PHP. Now that one has 82.1% coverage so obviously has no larger non PHP chunks and also seems to be triggered in quite enough ways. So I didn't pull it. My intention was to drop libs that hopefully have there own testing infrastructure and don't get fully triggered by PHP testing. Best example is pcre. Where it simply doesn't make sense to write phpt tests that trigger all those edge cases from PHP. So we rather exclude that from our calculations as we don't even have the intention to test those. 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 / Makefile.gcov
Hello Derick, Wednesday, July 30, 2008, 9:50:18 AM, you wrote: On Tue, 29 Jul 2008, Pierre Joye wrote: On Tue, Jul 29, 2008 at 10:10 AM, Marcus Boerger [EMAIL PROTECTED] wrote: helly Tue Jul 29 08:10:31 2008 UTC Modified files: /php-srcMakefile.gcov Log: - Exclude bundled libs from gcov processing Why? It makes sense to keep it, for example for GD as the lib and php are well integrated. I'd like the same for libmagic (very new, unknown) and timelib (because it's well integrated). timelib, yeah unknown, yeah new, so is it us to write a test system for them? no! datelib, cool, great, damn well tested, so no need to test again. Or do you want all your libdate tests to php? regards, Derick 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 / Makefile.gcov
On Wed, 30 Jul 2008, Marcus Boerger wrote: Wednesday, July 30, 2008, 9:50:18 AM, you wrote: On Tue, 29 Jul 2008, Pierre Joye wrote: On Tue, Jul 29, 2008 at 10:10 AM, Marcus Boerger [EMAIL PROTECTED] wrote: helly Tue Jul 29 08:10:31 2008 UTC Modified files: /php-srcMakefile.gcov Log: - Exclude bundled libs from gcov processing Why? It makes sense to keep it, for example for GD as the lib and php are well integrated. I'd like the same for libmagic (very new, unknown) and timelib (because it's well integrated). timelib, yeah unknown, yeah new, so is it us to write a test system for them? no! Uhm yes - we need to support it - libmagic requires most likely a fork. And what does it matter if there are a few more libs in here?! datelib, cool, great, damn well tested, so no need to test again. Or do you want all your libdate tests to php? Yes, because the behavior in PHP is some times slightly different -- and should be. 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/date php_date.c
janiWed Jul 30 08:13:03 2008 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
ws
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.201r2=1.202diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.201 php-src/ext/date/php_date.c:1.202
--- php-src/ext/date/php_date.c:1.201 Tue Jul 29 12:56:18 2008
+++ php-src/ext/date/php_date.c Wed Jul 30 08:13:02 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.201 2008/07/29 12:56:18 dmitry Exp $ */
+/* $Id: php_date.c,v 1.202 2008/07/30 08:13:02 jani Exp $ */
#include php.h
#include php_streams.h
@@ -660,8 +660,8 @@
/* This is need to ensure that session extension request shutdown occurs 1st,
because it uses the date extension */
static const zend_module_dep date_deps[] = {
-ZEND_MOD_OPTIONAL(session)
-{NULL, NULL, NULL}
+ ZEND_MOD_OPTIONAL(session)
+ {NULL, NULL, NULL}
};
/* {{{ Module struct */
@@ -2105,21 +2105,21 @@
zend_object_iterator *date_object_period_get_iterator(zend_class_entry *ce,
zval *object, int by_ref TSRMLS_DC)
{
-date_period_it *iterator = emalloc(sizeof(date_period_it));
-php_period_obj *dpobj= (php_period_obj
*)zend_object_store_get_object(object TSRMLS_CC);
+ date_period_it *iterator = emalloc(sizeof(date_period_it));
+ php_period_obj *dpobj= (php_period_obj
*)zend_object_store_get_object(object TSRMLS_CC);
+
+ if (by_ref) {
+ zend_error(E_ERROR, An iterator cannot be used with foreach by
reference);
+ }
-if (by_ref) {
-zend_error(E_ERROR, An iterator cannot be used with foreach by
reference);
-}
-
-Z_ADDREF_P(object);
-iterator-intern.data = (void*) dpobj;
-iterator-intern.funcs = date_period_it_funcs;
+ Z_ADDREF_P(object);
+ iterator-intern.data = (void*) dpobj;
+ iterator-intern.funcs = date_period_it_funcs;
iterator-date_period_zval = object;
-iterator-object = dpobj;
-iterator-current = NULL;
+ iterator-object = dpobj;
+ iterator-current = NULL;
-return (zend_object_iterator*)iterator;
+ return (zend_object_iterator*)iterator;
}
static void date_register_classes(TSRMLS_D)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / Makefile.gcov
On 2008/07/30, at 15:56, Pierre Joye wrote: hi, On Wed, Jul 30, 2008 at 2:43 AM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Pierre, but we are not creating tests for any of these, actually all of these have their own testing system which in most case is not even bundeled or executable through PHP. So the only way out is to run their respective test systems by bundling them and integrating them into our build and gcov runs. However our gcov runs are highly specialized. So I do not see any point in doing that. Nor do I see a point in having any of these pull pown or percentage and in that way making us look worse then we are and even keep us from increasing our limits and goals. It may be true for pcre or mbstring's libs not for GD for the reasons I stated earlier. I got the same opinion as Marcus's for mbstring and PCRE, while I doubt bundling three different regex libraries is a good idea. The maintainers know better about the treatment of the other bundled libraries, I guess. Moriyoshi 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 -- 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/oniguruma regint.h
pajoye Wed Jul 30 08:38:37 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring/oniguruma regint.h Log: - fix VC9 build (5.3+) Please do not revert this fix again and to merge 5.3's changes to HEAD http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/regint.h?r1=1.5.4.5.2.3r2=1.5.4.5.2.4diff_format=u Index: php-src/ext/mbstring/oniguruma/regint.h diff -u php-src/ext/mbstring/oniguruma/regint.h:1.5.4.5.2.3 php-src/ext/mbstring/oniguruma/regint.h:1.5.4.5.2.4 --- php-src/ext/mbstring/oniguruma/regint.h:1.5.4.5.2.3 Sun Jul 13 01:25:22 2008 +++ php-src/ext/mbstring/oniguruma/regint.h Wed Jul 30 08:38:37 2008 @@ -124,9 +124,11 @@ #define xmemmovememmove #if defined(_WIN32) !defined(__GNUC__) #define xalloca _alloca +#if _MSC_VER 1500 #ifndef vsnprintf #define vsnprintf _vsnprintf #endif +#endif #else #define xalloca alloca #endif -- 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/mbstring/oniguruma regint.h
What about sharing your patch with the author of the library? Moriyoshi On 2008/07/30, at 17:38, Pierre-Alain Joye wrote: pajoye Wed Jul 30 08:38:37 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring/oniguruma regint.h Log: - fix VC9 build (5.3+) Please do not revert this fix again and to merge 5.3's changes to HEAD http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/ regint.h?r1=1.5.4.5.2.3r2=1.5.4.5.2.4diff_format=u Index: php-src/ext/mbstring/oniguruma/regint.h diff -u php-src/ext/mbstring/oniguruma/regint.h:1.5.4.5.2.3 php-src/ ext/mbstring/oniguruma/regint.h:1.5.4.5.2.4 --- php-src/ext/mbstring/oniguruma/regint.h:1.5.4.5.2.3 Sun Jul 13 01:25:22 2008 +++ php-src/ext/mbstring/oniguruma/regint.h Wed Jul 30 08:38:37 2008 @@ -124,9 +124,11 @@ #define xmemmovememmove #if defined(_WIN32) !defined(__GNUC__) #define xalloca _alloca +#if _MSC_VER 1500 #ifndef vsnprintf #define vsnprintf _vsnprintf #endif +#endif #else #define xalloca alloca #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- 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/mbstring/oniguruma regint.h
On Wed, Jul 30, 2008 at 10:41 AM, Moriyoshi Koizumi [EMAIL PROTECTED] wrote: What about sharing your patch with the author of the library? Where is it hosted? -- 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_3) /ext/mbstring/oniguruma regint.h
hi Moriyoshi, On Wed, Jul 30, 2008 at 10:41 AM, Moriyoshi Koizumi [EMAIL PROTECTED] wrote: What about sharing your patch with the author of the library? By the way, there is another problem in exif related to mbstring: Creating library Debug_TS\php_exif.lib and object Debug_TS\php_exif.exp exif.obj : error LNK2019: unresolved external symbol _php_mb_check_encoding_list referenced in function _OnUpdateEncode exif.obj : error LNK2019: unresolved external symbol _php_mb_convert_encoding referenced in function _exif_process_user_comment Debug_TS\php_exif.dll : fatal error LNK1120: 2 unresolved externals When mbstring is built statically. 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
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring config.w32
pajoye Wed Jul 30 09:26:15 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring config.w32 Log: - mbstring is built shared on windows it looks like the idea was to have it static (but does not work) http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.4.2.2r2=1.10.2.1.2.4.2.3diff_format=u Index: php-src/ext/mbstring/config.w32 diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.2 php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.3 --- php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.2Thu Jul 24 17:00:03 2008 +++ php-src/ext/mbstring/config.w32 Wed Jul 30 09:26:15 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.10.2.1.2.4.2.2 2008/07/24 17:00:03 moriyoshi Exp $ +// $Id: config.w32,v 1.10.2.1.2.4.2.3 2008/07/30 09:26:15 pajoye Exp $ // vim:ft=javascript ARG_ENABLE(mbstring, multibyte string functions, no); @@ -12,7 +12,7 @@ FSO.CopyFile(ext\\mbstring\\oniguruma\\win32\\config.h, ext\\mbstring\\oniguruma\\config.h, true); - EXTENSION(mbstring, mbstring.c php_unicode.c mb_gpc.c, null, + EXTENSION(mbstring, mbstring.c php_unicode.c mb_gpc.c, true, -Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \ -Iext/mbstring/oniguruma /D NOT_RUBY=1 /D LIBMBFL_EXPORTS=1 \ /D HAVE_STDARG_PROTOTYPES=1 /D HAVE_CONFIG_H /D HAVE_STDLIB_H \ -- 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/mbstring/oniguruma regint.h
I thought you found README in the library directory :-( http://www.geocities.jp/kosako3/oniguruma/ Moriyoshi On 2008/07/30, at 17:47, Pierre Joye wrote: On Wed, Jul 30, 2008 at 10:41 AM, Moriyoshi Koizumi [EMAIL PROTECTED] wrote: What about sharing your patch with the author of the library? Where is it hosted? -- 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(PHP_5_3) /ext/gd/tests imagecolorclosesthwb.phpt
tony2001Wed Jul 30 09:55:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd/tests imagecolorclosesthwb.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imagecolorclosesthwb.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/gd/tests/imagecolorclosesthwb.phpt
diff -u php-src/ext/gd/tests/imagecolorclosesthwb.phpt:1.1.2.2
php-src/ext/gd/tests/imagecolorclosesthwb.phpt:1.1.2.3
--- php-src/ext/gd/tests/imagecolorclosesthwb.phpt:1.1.2.2 Wed Jul 30
04:35:57 2008
+++ php-src/ext/gd/tests/imagecolorclosesthwb.phpt Wed Jul 30 09:55:20 2008
@@ -7,21 +7,24 @@
?
--FILE--
?php
- $im = imagecreatefrompng('test.png');
+ $im = imagecreatefrompng(dirname(__FILE__).'/test.png');
- echo imagecolorclosesthwb($im, 255, 50, 0);
+ var_dump(imagecolorclosesthwb($im, 255, 50, 0));
- imagecolorclosesthwb(NULL);
- imagecolorclosesthwb(NULL, NULL, NULL, NULL);
- imagecolorclosesthwb($im, hello, from, gd);
+ var_dump(imagecolorclosesthwb(NULL));
+ var_dump(imagecolorclosesthwb(NULL, NULL, NULL, NULL));
+ var_dump(imagecolorclosesthwb($im, hello, from, gd));
imagedestroy($im);
?
--EXPECTF--
-16724480
+int(16724480)
-Warning: imagecolorclosesthwb\(\) expects exactly 4 parameters, 1 given in .*
code on line \d+
+Warning: imagecolorclosesthwb() expects exactly 4 parameters, 1 given in %s on
line %d
+NULL
-Warning: imagecolorclosesthwb\(\) expects parameter 1 to be resource, null
given in .* code on line \d+
+Warning: imagecolorclosesthwb() expects parameter 1 to be resource, null given
in %s on line %d
+NULL
-Warning: imagecolorclosesthwb\(\) expects parameter 2 to be long, string given
in .* code on line \d+
\ No newline at end of file
+Warning: imagecolorclosesthwb() expects parameter 2 to be long, string given
in %s on line %d
+NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/tests bug44849.phpt imagecolorclosesthwb.phpt
tony2001Wed Jul 30 09:57:56 2008 UTC
Modified files:
/php-src/ext/gd/tests bug44849.phpt imagecolorclosesthwb.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug44849.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/gd/tests/bug44849.phpt
diff -u php-src/ext/gd/tests/bug44849.phpt:1.2
php-src/ext/gd/tests/bug44849.phpt:1.3
--- php-src/ext/gd/tests/bug44849.phpt:1.2 Wed Jul 30 01:38:37 2008
+++ php-src/ext/gd/tests/bug44849.phpt Wed Jul 30 09:57:55 2008
@@ -2,8 +2,7 @@
Bug #44849 (imagecolorclosesthwb is not available on Windows)
--SKIPIF--
?php
- if(!extension_loaded('gd')){ die('skip: gd extension not available'); }
- if(strtoupper(substr(PHP_OS, 0, 3)) != 'WIN'){ die('skip: not a Windows
operating system'); }
+ if(!extension_loaded('gd')){ die('skip gd extension not available'); }
?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imagecolorclosesthwb.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/gd/tests/imagecolorclosesthwb.phpt
diff -u php-src/ext/gd/tests/imagecolorclosesthwb.phpt:1.1
php-src/ext/gd/tests/imagecolorclosesthwb.phpt:1.2
--- php-src/ext/gd/tests/imagecolorclosesthwb.phpt:1.1 Wed Jul 30 04:35:21 2008
+++ php-src/ext/gd/tests/imagecolorclosesthwb.phpt Wed Jul 30 09:57:55 2008
@@ -7,21 +7,24 @@
?
--FILE--
?php
- $im = imagecreatefrompng('test.png');
+ $im = imagecreatefrompng(dirname(__FILE__).'/test.png');
- echo imagecolorclosesthwb($im, 255, 50, 0);
+ var_dump(imagecolorclosesthwb($im, 255, 50, 0));
- imagecolorclosesthwb(NULL);
- imagecolorclosesthwb(NULL, NULL, NULL, NULL);
- imagecolorclosesthwb($im, hello, from, gd);
+ var_dump(imagecolorclosesthwb(NULL));
+ var_dump(imagecolorclosesthwb(NULL, NULL, NULL, NULL));
+ var_dump(imagecolorclosesthwb($im, hello, from, gd));
imagedestroy($im);
?
--EXPECTF--
-16724480
+int(16724480)
-Warning: imagecolorclosesthwb\(\) expects exactly 4 parameters, 1 given in .*
code on line \d+
+Warning: imagecolorclosesthwb() expects exactly 4 parameters, 1 given in %s on
line %d
+NULL
-Warning: imagecolorclosesthwb\(\) expects parameter 1 to be resource, null
given in .* code on line \d+
+Warning: imagecolorclosesthwb() expects parameter 1 to be resource, null given
in %s on line %d
+NULL
-Warning: imagecolorclosesthwb\(\) expects parameter 2 to be long, string given
in .* code on line \d+
\ No newline at end of file
+Warning: imagecolorclosesthwb() expects parameter 2 to be long, string given
in %s on line %d
+NULL
--
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/gd/tests bug44849.phpt
tony2001Wed Jul 30 09:58:55 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd/tests bug44849.phpt
Log:
enable this test on all platforms, no reason to limit it windows only
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug44849.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/gd/tests/bug44849.phpt
diff -u php-src/ext/gd/tests/bug44849.phpt:1.1.2.1
php-src/ext/gd/tests/bug44849.phpt:1.1.2.2
--- php-src/ext/gd/tests/bug44849.phpt:1.1.2.1 Wed Jul 30 01:37:54 2008
+++ php-src/ext/gd/tests/bug44849.phpt Wed Jul 30 09:58:55 2008
@@ -2,8 +2,7 @@
Bug #44849 (imagecolorclosesthwb is not available on Windows)
--SKIPIF--
?php
- if(!extension_loaded('gd')){ die('skip: gd extension not available'); }
- if(strtoupper(substr(PHP_OS, 0, 3)) != 'WIN'){ die('skip: not a Windows
operating system'); }
+ if(!extension_loaded('gd')){ die('skip gd extension not available'); }
?
--FILE--
?php
--
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/mbstring/oniguruma regint.h
hi! On Wed, Jul 30, 2008 at 11:47 AM, Moriyoshi Koizumi [EMAIL PROTECTED] wrote: I thought you found README in the library directory :-( http://www.geocities.jp/kosako3/oniguruma/ To be honest, I did not even read it. I don't really have the time right now to wonder if the upstream lib is updated or not. I may do it in 2-3 weeks. Or feel free to do it if you have the time/need :-) 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
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
tony2001Wed Jul 30 11:58:44 2008 UTC
Modified files:
/php-src/ext/opensslopenssl.c
Log:
fix folding
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.165r2=1.166diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.165 php-src/ext/openssl/openssl.c:1.166
--- php-src/ext/openssl/openssl.c:1.165 Fri Jul 18 23:59:49 2008
+++ php-src/ext/openssl/openssl.c Wed Jul 30 11:58:43 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.165 2008/07/18 23:59:49 hnangelo Exp $ */
+/* $Id: openssl.c,v 1.166 2008/07/30 11:58:43 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -392,6 +392,7 @@
ZEND_ARG_INFO(0, dh_key)
ZEND_END_ARG_INFO()
/* }}} */
+
/* {{{ openssl_functions[]
*/
const zend_function_entry openssl_functions[] = {
@@ -513,11 +514,11 @@
}
/* }}} */
-/* {{{ openssl - PHP bridging */
+/* openssl - PHP bridging */
/* true global; readonly after module startup */
static char default_ssl_conf_filename[MAXPATHLEN];
-struct php_x509_request {
+struct php_x509_request { /* {{{ */
LHASH * global_config; /* Global SSL config */
LHASH * req_config; /* SSL config for this request */
const EVP_MD * md_alg;
@@ -534,7 +535,7 @@
EVP_PKEY * priv_key;
};
-
+/* }}} */
static X509 * php_openssl_x509_from_zval(zval ** val, int makeresource, long *
resourceval TSRMLS_DC);
static EVP_PKEY * php_openssl_evp_from_zval(zval ** val, int public_key, char
* passphrase, int makeresource, long * resourceval TSRMLS_DC);
@@ -544,7 +545,6 @@
static X509_REQ * php_openssl_csr_from_zval(zval ** val, int makeresource,
long * resourceval TSRMLS_DC);
static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request *
req TSRMLS_DC);
-
static void add_ascii_assoc_name_entry(zval * val, char * key, X509_NAME *
name, int shortname TSRMLS_DC) /* {{{ */
{
zval *subitem, *subentries;
@@ -707,12 +707,7 @@
}
/* }}} */
-static inline int php_openssl_config_check_syntax(
- const char * section_label,
- const char * config_filename,
- const char * section,
- LHASH * config TSRMLS_DC
- ) /* {{{ */
+static inline int php_openssl_config_check_syntax(const char * section_label,
const char * config_filename, const char * section, LHASH * config TSRMLS_DC)
/* {{{ */
{
X509V3_CTX ctx;
@@ -779,13 +774,7 @@
else \
varname = defval
-
-
-static int php_openssl_parse_config(
- struct php_x509_request * req,
- zval * optional_args
- TSRMLS_DC
- ) /* {{{ */
+static int php_openssl_parse_config(struct php_x509_request * req, zval *
optional_argsTSRMLS_DC) /* {{{ */
{
char * str;
zval ** item;
@@ -4980,7 +4969,6 @@
}
/* }}} */
-
/* {{{ proto string openssl_dh_compute_key(string pub_key, resource dh_key) U
Computes shared sicret for public value of remote DH key and local DH key */
PHP_FUNCTION(openssl_dh_compute_key)
--
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
tony2001Wed Jul 30 11:59:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/opensslopenssl.c
Log:
fix folding
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.15r2=1.98.2.5.2.41.2.16diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.15
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.16
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.15Tue Jul 15 03:20:44 2008
+++ php-src/ext/openssl/openssl.c Wed Jul 30 11:59:05 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.15 2008/07/15 03:20:44 hnangelo Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.16 2008/07/30 11:59:05 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -395,6 +395,7 @@
ZEND_ARG_INFO(0, dh_key)
ZEND_END_ARG_INFO()
/* }}} */
+
/* {{{ openssl_functions[]
*/
const zend_function_entry openssl_functions[] = {
@@ -530,7 +531,7 @@
}
/* }}} */
-/* {{{ openssl - PHP bridging */
+/* openssl - PHP bridging */
/* true global; readonly after module startup */
static char default_ssl_conf_filename[MAXPATHLEN];
@@ -561,7 +562,6 @@
static X509_REQ * php_openssl_csr_from_zval(zval ** val, int makeresource,
long * resourceval TSRMLS_DC);
static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request *
req TSRMLS_DC);
-
static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int
shortname TSRMLS_DC) /* {{{ */
{
zval *subitem, *subentries;
@@ -712,12 +712,7 @@
}
/* }}} */
-static inline int php_openssl_config_check_syntax(
- const char * section_label,
- const char * config_filename,
- const char * section,
- LHASH * config TSRMLS_DC
- ) /* {{{ */
+static inline int php_openssl_config_check_syntax(const char * section_label,
const char * config_filename,const char * section, LHASH * config
TSRMLS_DC) /* {{{ */
{
X509V3_CTX ctx;
@@ -780,13 +775,7 @@
else \
varname = defval
-
-
-static int php_openssl_parse_config(
- struct php_x509_request * req,
- zval * optional_args
- TSRMLS_DC
- ) /* {{{ */
+static int php_openssl_parse_config(struct php_x509_request * req, zval *
optional_args TSRMLS_DC) /* {{{ */
{
char * str;
zval ** item;
@@ -1686,9 +1675,8 @@
/* }}} */
-
/* Pop all X509 from Stack and free them, free the stack afterwards */
-static void php_sk_X509_free(STACK_OF(X509) * sk)
+static void php_sk_X509_free(STACK_OF(X509) * sk) /* {{{ */
{
for (;;) {
X509* x = sk_X509_pop(sk);
@@ -1697,8 +1685,9 @@
}
sk_X509_free(sk);
}
+/* }}} */
-static STACK_OF(X509) * php_array_to_X509_sk(zval ** zcerts TSRMLS_DC)
+static STACK_OF(X509) * php_array_to_X509_sk(zval ** zcerts TSRMLS_DC) /* {{{
*/
{
HashPosition hpos;
zval ** zcertval;
@@ -1750,6 +1739,7 @@
clean_exit:
return sk;
}
+/* }}} */
/* {{{ proto bool openssl_pkcs12_export_to_file(mixed x509, string filename,
mixed priv_key, string pass[, array args])
Creates and exports a PKCS to file */
@@ -4715,7 +4705,6 @@
}
/* }}} */
-
/* {{{ proto string openssl_dh_compute_key(string pub_key, resource dh_key)
Computes shared sicret for public value of remote DH key and local DH key */
PHP_FUNCTION(openssl_dh_compute_key)
--
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/json JSON_parser.c
rasmus Wed Jul 30 13:52:59 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/json JSON_parser.c
Log:
We can afford a larger stack here and other json parsers out there
go deeper than 128.
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.12.2.1r2=1.1.2.12.2.2diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.12.2.1
php-src/ext/json/JSON_parser.c:1.1.2.12.2.2
--- php-src/ext/json/JSON_parser.c:1.1.2.12.2.1 Sun Oct 7 05:22:04 2007
+++ php-src/ext/json/JSON_parser.c Wed Jul 30 13:52:59 2008
@@ -201,7 +201,7 @@
/*29*/ {29,29,-1,-1,-1,-1,-1,-1,
3,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}
};
-#define JSON_PARSER_MAX_DEPTH 128
+#define JSON_PARSER_MAX_DEPTH 512
/*
--
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/json JSON_parser.c
rasmus Wed Jul 30 13:55:27 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json JSON_parser.c
Log:
We can afford a larger stack here and other json parsers out there
go deeper than 128.
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.12r2=1.1.2.13diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.12
php-src/ext/json/JSON_parser.c:1.1.2.13
--- php-src/ext/json/JSON_parser.c:1.1.2.12 Wed Jun 13 17:56:41 2007
+++ php-src/ext/json/JSON_parser.c Wed Jul 30 13:55:27 2008
@@ -201,7 +201,7 @@
/*29*/ {29,29,-1,-1,-1,-1,-1,-1,
3,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}
};
-#define JSON_PARSER_MAX_DEPTH 128
+#define JSON_PARSER_MAX_DEPTH 512
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json JSON_parser.c
rasmus Wed Jul 30 13:57:47 2008 UTC Modified files: /php-src/ext/json JSON_parser.c Log: We can afford a larger stack here and other json parsers out there go deeper than 128. http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.17r2=1.18diff_format=u Index: php-src/ext/json/JSON_parser.c diff -u php-src/ext/json/JSON_parser.c:1.17 php-src/ext/json/JSON_parser.c:1.18 --- php-src/ext/json/JSON_parser.c:1.17 Sun Oct 7 05:15:03 2007 +++ php-src/ext/json/JSON_parser.c Wed Jul 30 13:57:47 2008 @@ -206,7 +206,7 @@ /* }}} */ -#define JSON_PARSER_MAX_DEPTH 128 +#define JSON_PARSER_MAX_DEPTH 512 /* A stack maintains the states of nested structures. -- 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/intl/locale locale_methods.c
felipe Wed Jul 30 16:43:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/localelocale_methods.c
Log:
- Fixed crash when NULL is passed to locale_accept_from_http()
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.1.2.4
php-src/ext/intl/locale/locale_methods.c:1.1.2.5
--- php-src/ext/intl/locale/locale_methods.c:1.1.2.4Fri Jul 25 12:41:57 2008
+++ php-src/ext/intl/locale/locale_methods.cWed Jul 30 16:43:11 2008
@@ -1668,7 +1668,7 @@
outResult, http_accept,
available, status);
uenum_close(available);
INTL_CHECK_STATUS(status, locale_accept_from_http: failed to find
acceptable locale);
- if(outResult == ULOC_ACCEPT_FAILED) {
+ if (len 0 || outResult == ULOC_ACCEPT_FAILED) {
RETURN_FALSE;
}
RETURN_STRINGL(resultLocale, len, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/lib parse_date.c parse_date.re /ext/date/tests 012.phpt 013.phpt date_parse_001.phpt
derick Wed Jul 30 17:48:21 2008 UTC
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/lib parse_date.c parse_date.re
/php-src/ext/date/tests 012.phpt 013.phpt date_parse_001.phpt
Log:
- Fixed a bug with the -MM format not resetting the day correctly.
- Fixed a bug in the DateTime-modify() methods, it would not use the advanced
relative time strings.
- Fixed return values of all the modifying methods, they now properly return
the object itself.
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.202r2=1.203diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.202 php-src/ext/date/php_date.c:1.203
--- php-src/ext/date/php_date.c:1.202 Wed Jul 30 08:13:02 2008
+++ php-src/ext/date/php_date.c Wed Jul 30 17:48:20 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.202 2008/07/30 08:13:02 jani Exp $ */
+/* $Id: php_date.c,v 1.203 2008/07/30 17:48:20 derick Exp $ */
#include php.h
#include php_streams.h
@@ -2962,20 +2962,15 @@
DATE_CHECK_INITIALIZED(dateobj-time, DateTime);
tmp_time = timelib_strtotime(modify, modify_len, NULL, DATE_TIMEZONEDB);
- dateobj-time-relative.y = tmp_time-relative.y;
- dateobj-time-relative.m = tmp_time-relative.m;
- dateobj-time-relative.d = tmp_time-relative.d;
- dateobj-time-relative.h = tmp_time-relative.h;
- dateobj-time-relative.i = tmp_time-relative.i;
- dateobj-time-relative.s = tmp_time-relative.s;
- dateobj-time-relative.weekday = tmp_time-relative.weekday;
+ memcpy(dateobj-time-relative, tmp_time-relative, sizeof(struct
timelib_rel_time));
dateobj-time-have_relative = tmp_time-have_relative;
- dateobj-time-relative.have_weekday_relative =
tmp_time-relative.have_weekday_relative;
dateobj-time-sse_uptodate = 0;
timelib_time_dtor(tmp_time);
timelib_update_ts(dateobj-time, NULL);
timelib_update_from_sse(dateobj-time);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -3115,6 +3110,8 @@
}
timelib_set_timezone(dateobj-time, tzobj-tzi.tz);
timelib_unixtime2local(dateobj-time, dateobj-time-sse);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -3171,6 +3168,8 @@
dateobj-time-i = i;
dateobj-time-s = s;
timelib_update_ts(dateobj-time, NULL);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -3192,6 +3191,8 @@
dateobj-time-m = m;
dateobj-time-d = d;
timelib_update_ts(dateobj-time, NULL);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -3216,6 +3217,8 @@
dateobj-time-have_relative = 1;
timelib_update_ts(dateobj-time, NULL);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -3235,6 +3238,8 @@
DATE_CHECK_INITIALIZED(dateobj-time, DateTime);
timelib_unixtime2local(dateobj-time, (timelib_sll)timestamp);
timelib_update_ts(dateobj-time, NULL);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.97r2=1.98diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.97
php-src/ext/date/lib/parse_date.c:1.98
--- php-src/ext/date/lib/parse_date.c:1.97 Wed Jul 23 19:52:50 2008
+++ php-src/ext/date/lib/parse_date.c Wed Jul 30 17:48:20 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Jul 23 21:49:54 2008 */
+/* Generated by re2c 0.13.5 on Wed Jul 30 19:25:10 2008 */
#line 1 ext/date/lib/parse_date.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.97 2008/07/23 19:52:50 derick Exp $ */
+/* $Id: parse_date.c,v 1.98 2008/07/30 17:48:20 derick Exp $ */
#include timelib.h
@@ -982,7 +982,7 @@
}
yy3:
YYDEBUG(3, *YYCURSOR);
-#line 1605 ext/date/lib/parse_date.re
+#line 1606 ext/date/lib/parse_date.re
{
int tz_not_found;
DEBUG_OUTPUT(tzcorrection | tz);
@@ -1306,7 +1306,7 @@
if (yych = '9') goto yy1343;
yy12:
YYDEBUG(12, *YYCURSOR);
-#line 1700 ext/date/lib/parse_date.re
+#line 1701 ext/date/lib/parse_date.re
{
add_error(s, Unexpected character);
goto std;
@@ -2334,7 +2334,7 @@
if (yych = '9') goto yy52;
yy47:
YYDEBUG(47, *YYCURSOR);
-#line 1689 ext/date/lib/parse_date.re
+#line 1690 ext/date/lib/parse_date.re
{
goto std;
}
@@ -2347,7 +2347,7 @@
YYDEBUG(49, *YYCURSOR);
++YYCURSOR;
YYDEBUG(50, *YYCURSOR);
-#line 1694 ext/date/lib/parse_date.re
+#line 1695 ext/date/lib/parse_date.re
{
s-pos = cursor; s-line++;
goto std;
[PHP-CVS] cvs: php-src /ext/intl/locale locale_methods.c
felipe Wed Jul 30 17:56:18 2008 UTC
Modified files:
/php-src/ext/intl/localelocale_methods.c
Log:
- MFB: Fixed crash when NULL is passed to locale_accept_from_http()
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.6
php-src/ext/intl/locale/locale_methods.c:1.7
--- php-src/ext/intl/locale/locale_methods.c:1.6Mon Jul 28 09:01:03 2008
+++ php-src/ext/intl/locale/locale_methods.cWed Jul 30 17:56:18 2008
@@ -1692,7 +1692,7 @@
outResult, http_accept,
available, status);
uenum_close(available);
INTL_CHECK_STATUS(status, locale_accept_from_http: failed to find
acceptable locale);
- if(outResult == ULOC_ACCEPT_FAILED) {
+ if(len 0 || outResult == ULOC_ACCEPT_FAILED) {
RETURN_FALSE;
}
RETURN_STRINGL(resultLocale, len, 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/date php_date.c /ext/date/lib parse_date.c parse_date.re /ext/date/tests 012.phpt 013.phpt date_parse_001.phpt
derick Wed Jul 30 18:00:58 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date php_date.c
/php-src/ext/date/lib parse_date.c parse_date.re
/php-src/ext/date/tests 012.phpt 013.phpt date_parse_001.phpt
Log:
- MFH: Fixed a bug with the -MM format not resetting the day correctly.
- MFH: Fixed a bug in the DateTime-modify() methods, it would not use the
advanced relative time strings.
- MFH: Fixed return values of all the modifying methods, they now properly
return the object itself.
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.51r2=1.43.2.45.2.51.2.52diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.51
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.52
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.51 Wed Jul 30 08:18:05 2008
+++ php-src/ext/date/php_date.c Wed Jul 30 18:00:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.51 2008/07/30 08:18:05 jani Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.52 2008/07/30 18:00:22 derick Exp $ */
#include php.h
#include php_streams.h
@@ -2795,20 +2795,15 @@
DATE_CHECK_INITIALIZED(dateobj-time, DateTime);
tmp_time = timelib_strtotime(modify, modify_len, NULL, DATE_TIMEZONEDB);
- dateobj-time-relative.y = tmp_time-relative.y;
- dateobj-time-relative.m = tmp_time-relative.m;
- dateobj-time-relative.d = tmp_time-relative.d;
- dateobj-time-relative.h = tmp_time-relative.h;
- dateobj-time-relative.i = tmp_time-relative.i;
- dateobj-time-relative.s = tmp_time-relative.s;
- dateobj-time-relative.weekday = tmp_time-relative.weekday;
+ memcpy(dateobj-time-relative, tmp_time-relative, sizeof(struct
timelib_rel_time));
dateobj-time-have_relative = tmp_time-have_relative;
- dateobj-time-relative.have_weekday_relative =
tmp_time-relative.have_weekday_relative;
dateobj-time-sse_uptodate = 0;
timelib_time_dtor(tmp_time);
timelib_update_ts(dateobj-time, NULL);
timelib_update_from_sse(dateobj-time);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -2948,6 +2943,8 @@
}
timelib_set_timezone(dateobj-time, tzobj-tzi.tz);
timelib_unixtime2local(dateobj-time, dateobj-time-sse);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -3004,6 +3001,8 @@
dateobj-time-i = i;
dateobj-time-s = s;
timelib_update_ts(dateobj-time, NULL);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -3025,6 +3024,8 @@
dateobj-time-m = m;
dateobj-time-d = d;
timelib_update_ts(dateobj-time, NULL);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -3049,6 +3050,8 @@
dateobj-time-have_relative = 1;
timelib_update_ts(dateobj-time, NULL);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
@@ -3068,6 +3071,8 @@
DATE_CHECK_INITIALIZED(dateobj-time, DateTime);
timelib_unixtime2local(dateobj-time, (timelib_sll)timestamp);
timelib_update_ts(dateobj-time, NULL);
+
+ RETURN_ZVAL(object, 1, 0);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.14.2.24r2=1.29.2.30.2.14.2.25diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.24
php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.25
--- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.24 Wed Jul 23
19:53:20 2008
+++ php-src/ext/date/lib/parse_date.c Wed Jul 30 18:00:23 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Jul 23 21:45:26 2008 */
+/* Generated by re2c 0.13.5 on Wed Jul 30 13:39:05 2008 */
#line 1 ext/date/lib/parse_date.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.29.2.30.2.14.2.24 2008/07/23 19:53:20 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.30.2.14.2.25 2008/07/30 18:00:23 derick Exp $ */
#include timelib.h
@@ -982,7 +982,7 @@
}
yy3:
YYDEBUG(3, *YYCURSOR);
-#line 1605 ext/date/lib/parse_date.re
+#line 1606 ext/date/lib/parse_date.re
{
int tz_not_found;
DEBUG_OUTPUT(tzcorrection | tz);
@@ -1306,7 +1306,7 @@
if (yych = '9') goto yy1343;
yy12:
YYDEBUG(12, *YYCURSOR);
-#line 1700 ext/date/lib/parse_date.re
+#line 1701 ext/date/lib/parse_date.re
{
add_error(s, Unexpected character);
goto std;
@@ -2334,7 +2334,7 @@
if (yych = '9') goto yy52;
yy47:
YYDEBUG(47, *YYCURSOR);
-#line 1689 ext/date/lib/parse_date.re
+#line 1690 ext/date/lib/parse_date.re
{
goto std;
}
@@ -2347,7 +2347,7 @@
[PHP-CVS] cvs: php-src /ext/intl/locale locale_methods.c
felipe Wed Jul 30 19:33:04 2008 UTC
Modified files:
/php-src/ext/intl/localelocale_methods.c
Log:
- Fixed memory leak.
# Test: locale_filter_matches(str_repeat('a', 520), str_repeat('a', 520),
1);
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.7
php-src/ext/intl/locale/locale_methods.c:1.8
--- php-src/ext/intl/locale/locale_methods.c:1.7Wed Jul 30 17:56:18 2008
+++ php-src/ext/intl/locale/locale_methods.cWed Jul 30 19:33:04 2008
@@ -1319,7 +1319,7 @@
}
//Convert to lower case for case-insensitive comparison
- cur_lang_tag = ecalloc( 1, strlen(lang_tag ) + 1);
+ cur_lang_tag = ecalloc( 1, strlen(can_lang_tag) + 1);
//Convert to lower case for case-insensitive comparison
result = strToMatch( can_lang_tag , cur_lang_tag);
@@ -1329,7 +1329,7 @@
RETURN_FALSE;
}
- cur_loc_range = ecalloc( 1, strlen(loc_range ) + 1);
+ cur_loc_range = ecalloc( 1, strlen(can_loc_range) + 1);
result = strToMatch( can_loc_range , cur_loc_range );
if( result == 0) {
efree( cur_lang_tag );
--
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/intl/locale locale_methods.c
felipe Wed Jul 30 19:34:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/localelocale_methods.c
Log:
- MFH: Fixed memory leak.
# Test: locale_filter_matches(str_repeat('a', 520), str_repeat('a', 520),
1);
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.1.2.5
php-src/ext/intl/locale/locale_methods.c:1.1.2.6
--- php-src/ext/intl/locale/locale_methods.c:1.1.2.5Wed Jul 30 16:43:11 2008
+++ php-src/ext/intl/locale/locale_methods.cWed Jul 30 19:34:23 2008
@@ -1297,7 +1297,7 @@
}
//Convert to lower case for case-insensitive comparison
- cur_lang_tag = ecalloc( 1, strlen(lang_tag ) + 1);
+ cur_lang_tag = ecalloc( 1, strlen(can_lang_tag) + 1);
//Convert to lower case for case-insensitive comparison
result = strToMatch( can_lang_tag , cur_lang_tag);
@@ -1307,7 +1307,7 @@
RETURN_FALSE;
}
- cur_loc_range = ecalloc( 1, strlen(loc_range ) + 1);
+ cur_loc_range = ecalloc( 1, strlen(can_loc_range) + 1);
result = strToMatch( can_loc_range , cur_loc_range );
if( result == 0) {
efree( cur_lang_tag );
--
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.m4
janiWed Jul 30 22:55:08 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/scriptsphpize.m4 Log: ws http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.2r2=1.17.2.3.2.5.2.3diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.2 php-src/scripts/phpize.m4:1.17.2.3.2.5.2.3 --- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.2 Sun Jul 27 20:43:40 2008 +++ php-src/scripts/phpize.m4 Wed Jul 30 22:55:08 2008 @@ -64,7 +64,7 @@ dnl Required programs PHP_PROG_RE2C PHP_PROG_AWK - + sinclude(config.m4) enable_static=no -- 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) / acinclude.m4
janiWed Jul 30 23:27:26 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcacinclude.m4 Log: MFH: sync http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.26r2=1.332.2.14.2.27diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.26 php-src/acinclude.m4:1.332.2.14.2.27 --- php-src/acinclude.m4:1.332.2.14.2.26Mon Aug 20 14:28:45 2007 +++ php-src/acinclude.m4Wed Jul 30 23:27:26 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.26 2007/08/20 14:28:45 jani Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.27 2008/07/30 23:27:26 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -837,7 +837,7 @@ ]) dnl -dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx) +dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx, zend_ext) dnl dnl Basically sets up the link-stage for building module-name dnl from object_var in build-dir. @@ -860,7 +860,11 @@ ;; esac - PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.$suffix + if test x$5 = xyes; then +PHP_ZEND_EX=$PHP_ZEND_EX \$(phplibdir)/$1.$suffix + else +PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.$suffix + fi PHP_SUBST($2) cat Makefile.objectsEOF \$(phplibdir)/$1.$suffix: $3/$1.$suffix @@ -916,7 +920,7 @@ ]) dnl -dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx) +dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx[, zend_ext]) dnl dnl Includes an extension in the build. dnl @@ -928,6 +932,8 @@ dnl be set to cli to mark extension build only with CLI or CGI sapi's. dnl extra-cflags are passed to the compiler, with dnl @ext_srcdir@ and @ext_builddir@ being substituted. +dnl cxx can be used to indicate that a C++ shared module is desired. +dnl zend_ext indicates a zend extension. AC_DEFUN([PHP_NEW_EXTENSION],[ ext_builddir=[]PHP_EXT_BUILDDIR($1) ext_srcdir=[]PHP_EXT_SRCDIR($1) @@ -949,10 +955,10 @@ PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes) case $host_alias in *netware*[)] - PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6) + PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6, $7) ;; *[)] - PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6) + PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6, $7) ;; esac AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to build $1 as dynamic module) @@ -2149,17 +2155,17 @@ AC_CHECK_PROG(RE2C, re2c, re2c) if test -n $RE2C; then AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [ - re2c_vernum=`re2c --vernum 2/dev/null` - if test -z $re2c_vernum || test $re2c_vernum -lt 1200; then + re2c_vernum=`$RE2C --vernum 2/dev/null` + if test -z $re2c_vernum || test $re2c_vernum -lt 1304; then php_cv_re2c_version=invalid else -php_cv_re2c_version=`re2c --version | cut -d ' ' -f 2 2/dev/null` (ok) +php_cv_re2c_version=`$RE2C --version | cut -d ' ' -f 2 2/dev/null` (ok) fi ]) fi case $php_cv_re2c_version in |invalid[)] - AC_MSG_WARN([You will need re2c 0.12.0 or later if you want to regenerate PHP parsers.]) + AC_MSG_WARN([You will need re2c 0.13.4 or later if you want to regenerate PHP parsers.]) RE2C=exit 0; ;; esac @@ -2711,6 +2717,7 @@ enable-zend-multibyte[)] continue;; esac fi + is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` if eval test x\$$is_arg_set = x; then PHP_UNKNOWN_CONFIGURE_OPTIONS=$PHP_UNKNOWN_CONFIGURE_OPTIONS @@ -2744,7 +2751,7 @@ dnl dnl PHP_DETECT_ICC -dnl +dnl Detect Intel C++ Compiler and unset $GCC if ICC found AC_DEFUN([PHP_DETECT_ICC], [ ICC=no @@ -2753,6 +2760,7 @@ ICC=no AC_MSG_RESULT([no]), ICC=yes +GCC=no AC_MSG_RESULT([yes]) ) ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
janiWed Jul 30 23:31:41 2008 UTC Modified files: /php-srcconfigure.in Log: CS http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.663r2=1.664diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.663 php-src/configure.in:1.664 --- php-src/configure.in:1.663 Sun Jul 27 15:05:22 2008 +++ php-src/configure.inWed Jul 30 23:31:41 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.663 2008/07/27 15:05:22 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.664 2008/07/30 23:31:41 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1235,13 +1235,13 @@ fi if test $PHP_DEBUG = yes test $PHP_THREAD_SAFETY = yes; then -ZEND_EXT_TYPE=zend_extension_debug_ts + ZEND_EXT_TYPE=zend_extension_debug_ts elif test $PHP_DEBUG = yes; then -ZEND_EXT_TYPE=zend_extension_debug + ZEND_EXT_TYPE=zend_extension_debug elif test $PHP_THREAD_SAFETY = yes; then -ZEND_EXT_TYPE=zend_extension_ts + ZEND_EXT_TYPE=zend_extension_ts else -ZEND_EXT_TYPE=zend_extension + ZEND_EXT_TYPE=zend_extension fi PHP_SUBST(ZEND_EXT_TYPE) -- 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) / configure.in
janiWed Jul 30 23:32:03 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcconfigure.in Log: MFH:CS http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.26r2=1.579.2.52.2.77.2.27diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.26 php-src/configure.in:1.579.2.52.2.77.2.27 --- php-src/configure.in:1.579.2.52.2.77.2.26 Sun Jul 27 15:05:39 2008 +++ php-src/configure.inWed Jul 30 23:32:02 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.26 2008/07/27 15:05:39 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.27 2008/07/30 23:32:02 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1321,13 +1321,13 @@ fi if test $PHP_DEBUG = yes test $PHP_THREAD_SAFETY = yes; then -ZEND_EXT_TYPE=zend_extension_debug_ts + ZEND_EXT_TYPE=zend_extension_debug_ts elif test $PHP_DEBUG = yes; then -ZEND_EXT_TYPE=zend_extension_debug + ZEND_EXT_TYPE=zend_extension_debug elif test $PHP_THREAD_SAFETY = yes; then -ZEND_EXT_TYPE=zend_extension_ts + ZEND_EXT_TYPE=zend_extension_ts else -ZEND_EXT_TYPE=zend_extension + ZEND_EXT_TYPE=zend_extension fi PHP_SUBST(ZEND_EXT_TYPE) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /scripts phpize.m4
janiWed Jul 30 23:55:39 2008 UTC
Modified files:
/php-src/scriptsphpize.m4
Log:
- Detect whether debugging was enabled in PHP and drop optimizing flags if so
(merge from configure.in)
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.28r2=1.29diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.28 php-src/scripts/phpize.m4:1.29
--- php-src/scripts/phpize.m4:1.28 Sun Jul 27 20:48:26 2008
+++ php-src/scripts/phpize.m4 Wed Jul 30 23:55:38 2008
@@ -21,6 +21,7 @@
abs_builddir=`pwd`
AC_PROG_CC
+PHP_DETECT_ICC
AC_PROG_CC_C_O
dnl Support systems with system libraries in e.g. /usr/lib64
@@ -58,6 +59,40 @@
AC_MSG_CHECKING([for PHP installed headers prefix])
AC_MSG_RESULT([$phpincludedir])
+dnl Check for PHP_DEBUG / ZEND_DEBUG
+AC_MSG_CHECKING([if debug is enabled])
+old_CPPFLAGS=$CPPFLAGS
+CPPFLAGS=-I$phpincludedir
+AC_EGREP_CPP(php_debug_is_enabled,[
+#include main/php_config.h
+#if ZEND_DEBUG
+php_debug_is_enabled
+#endif
+],[
+ PHP_DEBUG=yes
+],[
+ PHP_DEBUG=no
+])
+CPPFLAGS=$old_CPPFLAGS
+AC_MSG_RESULT([$PHP_DEBUG])
+
+if test $PHP_DEBUG = yes; then
+ PHP_DEBUG=1
+ ZEND_DEBUG=yes
+ changequote({,})
+ CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9s]*//g'`
+ CXXFLAGS=`echo $CXXFLAGS | $SED -e 's/-O[0-9s]*//g'`
+ changequote([,])
+ dnl add -O0 only if GCC or ICC is used
+ if test $GCC = yes || test $ICC = yes; then
+CFLAGS=$CFLAGS -O0
+CXXFLAGS=$CXXFLAGS -O0
+ fi
+else
+ PHP_DEBUG=0
+ ZEND_DEBUG=no
+fi
+
dnl Always shared
PHP_BUILD_SHARED
--
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.m4
janiWed Jul 30 23:56:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/scriptsphpize.m4
Log:
MFH:- Detect whether debugging was enabled in PHP and drop optimizing flags
if so (merge from configure.in)
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.3r2=1.17.2.3.2.5.2.4diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.3
php-src/scripts/phpize.m4:1.17.2.3.2.5.2.4
--- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.3 Wed Jul 30 22:55:08 2008
+++ php-src/scripts/phpize.m4 Wed Jul 30 23:56:05 2008
@@ -21,6 +21,7 @@
abs_builddir=`pwd`
AC_PROG_CC
+PHP_DETECT_ICC
AC_PROG_CC_C_O
dnl Support systems with system libraries in e.g. /usr/lib64
@@ -58,6 +59,40 @@
AC_MSG_CHECKING([for PHP installed headers prefix])
AC_MSG_RESULT([$phpincludedir])
+dnl Check for PHP_DEBUG / ZEND_DEBUG
+AC_MSG_CHECKING([if debug is enabled])
+old_CPPFLAGS=$CPPFLAGS
+CPPFLAGS=-I$phpincludedir
+AC_EGREP_CPP(php_debug_is_enabled,[
+#include main/php_config.h
+#if ZEND_DEBUG
+php_debug_is_enabled
+#endif
+],[
+ PHP_DEBUG=yes
+],[
+ PHP_DEBUG=no
+])
+CPPFLAGS=$old_CPPFLAGS
+AC_MSG_RESULT([$PHP_DEBUG])
+
+if test $PHP_DEBUG = yes; then
+ PHP_DEBUG=1
+ ZEND_DEBUG=yes
+ changequote({,})
+ CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9s]*//g'`
+ CXXFLAGS=`echo $CXXFLAGS | $SED -e 's/-O[0-9s]*//g'`
+ changequote([,])
+ dnl add -O0 only if GCC or ICC is used
+ if test $GCC = yes || test $ICC = yes; then
+CFLAGS=$CFLAGS -O0
+CXXFLAGS=$CXXFLAGS -O0
+ fi
+else
+ PHP_DEBUG=0
+ ZEND_DEBUG=no
+fi
+
dnl Always shared
PHP_BUILD_SHARED
--
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) / Makefile.global configure.in /scripts phpize.m4
janiWed Jul 30 23:57:15 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcMakefile.global configure.in /php-src/scriptsphpize.m4 Log: MFH: sync build stuff http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.57.2.5.2.14r2=1.57.2.5.2.15diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.57.2.5.2.14 php-src/Makefile.global:1.57.2.5.2.15 --- php-src/Makefile.global:1.57.2.5.2.14 Fri Aug 3 14:01:56 2007 +++ php-src/Makefile.global Wed Jul 30 23:57:14 2008 @@ -11,7 +11,7 @@ @echo Don't forget to run 'make test'. @echo -build-modules: $(PHP_MODULES) +build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ @@ -73,6 +73,11 @@ for i in $(PHP_MODULES); do \ . $$i; $(top_srcdir)/build/shtool echo -n -- -d extension=$$dlname; \ done; \ + fi; \ + if test x$(PHP_ZEND_EX) != x; then \ + for i in $(PHP_ZEND_EX); do \ + . $$i; $(top_srcdir)/build/shtool echo -n -- -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname; \ + done; \ fi` test: all @@ -80,50 +85,18 @@ TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC=$(CC) \ - $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -U -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ + $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ elif test ! -z $(SAPI_CLI_PATH) test -x $(SAPI_CLI_PATH); then \ INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ if test $$INI_FILE; then \ - $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE $(top_builddir)/tmp-php.ini; \ - else \ - echo $(top_builddir)/tmp-php.ini; \ - fi; \ - TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ - CC=$(CC) \ - $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -U -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ - else \ - echo ERROR: Cannot run tests without CLI sapi.; \ - fi - -utest: all - [EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH) test -x $(SAPI_CLI_PATH); then \ - INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ - if test $$INI_FILE; then \ - $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE $(top_builddir)/tmp-php.ini; \ - else \ - echo $(top_builddir)/tmp-php.ini; \ - fi; \ - TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ - CC=$(CC) \ - $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -u -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ - else \ - echo ERROR: Cannot run tests without CLI sapi.; \ - fi - -ntest: all - [EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH) test -x $(SAPI_CLI_PATH); then \ - INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ - if test $$INI_FILE; then \ - $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE $(top_builddir)/tmp-php.ini; \ + $(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' $$INI_FILE $(top_builddir)/tmp-php.ini; \ else \ echo $(top_builddir)/tmp-php.ini; \ fi; \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC=$(CC) \ - $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -N -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ else \ echo ERROR: Cannot run tests without CLI sapi.; \ fi
[PHP-CVS] cvs: php-src /ext/fileinfo config.w32 /ext/fileinfo/libmagic config.h
scottmacThu Jul 31 00:32:25 2008 UTC
Modified files:
/php-src/ext/fileinfo config.w32
/php-src/ext/fileinfo/libmagic config.h
Log:
get fileinfo building again on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.w32?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/fileinfo/config.w32
diff -u php-src/ext/fileinfo/config.w32:1.1 php-src/ext/fileinfo/config.w32:1.2
--- php-src/ext/fileinfo/config.w32:1.1 Wed Sep 7 11:16:57 2005
+++ php-src/ext/fileinfo/config.w32 Thu Jul 31 00:32:25 2008
@@ -1,13 +1,10 @@
-// $Id: config.w32,v 1.1 2005/09/07 11:16:57 edink Exp $
+// $Id: config.w32,v 1.2 2008/07/31 00:32:25 scottmac Exp $
// vim:ft=javascript
ARG_WITH(fileinfo, fileinfo support, no);
-if (PHP_FILEINFO != 'no'
- CHECK_HEADER_ADD_INCLUDE('magic.h', 'CFLAGS_FILEINFO')
- CHECK_LIB(PHP_DEBUG !=
'no'?'libmagic-staticd.lib':'libmagic-static.lib',
- 'fileinfo', PHP_FILEINFO)) {
- EXTENSION('fileinfo', 'fileinfo.c');
- AC_DEFINE('USE_MAGIC_STATIC', '', '');
+if (PHP_FILEINFO != 'no') {
+ EXTENSION('fileinfo', 'fileinfo.c', null, /I +
configure_module_dirname + /libmagic /I + configure_module_dirname);
+ ADD_SOURCES(configure_module_dirname + /libmagick, apprentice.c
apptype.c ascmagic.c \
+ compress.c fsmagic.c funcs.c getopt_long.c is_tar.c magic.c print.c
readelf.c softmagic.c, fileinfo);
}
-
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/config.h?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/fileinfo/libmagic/config.h
diff -u php-src/ext/fileinfo/libmagic/config.h:1.3
php-src/ext/fileinfo/libmagic/config.h:1.4
--- php-src/ext/fileinfo/libmagic/config.h:1.3 Thu Jul 24 13:40:21 2008
+++ php-src/ext/fileinfo/libmagic/config.h Thu Jul 31 00:32:25 2008
@@ -1,4 +1,9 @@
-#include php_config.h
+#ifdef PHP_WIN32
+# include config.w32.h
+#else
+# include php_config.h
+#endif
+
#ifdef HAVE_CONFIG_H
#include ../config.h
#endif
--
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/fileinfo config.w32 /ext/fileinfo/libmagic config.h
scottmacThu Jul 31 00:33:02 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/fileinfo config.w32
/php-src/ext/fileinfo/libmagic config.h
Log:
MFH: get fileinfo building again on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.w32?r1=1.1r2=1.1.2.1diff_format=u
Index: php-src/ext/fileinfo/config.w32
diff -u php-src/ext/fileinfo/config.w32:1.1
php-src/ext/fileinfo/config.w32:1.1.2.1
--- php-src/ext/fileinfo/config.w32:1.1 Wed Sep 7 11:16:57 2005
+++ php-src/ext/fileinfo/config.w32 Thu Jul 31 00:33:02 2008
@@ -1,13 +1,10 @@
-// $Id: config.w32,v 1.1 2005/09/07 11:16:57 edink Exp $
+// $Id: config.w32,v 1.1.2.1 2008/07/31 00:33:02 scottmac Exp $
// vim:ft=javascript
ARG_WITH(fileinfo, fileinfo support, no);
-if (PHP_FILEINFO != 'no'
- CHECK_HEADER_ADD_INCLUDE('magic.h', 'CFLAGS_FILEINFO')
- CHECK_LIB(PHP_DEBUG !=
'no'?'libmagic-staticd.lib':'libmagic-static.lib',
- 'fileinfo', PHP_FILEINFO)) {
- EXTENSION('fileinfo', 'fileinfo.c');
- AC_DEFINE('USE_MAGIC_STATIC', '', '');
+if (PHP_FILEINFO != 'no') {
+ EXTENSION('fileinfo', 'fileinfo.c', null, /I +
configure_module_dirname + /libmagic /I + configure_module_dirname);
+ ADD_SOURCES(configure_module_dirname + /libmagick, apprentice.c
apptype.c ascmagic.c \
+ compress.c fsmagic.c funcs.c getopt_long.c is_tar.c magic.c print.c
readelf.c softmagic.c, fileinfo);
}
-
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/config.h?r1=1.3r2=1.3.2.1diff_format=u
Index: php-src/ext/fileinfo/libmagic/config.h
diff -u php-src/ext/fileinfo/libmagic/config.h:1.3
php-src/ext/fileinfo/libmagic/config.h:1.3.2.1
--- php-src/ext/fileinfo/libmagic/config.h:1.3 Thu Jul 24 13:40:21 2008
+++ php-src/ext/fileinfo/libmagic/config.h Thu Jul 31 00:33:02 2008
@@ -1,4 +1,9 @@
-#include php_config.h
+#ifdef PHP_WIN32
+# include config.w32.h
+#else
+# include php_config.h
+#endif
+
#ifdef HAVE_CONFIG_H
#include ../config.h
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /scripts phpize.m4
janiThu Jul 31 00:45:04 2008 UTC Modified files: /php-src/scriptsphpize.m4 Log: - Applied the missing parts to phpize.m4 for zend extension builds http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.29r2=1.30diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.29 php-src/scripts/phpize.m4:1.30 --- php-src/scripts/phpize.m4:1.29 Wed Jul 30 23:55:38 2008 +++ php-src/scripts/phpize.m4 Thu Jul 31 00:45:04 2008 @@ -59,7 +59,7 @@ AC_MSG_CHECKING([for PHP installed headers prefix]) AC_MSG_RESULT([$phpincludedir]) -dnl Check for PHP_DEBUG / ZEND_DEBUG +dnl Checks for PHP_DEBUG / ZEND_DEBUG / ZTS AC_MSG_CHECKING([if debug is enabled]) old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$phpincludedir @@ -73,9 +73,37 @@ ],[ PHP_DEBUG=no ]) +AC_MSG_RESULT([$PHP_DEBUG]) + +AC_MSG_CHECKING([if zts is enabled]) +old_CPPFLAGS=$CPPFLAGS +CPPFLAGS=-I$phpincludedir +AC_EGREP_CPP(php_zts_is_enabled,[ +#include main/php_config.h +#if ZTS +php_zts_is_enabled +#endif +],[ + PHP_THREAD_SAFETY=yes +],[ + PHP_THREAD_SAFETY=no +]) CPPFLAGS=$old_CPPFLAGS AC_MSG_RESULT([$PHP_DEBUG]) +dnl Support for building and testing Zend extensions +if test $PHP_DEBUG = yes test $PHP_THREAD_SAFETY = yes; then + ZEND_EXT_TYPE=zend_extension_debug_ts +elif test $PHP_DEBUG = yes; then + ZEND_EXT_TYPE=zend_extension_debug +elif test $PHP_THREAD_SAFETY = yes; then + ZEND_EXT_TYPE=zend_extension_ts +else + ZEND_EXT_TYPE=zend_extension +fi +PHP_SUBST(ZEND_EXT_TYPE) + +dnl Discard optimization flags when debugging is enabled if test $PHP_DEBUG = yes; then PHP_DEBUG=1 ZEND_DEBUG=yes @@ -115,7 +143,7 @@ ]) AC_PROG_LIBTOOL -all_targets='$(PHP_MODULES)' +all_targets='$(PHP_MODULES) $(PHP_ZEND_EX)' install_targets=install-modules install-headers phplibdir=`pwd`/modules CPPFLAGS=$CPPFLAGS -DHAVE_CONFIG_H @@ -126,6 +154,8 @@ test $exec_prefix = NONE exec_prefix='$(prefix)' PHP_SUBST(PHP_MODULES) +PHP_SUBST(PHP_ZEND_EX) + PHP_SUBST(all_targets) PHP_SUBST(install_targets) -- 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.m4
janiThu Jul 31 00:45:17 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/scriptsphpize.m4 Log: MFH:- Applied the missing parts to phpize.m4 for zend extension builds http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.4r2=1.17.2.3.2.5.2.5diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.4 php-src/scripts/phpize.m4:1.17.2.3.2.5.2.5 --- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.4 Wed Jul 30 23:56:05 2008 +++ php-src/scripts/phpize.m4 Thu Jul 31 00:45:17 2008 @@ -59,7 +59,7 @@ AC_MSG_CHECKING([for PHP installed headers prefix]) AC_MSG_RESULT([$phpincludedir]) -dnl Check for PHP_DEBUG / ZEND_DEBUG +dnl Checks for PHP_DEBUG / ZEND_DEBUG / ZTS AC_MSG_CHECKING([if debug is enabled]) old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$phpincludedir @@ -73,9 +73,37 @@ ],[ PHP_DEBUG=no ]) +AC_MSG_RESULT([$PHP_DEBUG]) + +AC_MSG_CHECKING([if zts is enabled]) +old_CPPFLAGS=$CPPFLAGS +CPPFLAGS=-I$phpincludedir +AC_EGREP_CPP(php_zts_is_enabled,[ +#include main/php_config.h +#if ZTS +php_zts_is_enabled +#endif +],[ + PHP_THREAD_SAFETY=yes +],[ + PHP_THREAD_SAFETY=no +]) CPPFLAGS=$old_CPPFLAGS AC_MSG_RESULT([$PHP_DEBUG]) +dnl Support for building and testing Zend extensions +if test $PHP_DEBUG = yes test $PHP_THREAD_SAFETY = yes; then + ZEND_EXT_TYPE=zend_extension_debug_ts +elif test $PHP_DEBUG = yes; then + ZEND_EXT_TYPE=zend_extension_debug +elif test $PHP_THREAD_SAFETY = yes; then + ZEND_EXT_TYPE=zend_extension_ts +else + ZEND_EXT_TYPE=zend_extension +fi +PHP_SUBST(ZEND_EXT_TYPE) + +dnl Discard optimization flags when debugging is enabled if test $PHP_DEBUG = yes; then PHP_DEBUG=1 ZEND_DEBUG=yes @@ -115,7 +143,7 @@ ]) AC_PROG_LIBTOOL -all_targets='$(PHP_MODULES)' +all_targets='$(PHP_MODULES) $(PHP_ZEND_EX)' install_targets=install-modules install-headers phplibdir=`pwd`/modules CPPFLAGS=$CPPFLAGS -DHAVE_CONFIG_H @@ -126,6 +154,8 @@ test $exec_prefix = NONE exec_prefix='$(prefix)' PHP_SUBST(PHP_MODULES) +PHP_SUBST(PHP_ZEND_EX) + PHP_SUBST(all_targets) PHP_SUBST(install_targets) -- 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.m4
janiThu Jul 31 00:45:46 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/scriptsphpize.m4 Log: MFH:- Applied the missing parts to phpize.m4 for zend extension builds http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.8r2=1.17.2.3.2.9diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.8 php-src/scripts/phpize.m4:1.17.2.3.2.9 --- php-src/scripts/phpize.m4:1.17.2.3.2.8 Wed Jul 30 23:57:14 2008 +++ php-src/scripts/phpize.m4 Thu Jul 31 00:45:46 2008 @@ -59,7 +59,7 @@ AC_MSG_CHECKING([for PHP installed headers prefix]) AC_MSG_RESULT([$phpincludedir]) -dnl Check for PHP_DEBUG / ZEND_DEBUG +dnl Checks for PHP_DEBUG / ZEND_DEBUG / ZTS AC_MSG_CHECKING([if debug is enabled]) old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$phpincludedir @@ -73,9 +73,37 @@ ],[ PHP_DEBUG=no ]) +AC_MSG_RESULT([$PHP_DEBUG]) + +AC_MSG_CHECKING([if zts is enabled]) +old_CPPFLAGS=$CPPFLAGS +CPPFLAGS=-I$phpincludedir +AC_EGREP_CPP(php_zts_is_enabled,[ +#include main/php_config.h +#if ZTS +php_zts_is_enabled +#endif +],[ + PHP_THREAD_SAFETY=yes +],[ + PHP_THREAD_SAFETY=no +]) CPPFLAGS=$old_CPPFLAGS AC_MSG_RESULT([$PHP_DEBUG]) +dnl Support for building and testing Zend extensions +if test $PHP_DEBUG = yes test $PHP_THREAD_SAFETY = yes; then + ZEND_EXT_TYPE=zend_extension_debug_ts +elif test $PHP_DEBUG = yes; then + ZEND_EXT_TYPE=zend_extension_debug +elif test $PHP_THREAD_SAFETY = yes; then + ZEND_EXT_TYPE=zend_extension_ts +else + ZEND_EXT_TYPE=zend_extension +fi +PHP_SUBST(ZEND_EXT_TYPE) + +dnl Discard optimization flags when debugging is enabled if test $PHP_DEBUG = yes; then PHP_DEBUG=1 ZEND_DEBUG=yes @@ -115,7 +143,7 @@ ]) AC_PROG_LIBTOOL -all_targets='$(PHP_MODULES)' +all_targets='$(PHP_MODULES) $(PHP_ZEND_EX)' install_targets=install-modules install-headers phplibdir=`pwd`/modules CPPFLAGS=$CPPFLAGS -DHAVE_CONFIG_H @@ -126,6 +154,8 @@ test $exec_prefix = NONE exec_prefix='$(prefix)' PHP_SUBST(PHP_MODULES) +PHP_SUBST(PHP_ZEND_EX) + PHP_SUBST(all_targets) PHP_SUBST(install_targets) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
scottmacThu Jul 31 00:46:22 2008 UTC Modified files: /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: Resync libsqlite files from amalgamation. Save the kittens, no EOL mess. http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.3r2=1.4diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.3 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.4 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.3 Mon Jul 28 09:11:12 2008 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Thu Jul 31 00:46:21 2008 @@ -41,7 +41,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -70,7 +70,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ /* @@ -436,7 +436,7 @@ ** the version number) and changes its name to sqlite3.h as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -6061,7 +6061,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -6578,7 +6578,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -6797,7 +6797,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -7180,7 +7180,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ #ifndef _PAGER_H_ @@ -7603,7 +7603,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ @@ -9481,7 +9481,7 @@ ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ ** ** SQLite processes all times and dates as Julian Day numbers. The ** dates and times are stored as the number of days since noon @@ -10971,7 +10971,7 @@ ** This file contains the C functions that implement a memory ** allocation subsystem for use by SQLite. ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ /* @@ -11208,7 +11208,7 @@ ** This file contains the C functions that implement a memory ** allocation subsystem for use by SQLite. ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ /* @@ -11699,7 +11699,7 @@ ** This version of the memory allocation subsystem is used if ** and only if SQLITE_MEMORY_SIZE is defined. ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ /* @@ -12354,7 +12354,7 @@ ** This version of the memory allocation subsystem is used if ** and only if SQLITE_POW2_MEMORY_SIZE is defined. ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ /* @@ -12866,7 +12866,7 @@ ** implementation is suitable for testing. ** debugging purposes ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ #ifdef SQLITE_MUTEX_NOOP_DEBUG @@ -12986,7 +12986,7 @@ * ** This file contains the C functions that implement mutexes for OS/2 ** -** $Id: sqlite3.c,v 1.3 2008/07/28 09:11:12 pajoye Exp $ +** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $ */ /* @@ -13234,7 +13234,7 @@
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
scottmacThu Jul 31 00:46:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: MFH: Resync libsqlite files from amalgamation. Save the kittens, no EOL mess. http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.1 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.2 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.1 Fri Jul 25 02:44:57 2008 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Thu Jul 31 00:46:45 2008 @@ -41,7 +41,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -70,7 +70,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -436,7 +436,7 @@ ** the version number) and changes its name to sqlite3.h as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -6061,7 +6061,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -6578,7 +6578,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -6797,7 +6797,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -7180,7 +7180,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _PAGER_H_ @@ -7603,7 +7603,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -9481,7 +9481,7 @@ ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ ** ** SQLite processes all times and dates as Julian Day numbers. The ** dates and times are stored as the number of days since noon @@ -10971,7 +10971,7 @@ ** This file contains the C functions that implement a memory ** allocation subsystem for use by SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -11208,7 +11208,7 @@ ** This file contains the C functions that implement a memory ** allocation subsystem for use by SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -11699,7 +11699,7 @@ ** This version of the memory allocation subsystem is used if ** and only if SQLITE_MEMORY_SIZE is defined. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -12354,7 +12354,7 @@ ** This version of the memory allocation subsystem is used if ** and only if SQLITE_POW2_MEMORY_SIZE is defined. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -12866,7 +12866,7 @@ ** implementation is suitable for testing. ** debugging purposes ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifdef SQLITE_MUTEX_NOOP_DEBUG @@ -12986,7 +12986,7 @@ * ** This file contains the C functions
[PHP-CVS] cvs: php-src /sapi/isapi php5isapi.c
janiThu Jul 31 00:48:32 2008 UTC
Modified files:
/php-src/sapi/isapi php5isapi.c
Log:
- Fixed bug #45568 (ISAPI does not property clear auth_digest in header).
http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/php5isapi.c?r1=1.13r2=1.14diff_format=u
Index: php-src/sapi/isapi/php5isapi.c
diff -u php-src/sapi/isapi/php5isapi.c:1.13 php-src/sapi/isapi/php5isapi.c:1.14
--- php-src/sapi/isapi/php5isapi.c:1.13 Wed Mar 19 16:37:49 2008
+++ php-src/sapi/isapi/php5isapi.c Thu Jul 31 00:48:32 2008
@@ -16,7 +16,7 @@
| Ben Mansell [EMAIL PROTECTED] (Zeus Support)
|
+--+
*/
-/* $Id: php5isapi.c,v 1.13 2008/03/19 16:37:49 rasmus Exp $ */
+/* $Id: php5isapi.c,v 1.14 2008/07/31 00:48:32 jani Exp $ */
#include php.h
#include httpext.h
@@ -712,6 +712,7 @@
case SF_NOTIFY_PREPROC_HEADERS:
SG(request_info).auth_user = NULL;
SG(request_info).auth_password = NULL;
+ SG(request_info).auth_digest = NULL;
break;
case SF_NOTIFY_AUTHENTICATION: {
char *auth_user = ((HTTP_FILTER_AUTHENT *)
pvNotification)-pszUser;
@@ -746,7 +747,7 @@
SG(request_info).content_length = lpECB-cbTotalBytes;
SG(sapi_headers).http_response_code = 200; /* I think dwHttpStatusCode
is invalid at this stage -RL */
if (!bFilterLoaded) { /* we don't have valid ISAPI Filter information */
- SG(request_info).auth_user = SG(request_info).auth_password =
NULL;
+ SG(request_info).auth_user = SG(request_info).auth_password =
SG(request_info).auth_digest = NULL;
}
#ifdef WITH_ZEUS
--
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) /sapi/isapi php5isapi.c
janiThu Jul 31 00:48:49 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/isapi php5isapi.c
Log:
MFH:- Fixed bug #45568 (ISAPI does not property clear auth_digest in header).
http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/php5isapi.c?r1=1.8.2.2.2.3.2.2r2=1.8.2.2.2.3.2.3diff_format=u
Index: php-src/sapi/isapi/php5isapi.c
diff -u php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.3.2.2
php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.3.2.3
--- php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.3.2.2 Tue Mar 18 22:23:21 2008
+++ php-src/sapi/isapi/php5isapi.c Thu Jul 31 00:48:48 2008
@@ -16,7 +16,7 @@
| Ben Mansell [EMAIL PROTECTED] (Zeus Support)
|
+--+
*/
-/* $Id: php5isapi.c,v 1.8.2.2.2.3.2.2 2008/03/18 22:23:21 rasmus Exp $ */
+/* $Id: php5isapi.c,v 1.8.2.2.2.3.2.3 2008/07/31 00:48:48 jani Exp $ */
#include php.h
#include httpext.h
@@ -712,6 +712,7 @@
case SF_NOTIFY_PREPROC_HEADERS:
SG(request_info).auth_user = NULL;
SG(request_info).auth_password = NULL;
+ SG(request_info).auth_digest = NULL;
break;
case SF_NOTIFY_AUTHENTICATION: {
char *auth_user = ((HTTP_FILTER_AUTHENT *)
pvNotification)-pszUser;
@@ -746,7 +747,7 @@
SG(request_info).content_length = lpECB-cbTotalBytes;
SG(sapi_headers).http_response_code = 200; /* I think dwHttpStatusCode
is invalid at this stage -RL */
if (!bFilterLoaded) { /* we don't have valid ISAPI Filter information */
- SG(request_info).auth_user = SG(request_info).auth_password =
NULL;
+ SG(request_info).auth_user = SG(request_info).auth_password =
SG(request_info).auth_digest = NULL;
}
#ifdef WITH_ZEUS
--
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 /sapi/isapi php5isapi.c
janiThu Jul 31 00:49:16 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/sapi/isapi php5isapi.c
Log:
MFH:- Fixed bug #45568 (ISAPI does not property clear auth_digest in header).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1182r2=1.2027.2.547.2.1183diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1182 php-src/NEWS:1.2027.2.547.2.1183
--- php-src/NEWS:1.2027.2.547.2.1182Thu Jul 24 11:47:12 2008
+++ php-src/NEWSThu Jul 31 00:49:15 2008
@@ -14,6 +14,8 @@
- Fixed a regression when using strip_tags() and is within an attribute.
(Scott)
+- Fixed bug #45568 (ISAPI doesn't property clear auth_digest in header).
+ (Patch by: navara at emclient dot com)
- Fixed bug #45556 (Return value from callback isn't freed). (Felipe)
- Fixed bug #4 (Segfault with invalid non-string as
register_introspection_callback). (Christian Seiler)
http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/php5isapi.c?r1=1.8.2.2.2.4r2=1.8.2.2.2.5diff_format=u
Index: php-src/sapi/isapi/php5isapi.c
diff -u php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.4
php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.5
--- php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.4 Mon Dec 31 07:20:16 2007
+++ php-src/sapi/isapi/php5isapi.c Thu Jul 31 00:49:16 2008
@@ -16,7 +16,7 @@
| Ben Mansell [EMAIL PROTECTED] (Zeus Support)
|
+--+
*/
-/* $Id: php5isapi.c,v 1.8.2.2.2.4 2007/12/31 07:20:16 sebastian Exp $ */
+/* $Id: php5isapi.c,v 1.8.2.2.2.5 2008/07/31 00:49:16 jani Exp $ */
#include php.h
#include httpext.h
@@ -711,6 +711,7 @@
case SF_NOTIFY_PREPROC_HEADERS:
SG(request_info).auth_user = NULL;
SG(request_info).auth_password = NULL;
+ SG(request_info).auth_digest = NULL;
break;
case SF_NOTIFY_AUTHENTICATION: {
char *auth_user = ((HTTP_FILTER_AUTHENT *)
pvNotification)-pszUser;
@@ -745,7 +746,7 @@
SG(request_info).content_length = lpECB-cbTotalBytes;
SG(sapi_headers).http_response_code = 200; /* I think dwHttpStatusCode
is invalid at this stage -RL */
if (!bFilterLoaded) { /* we don't have valid ISAPI Filter information */
- SG(request_info).auth_user = SG(request_info).auth_password =
NULL;
+ SG(request_info).auth_user = SG(request_info).auth_password =
SG(request_info).auth_digest = NULL;
}
#ifdef WITH_ZEUS
--
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
janiThu Jul 31 00:51:07 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: typo http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1183r2=1.2027.2.547.2.1184diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1183 php-src/NEWS:1.2027.2.547.2.1184 --- php-src/NEWS:1.2027.2.547.2.1183Thu Jul 31 00:49:15 2008 +++ php-src/NEWSThu Jul 31 00:51:06 2008 @@ -14,7 +14,7 @@ - Fixed a regression when using strip_tags() and is within an attribute. (Scott) -- Fixed bug #45568 (ISAPI doesn't property clear auth_digest in header). +- Fixed bug #45568 (ISAPI doesn't properly clear auth_digest in header). (Patch by: navara at emclient dot com) - Fixed bug #45556 (Return value from callback isn't freed). (Felipe) - Fixed bug #4 (Segfault with invalid non-string as -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
Scott MacVicar kirjoitti: scottmacThu Jul 31 00:46:22 2008 UTC Modified files: /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: Resync libsqlite files from amalgamation. Save the kittens, no EOL mess. Eh..you just changed some $Header$ and $Id$ stuff? :D Was it really worth it? ;) --Jani p.s. Kittens are doomed, bunnies are safe. (I really hate cats..) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
On 31 Jul 2008, at 01:55, Jani Taskinen wrote: Scott MacVicar kirjoitti: scottmacThu Jul 31 00:46:22 2008 UTC Modified files: /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: Resync libsqlite files from amalgamation. Save the kittens, no EOL mess. Eh..you just changed some $Header$ and $Id$ stuff? :D Was it really worth it? ;) --Jani p.s. Kittens are doomed, bunnies are safe. (I really hate cats..) Liz said there was some EOL thing stopping Windows from building. Maybe there wasn't... Scott -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
