Re: [PHP-CVS] com php-src: forgot this file :(: ext/curl/curl_file.c
On Tue, Jan 29, 2013 at 3:02 PM, Stanislav Malyshev wrote: > Commit:15e76e6a98ded4f28aa8d5a91b2286497e44fc5b > Author:Stanislav Malyshev Tue, 29 Jan 2013 > 15:02:55 -0800 > Parents: 26de5cc57fa39b9682cd5523711638d98fa6fddd > Branches: PHP-5.5 master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=15e76e6a98ded4f28aa8d5a91b2286497e44fc5b > > Log: > forgot this file :( > Seriously? this commit message maybe made sense to you in January if it was committed few seconds after some other change.. but now? This is the initial commit of some weird curlfile class, with no references to anything whatsoever. Please please please write a real commit message in the future, and RFC commits should probably reference the RFC. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/curl/interface.c
On Tue, Apr 2, 2013 at 7:15 PM, Xinchen Hui wrote:
> Commit:6ace9c646b56707723f44c9fa6a46a907e1292f3
> Author:Xinchen Hui Wed, 3 Apr 2013 10:15:41
> +0800
> Parents: 688f5fc8897fe505de80640a75a290338bf5c2fb
> 78a9489f6a7326dd0ce0c2baaf37c94a0a85f931
> Branches: PHP-5.5
>
> Link:
> http://git.php.net/?p=php-src.git;a=commitdiff;h=6ace9c646b56707723f44c9fa6a46a907e1292f3
>
> Log:
> Merge branch 'PHP-5.4' into PHP-5.5
>
> Conflicts:
> ext/curl/interface.c
>
> Changed paths:
> MM ext/curl/interface.c
>
>
> Diff:
> diff --cc ext/curl/interface.c
> index 0c29e46,ee205a7..ae490b1
> --- a/ext/curl/interface.c
> +++ b/ext/curl/interface.c
> @@@ -1222,6 -914,8 +1222,7 @@@ PHP_MINIT_FUNCTION(curl
> }
>
> #ifdef PHP_CURL_URL_WRAPPERS
> + REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 1, CONST_CS |
> CONST_PERSISTENT);
> -# if HAVE_CURL_VERSION_INFO
> {
> curl_version_info_data *info =
> curl_version_info(CURLVERSION_NOW);
> char **p = (char **)info->protocols;
> @@@ -1235,10 -929,22 +1236,12 @@@
> (void) *p++;
> }
> }
> -# else
> - php_unregister_url_stream_wrapper("http");
> - php_register_url_stream_wrapper("http", &php_curl_wrapper TSRMLS_CC);
> - php_unregister_url_stream_wrapper("https");
> - php_register_url_stream_wrapper("https", &php_curl_wrapper TSRMLS_CC);
> - php_unregister_url_stream_wrapper("ftp");
> - php_register_url_stream_wrapper("ftp", &php_curl_wrapper TSRMLS_CC);
> - php_unregister_url_stream_wrapper("ftps");
> - php_register_url_stream_wrapper("ftps", &php_curl_wrapper TSRMLS_CC);
> - php_unregister_url_stream_wrapper("ldap");
> - php_register_url_stream_wrapper("ldap", &php_curl_wrapper TSRMLS_CC);
> -# endif
> + #else
> + REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 0, CONST_CS |
> CONST_PERSISTENT);
> #endif
>
> + curlfile_register_class(TSRMLS_C);
> +
I can't see that function doing anything even similar? Are you sure
this is correct?
-Hannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/curl/interface.c
Hey:
this is because the merge conflict, you should see the diff against
5.5 branch
On Sun, Apr 7, 2013 at 1:12 AM, Hannes Magnusson wrote:
> On Tue, Apr 2, 2013 at 7:15 PM, Xinchen Hui wrote:
> > Commit:6ace9c646b56707723f44c9fa6a46a907e1292f3
> > Author:Xinchen Hui Wed, 3 Apr 2013
> 10:15:41 +0800
> > Parents: 688f5fc8897fe505de80640a75a290338bf5c2fb
> 78a9489f6a7326dd0ce0c2baaf37c94a0a85f931
> > Branches: PHP-5.5
> >
> > Link:
> http://git.php.net/?p=php-src.git;a=commitdiff;h=6ace9c646b56707723f44c9fa6a46a907e1292f3
> >
> > Log:
> > Merge branch 'PHP-5.4' into PHP-5.5
> >
> > Conflicts:
> > ext/curl/interface.c
> >
> > Changed paths:
> > MM ext/curl/interface.c
> >
> >
> > Diff:
> > diff --cc ext/curl/interface.c
> > index 0c29e46,ee205a7..ae490b1
> > --- a/ext/curl/interface.c
> > +++ b/ext/curl/interface.c
> > @@@ -1222,6 -914,8 +1222,7 @@@ PHP_MINIT_FUNCTION(curl
> > }
> >
> > #ifdef PHP_CURL_URL_WRAPPERS
> > + REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 1, CONST_CS |
> CONST_PERSISTENT);
> > -# if HAVE_CURL_VERSION_INFO
> > {
> > curl_version_info_data *info =
> curl_version_info(CURLVERSION_NOW);
> > char **p = (char **)info->protocols;
> > @@@ -1235,10 -929,22 +1236,12 @@@
> > (void) *p++;
> > }
> > }
> > -# else
> > - php_unregister_url_stream_wrapper("http");
> > - php_register_url_stream_wrapper("http", &php_curl_wrapper
> TSRMLS_CC);
> > - php_unregister_url_stream_wrapper("https");
> > - php_register_url_stream_wrapper("https", &php_curl_wrapper
> TSRMLS_CC);
> > - php_unregister_url_stream_wrapper("ftp");
> > - php_register_url_stream_wrapper("ftp", &php_curl_wrapper
> TSRMLS_CC);
> > - php_unregister_url_stream_wrapper("ftps");
> > - php_register_url_stream_wrapper("ftps", &php_curl_wrapper
> TSRMLS_CC);
> > - php_unregister_url_stream_wrapper("ldap");
> > - php_register_url_stream_wrapper("ldap", &php_curl_wrapper
> TSRMLS_CC);
> > -# endif
> > + #else
> > + REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 0, CONST_CS |
> CONST_PERSISTENT);
> > #endif
> >
> > + curlfile_register_class(TSRMLS_C);
> > +
>
> I can't see that function doing anything even similar? Are you sure
> this is correct?
>
> -Hannes
>
--
Laruence Xinchen Hui
http://www.laruence.com/
[PHP-CVS] com php-src: leave a sane environment behind (even if empty) when exiting some OS atexit() handlers call getenv(): sapi/cli/ps_title.c
Commit:1a71bf646e799851dacb2fbe1a439f21543ca590
Author:Nuno Lopes Sun, 7 Apr 2013 02:32:20 -0400
Parents: bd96813042c7aecde34e65d0e1f96ce7e8214da7
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=1a71bf646e799851dacb2fbe1a439f21543ca590
Log:
leave a sane environment behind (even if empty) when exiting
some OS atexit() handlers call getenv()
Changed paths:
M sapi/cli/ps_title.c
Diff:
diff --git a/sapi/cli/ps_title.c b/sapi/cli/ps_title.c
index 8dc4609..6f3bdb8 100644
--- a/sapi/cli/ps_title.c
+++ b/sapi/cli/ps_title.c
@@ -112,6 +112,7 @@ static const size_t ps_buffer_size = MAX_PATH;
#elif defined(PS_USE_CLOBBER_ARGV)
static char *ps_buffer; /* will point to argv area */
static size_t ps_buffer_size; /* space determined at run time */
+static char *empty_environ[] = {0}; /* empty environment */
#else
#define PS_BUFFER_SIZE 256
static char ps_buffer[PS_BUFFER_SIZE];
@@ -415,6 +416,9 @@ void cleanup_ps_args(char **argv)
free(frozen_environ[i]);
free(frozen_environ);
free(new_environ);
+/* leave a sane environment behind since some atexit() handlers
+call getenv(). */
+environ = empty_environ;
}
#endif /* PS_USE_CLOBBER_ARGV */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: leave a sane environment behind (even if empty) when exiting some OS atexit() handlers call getenv(): sapi/cli/ps_title.c
Commit:e769025791e1696dcb6bc09c9b066844df4ce763
Author:Nuno Lopes Sun, 7 Apr 2013 02:32:20 -0400
Parents: 5ac8084e5f339132e7aa94b83bddfcd16641e9be
Branches: PHP-5.5
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=e769025791e1696dcb6bc09c9b066844df4ce763
Log:
leave a sane environment behind (even if empty) when exiting
some OS atexit() handlers call getenv()
Changed paths:
M sapi/cli/ps_title.c
Diff:
diff --git a/sapi/cli/ps_title.c b/sapi/cli/ps_title.c
index 8dc4609..6f3bdb8 100644
--- a/sapi/cli/ps_title.c
+++ b/sapi/cli/ps_title.c
@@ -112,6 +112,7 @@ static const size_t ps_buffer_size = MAX_PATH;
#elif defined(PS_USE_CLOBBER_ARGV)
static char *ps_buffer; /* will point to argv area */
static size_t ps_buffer_size; /* space determined at run time */
+static char *empty_environ[] = {0}; /* empty environment */
#else
#define PS_BUFFER_SIZE 256
static char ps_buffer[PS_BUFFER_SIZE];
@@ -415,6 +416,9 @@ void cleanup_ps_args(char **argv)
free(frozen_environ[i]);
free(frozen_environ);
free(new_environ);
+/* leave a sane environment behind since some atexit() handlers
+call getenv(). */
+environ = empty_environ;
}
#endif /* PS_USE_CLOBBER_ARGV */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
