Re: [PHP-CVS] svn: /php/php-src/trunk/ext/snmp/ php_snmp.h snmp.c tests/snmp-object-errno-errstr.phpt tests/snmp-object-error.phpt tests/snmp-object-properties.phpt tests/snmp-object-set_security_erro
On 02/26/2011 12:27 AM, Boris Lytochkin wrote: lytboris Sat, 26 Feb 2011 08:27:26 + Revision: http://svn.php.net/viewvc?view=revision&revision=308703 Log: * new methods get_errno, get_error to get errno and error string of last SNMP-related error * formatting markup * some fixes in max_oids logic: NULL will set it to default value, do not allow non-positive user-supplied values * unit tests for changes Can you add these to NEWS and make sure UPGRADING has all the contributions you've made? Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/snmp/ snmp.c
lytboris Wed, 02 Mar 2011 22:12:02 + Revision: http://svn.php.net/viewvc?view=revision&revision=308875 Log: fix warnings mentioned in 'Parameter Parsing Report' Changed paths: U php/php-src/trunk/ext/snmp/snmp.c Modified: php/php-src/trunk/ext/snmp/snmp.c === --- php/php-src/trunk/ext/snmp/snmp.c 2011-03-02 22:03:38 UTC (rev 308874) +++ php/php-src/trunk/ext/snmp/snmp.c 2011-03-02 22:12:02 UTC (rev 308875) @@ -1739,7 +1739,7 @@ int a1_len, a2_len; long timeout = SNMP_DEFAULT_TIMEOUT; long retries = SNMP_DEFAULT_RETRIES; - int version = SNMP_DEFAULT_VERSION; + long version = SNMP_DEFAULT_VERSION; int argc = ZEND_NUM_ARGS(); #if PHP_VERSION_ID > 50300 zend_error_handling error_handling; @@ -1854,7 +1854,7 @@ php_snmp_object *snmp_object; zval *object = getThis(); char *a1 = "", *a2 = "", *a3 = "", *a4 = "", *a5 = "", *a6 = "", *a7 = ""; - int a1_len, a2_len, a3_len, a4_len, a5_len, a6_len, a7_len; + int a1_len = 0, a2_len = 0, a3_len = 0, a4_len = 0, a5_len = 0, a6_len = 0, a7_len = 0; int argc = ZEND_NUM_ARGS(); snmp_object = (php_snmp_object *)zend_object_store_get_object(object TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32
Ah right, almost forgot I decided that, joy :) On 2 Mar 2011 22:37, "Johannes Schlüter" wrote: > On Thu, 2011-03-03 at 06:26 +0900, Moriyoshi Koizumi wrote: >> On Thu, Mar 3, 2011 at 3:42 AM, Pierre Joye wrote: >> > hi, >> > >> > On Wed, Mar 2, 2011 at 7:35 PM, Moriyoshi Koizumi wrote: >> >> The library path needs to be quoted just once. It appears old compiler >> >> frontends (VC6, 7?) used to have a bug with which arguments to the >> >> linker containing whitespaces weren't properly dealt with. >> > >> > Did you test this specific change with VC6? >> >> Not yet, but trunk only supports VC9 or later versions. Is it really >> necessary for 5.3 to support VC6? > > PHP 5.3.6 won't support VC6 anymore. > > johannes > >> Regards, >> Moriyoshi >> >> > >> > Cheers >> > -- >> > Pierre >> > >> > @pierrejoye | http://blog.thepimp.net | http://www.libgd.org >> > >> > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php >
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS configure.in main/php_version.h
johannes Wed, 02 Mar 2011 22:03:38 + Revision: http://svn.php.net/viewvc?view=revision&revision=308874 Log: Back to -dev Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/configure.in U php/php-src/branches/PHP_5_3/main/php_version.h Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-03-02 22:01:18 UTC (rev 308873) +++ php/php-src/branches/PHP_5_3/NEWS 2011-03-02 22:03:38 UTC (rev 308874) @@ -1,5 +1,7 @@ PHP NEWS ||| +?? ??? 2011, PHP 5.3.6 + 03 Mar 2011, PHP 5.3.6RC2 - Zend Engine: . Fixed bug #43512 (same parameter name can be used multiple times in Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2011-03-02 22:01:18 UTC (rev 308873) +++ php/php-src/branches/PHP_5_3/configure.in 2011-03-02 22:03:38 UTC (rev 308874) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=6 -PHP_EXTRA_VERSION="RC2" +PHP_EXTRA_VERSION="RC3-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3/main/php_version.h === --- php/php-src/branches/PHP_5_3/main/php_version.h 2011-03-02 22:01:18 UTC (rev 308873) +++ php/php-src/branches/PHP_5_3/main/php_version.h 2011-03-02 22:03:38 UTC (rev 308874) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 6 -#define PHP_EXTRA_VERSION "RC2" -#define PHP_VERSION "5.3.6RC2" +#define PHP_EXTRA_VERSION "RC3-dev" +#define PHP_VERSION "5.3.6RC3-dev" #define PHP_VERSION_ID 50306 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32
On Thu, 2011-03-03 at 06:26 +0900, Moriyoshi Koizumi wrote: > On Thu, Mar 3, 2011 at 3:42 AM, Pierre Joye wrote: > > hi, > > > > On Wed, Mar 2, 2011 at 7:35 PM, Moriyoshi Koizumi wrote: > >> The library path needs to be quoted just once. It appears old compiler > >> frontends (VC6, 7?) used to have a bug with which arguments to the > >> linker containing whitespaces weren't properly dealt with. > > > > Did you test this specific change with VC6? > > Not yet, but trunk only supports VC9 or later versions. Is it really > necessary for 5.3 to support VC6? PHP 5.3.6 won't support VC6 anymore. johannes > Regards, > Moriyoshi > > > > > Cheers > > -- > > Pierre > > > > @pierrejoye | http://blog.thepimp.net | http://www.libgd.org > > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
johannes Wed, 02 Mar 2011 21:28:42 + Revision: http://svn.php.net/viewvc?view=revision&revision=308871 Log: PHP 5.3.6RC2 Changed paths: A + php/php-src/tags/php_5_3_6RC2/ (from php/php-src/branches/PHP_5_3/:r308870) Property changes on: php/php-src/tags/php_5_3_6RC2 ___ Added: svn:ignore + *.gcda *.gcno *.la *.lo *.ncb *.opt *.plg FBCIndex FBCLockFolder deps libs Debug Debug_TS Makefile Makefile.fragments Makefile.objects Release Release_TS Release_TSDbg Release_TS_inline Release_inline ZendEngine1 _libs acconfig.h aclocal.m4 autom4te.cache bsd_converted buildconf.stamp buildmk.stamp confdefs.h config.cache config.h.in config.log config.nice config.nice.bat config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat configure.js conftest conftest.c debug.log diff generated_lists include install-sh internal_functions.c lcov_data lcov_html libs libtool meta_cc meta_ccld missing mkinstalldirs modules php php-*.tar.gz php5.spec php_lcov.info php_test_results_*.txt php_version.h results.txt shlibtool stamp-h test.php3 tmp-php.ini want_dependencies x64 Added: svn:mergeinfo + /php/php-src/trunk:284726,305015,305018-305019 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32
On Thu, Mar 3, 2011 at 3:42 AM, Pierre Joye wrote: > hi, > > On Wed, Mar 2, 2011 at 7:35 PM, Moriyoshi Koizumi wrote: >> The library path needs to be quoted just once. It appears old compiler >> frontends (VC6, 7?) used to have a bug with which arguments to the >> linker containing whitespaces weren't properly dealt with. > > Did you test this specific change with VC6? Not yet, but trunk only supports VC9 or later versions. Is it really necessary for 5.3 to support VC6? Regards, Moriyoshi > > Cheers > -- > Pierre > > @pierrejoye | http://blog.thepimp.net | http://www.libgd.org > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS configure.in main/php_version.h
johannes Wed, 02 Mar 2011 21:26:43 + Revision: http://svn.php.net/viewvc?view=revision&revision=308870 Log: PHP 5.2.6RC2 Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/configure.in U php/php-src/branches/PHP_5_3/main/php_version.h Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-03-02 21:21:05 UTC (rev 308869) +++ php/php-src/branches/PHP_5_3/NEWS 2011-03-02 21:26:43 UTC (rev 308870) @@ -1,13 +1,13 @@ PHP NEWS ||| -?? ??? 2011, PHP 5.3.6 +03 Mar 2011, PHP 5.3.6RC2 - Zend Engine: . Fixed bug #43512 (same parameter name can be used multiple times in method/function definition). (Felipe) - Exif extension: - . Fixed bug #54002 (crash on crafted tag, reported by Luca Carettoni). (Pierre) -(CVE-2011-0708) + . Fixed bug #54002 (crash on crafted tag, reported by Luca Carettoni). +(Pierre) (CVE-2011-0708) - OpenSSL extension: . Fixed bug #54060 (Memory leaks when openssl_encrypt). (Pierre) Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2011-03-02 21:21:05 UTC (rev 308869) +++ php/php-src/branches/PHP_5_3/configure.in 2011-03-02 21:26:43 UTC (rev 308870) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=6 -PHP_EXTRA_VERSION="RC2-dev" +PHP_EXTRA_VERSION="RC2" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3/main/php_version.h === --- php/php-src/branches/PHP_5_3/main/php_version.h 2011-03-02 21:21:05 UTC (rev 308869) +++ php/php-src/branches/PHP_5_3/main/php_version.h 2011-03-02 21:26:43 UTC (rev 308870) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 6 -#define PHP_EXTRA_VERSION "RC2-dev" -#define PHP_VERSION "5.3.6RC2-dev" +#define PHP_EXTRA_VERSION "RC2" +#define PHP_VERSION "5.3.6RC2" #define PHP_VERSION_ID 50306 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32
hi,
On Wed, Mar 2, 2011 at 7:35 PM, Moriyoshi Koizumi wrote:
>> Please merge to 5.3
>
> Done.
Thanks!
>> On Wed, Mar 2, 2011 at 6:22 AM, Moriyoshi Koizumi wrote:
>>> moriyoshi Wed, 02 Mar 2011 05:22:22 +
>>
>>> Modified: php/php-src/trunk/win32/build/config.w32
>>> ===
>>> --- php/php-src/trunk/win32/build/config.w32 2011-03-02 03:59:38 UTC
>>> (rev 308838)
>>> +++ php/php-src/trunk/win32/build/config.w32 2011-03-02 05:22:22 UTC
>>> (rev 308839)
>>> @@ -271,7 +271,7 @@
>>> var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
>>>
>>> ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');
>>> -ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_suspects + '\\"" ');
>>> +ADD_FLAG("LDFLAGS", '/libpath:"' + php_usual_lib_suspects + '" ');
>>
>> Why this change?
>
> The library path needs to be quoted just once. It appears old compiler
> frontends (VC6, 7?) used to have a bug with which arguments to the
> linker containing whitespaces weren't properly dealt with.
Did you test this specific change with VC6?
Cheers
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32
Hi,
On Wed, Mar 2, 2011 at 5:58 PM, Pierre Joye wrote:
> hi,
>
> Please merge to 5.3
Done.
>
> On Wed, Mar 2, 2011 at 6:22 AM, Moriyoshi Koizumi wrote:
>> moriyoshi Wed, 02 Mar 2011 05:22:22 +
>
>> Modified: php/php-src/trunk/win32/build/config.w32
>> ===
>> --- php/php-src/trunk/win32/build/config.w32 2011-03-02 03:59:38 UTC (rev
>> 308838)
>> +++ php/php-src/trunk/win32/build/config.w32 2011-03-02 05:22:22 UTC (rev
>> 308839)
>> @@ -271,7 +271,7 @@
>> var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
>>
>> ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');
>> -ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_suspects + '\\"" ');
>> +ADD_FLAG("LDFLAGS", '/libpath:"' + php_usual_lib_suspects + '" ');
>
> Why this change?
The library path needs to be quoted just once. It appears old compiler
frontends (VC6, 7?) used to have a bug with which arguments to the
linker containing whitespaces weren't properly dealt with.
Regards,
Moriyoshi
>
> Cheers,
> --
> Pierre
>
> @pierrejoye | http://blog.thepimp.net | http://www.libgd.org
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ Makefile config.w32
moriyoshiWed, 02 Mar 2011 18:35:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=308863
Log:
- Merge from trunk.
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-03-02 18:08:27 UTC
(rev 308862)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-03-02 18:35:10 UTC
(rev 308863)
@@ -93,7 +93,7 @@
@cd $(BUILD_DIR)
@for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D > NUL
@if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV) > NUL
- @cd $(PHP_SRC_DIR)
+ @cd "$(PHP_SRC_DIR)"
clean-sapi:
@@ -107,7 +107,7 @@
@echo Cleaning distribution build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* >
NUL
- @cd $(PHP_SRC_DIR)
+ @cd "$(PHP_SRC_DIR)"
-@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF)
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
@@ -119,7 +119,7 @@
@echo Cleaning standard build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D
- @cd $(PHP_SRC_DIR)
+ @cd "$(PHP_SRC_DIR)"
-@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc
$(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll
$(BUILD_DIR)\php*.exe > NUL
test:
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-03-02 18:08:27 UTC
(rev 308862)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-03-02 18:35:10 UTC
(rev 308863)
@@ -266,7 +266,7 @@
var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');
-ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_suspects + '\\"" ');
+ADD_FLAG("LDFLAGS", '/libpath:"' + php_usual_lib_suspects + '" ');
// Poke around for some headers
function probe_basic_headers()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32
hi,
Please merge to 5.3
On Wed, Mar 2, 2011 at 6:22 AM, Moriyoshi Koizumi wrote:
> moriyoshi Wed, 02 Mar 2011 05:22:22 +
> Modified: php/php-src/trunk/win32/build/config.w32
> ===
> --- php/php-src/trunk/win32/build/config.w32 2011-03-02 03:59:38 UTC (rev
> 308838)
> +++ php/php-src/trunk/win32/build/config.w32 2011-03-02 05:22:22 UTC (rev
> 308839)
> @@ -271,7 +271,7 @@
> var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
>
> ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');
> -ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_suspects + '\\"" ');
> +ADD_FLAG("LDFLAGS", '/libpath:"' + php_usual_lib_suspects + '" ');
Why this change?
Cheers,
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
