[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ ext/curl/streams.c ext/standard/ftp_fopen_wrapper.c ext/standard/http_fopen_wrapper.c main/streams/php_stream_context.h main/streams/streams.c main/stream
felipe Mon, 16 Nov 2009 10:36:27 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290803
Log:
- Switching to TSRMLS_FETCH version
Changed paths:
U php/php-src/branches/PHP_5_3/ext/curl/streams.c
U php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c
U php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
U php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h
U php/php-src/branches/PHP_5_3/main/streams/streams.c
U php/php-src/branches/PHP_5_3/main/streams/transports.c
Modified: php/php-src/branches/PHP_5_3/ext/curl/streams.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/streams.c 2009-11-16 06:06:29 UTC
(rev 290802)
+++ php/php-src/branches/PHP_5_3/ext/curl/streams.c 2009-11-16 10:36:27 UTC
(rev 290803)
@@ -270,7 +270,7 @@
memset(curlstream, 0, sizeof(php_curl_stream));
stream = php_stream_alloc(php_curl_stream_ops, curlstream, 0, mode);
- php_stream_context_set(stream, context TSRMLS_CC);
+ php_stream_context_set(stream, context);
curlstream-curl = curl_easy_init();
curlstream-multi = curl_multi_init();
Modified: php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c
2009-11-16 06:06:29 UTC (rev 290802)
+++ php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c
2009-11-16 10:36:27 UTC (rev 290803)
@@ -143,7 +143,7 @@
goto connect_errexit;
}
- php_stream_context_set(stream, context TSRMLS_CC);
+ php_stream_context_set(stream, context);
php_stream_notify_info(context, PHP_STREAM_NOTIFY_CONNECT, NULL, 0);
/* Start talking to ftp server */
@@ -550,7 +550,7 @@
goto errexit;
}
- php_stream_context_set(datastream, context TSRMLS_CC);
+ php_stream_context_set(datastream, context);
php_stream_notify_progress_init(context, 0, file_size);
if (use_ssl_on_data (php_stream_xport_crypto_setup(datastream,
@@ -715,7 +715,7 @@
goto opendir_errexit;
}
- php_stream_context_set(datastream, context TSRMLS_CC);
+ php_stream_context_set(datastream, context);
if (use_ssl_on_data (php_stream_xport_crypto_setup(stream,
STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) 0
||
Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
2009-11-16 06:06:29 UTC (rev 290802)
+++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
2009-11-16 10:36:27 UTC (rev 290803)
@@ -245,7 +245,7 @@
eol_detect = stream-flags (PHP_STREAM_FLAG_DETECT_EOL |
PHP_STREAM_FLAG_EOL_MAC);
stream-flags = ~(PHP_STREAM_FLAG_DETECT_EOL |
PHP_STREAM_FLAG_EOL_MAC);
- php_stream_context_set(stream, context TSRMLS_CC);
+ php_stream_context_set(stream, context);
php_stream_notify_info(context, PHP_STREAM_NOTIFY_CONNECT, NULL, 0);
Modified: php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h
===
--- php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h
2009-11-16 06:06:29 UTC (rev 290802)
+++ php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h
2009-11-16 10:36:27 UTC (rev 290803)
@@ -95,7 +95,7 @@
BEGIN_EXTERN_C()
PHPAPI void php_stream_notification_notify(php_stream_context *context, int
notifycode, int severity,
char *xmsg, int xcode, size_t bytes_sofar, size_t bytes_max,
void * ptr TSRMLS_DC);
-PHPAPI php_stream_context *php_stream_context_set(php_stream *stream,
php_stream_context *context TSRMLS_DC);
+PHPAPI php_stream_context *php_stream_context_set(php_stream *stream,
php_stream_context *context);
END_EXTERN_C()
#define php_stream_notify_info(context, code, xmsg, xcode) do { if
((context) (context)-notifier) { \
Modified: php/php-src/branches/PHP_5_3/main/streams/streams.c
===
--- php/php-src/branches/PHP_5_3/main/streams/streams.c 2009-11-16 06:06:29 UTC
(rev 290802)
+++ php/php-src/branches/PHP_5_3/main/streams/streams.c 2009-11-16 10:36:27 UTC
(rev 290803)
@@ -1958,9 +1958,10 @@
/* }}} */
/* {{{ context API */
-PHPAPI php_stream_context *php_stream_context_set(php_stream *stream,
php_stream_context *context TSRMLS_DC)
+PHPAPI php_stream_context *php_stream_context_set(php_stream *stream,
php_stream_context *context)
{
php_stream_context *oldcontext = stream-context;
+ TSRMLS_FETCH();
stream-context = context;
Modified:
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/main/rfc1867.c branches/PHP_5_3/main/rfc1867.c trunk/main/rfc1867.c
iliaaMon, 16 Nov 2009 13:34:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290820
Log:
Simpify the max_file_uploads handling code
Changed paths:
U php/php-src/branches/PHP_5_2/main/rfc1867.c
U php/php-src/branches/PHP_5_3/main/rfc1867.c
U php/php-src/trunk/main/rfc1867.c
Modified: php/php-src/branches/PHP_5_2/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_2/main/rfc1867.c 2009-11-16 13:34:48 UTC (rev
290819)
+++ php/php-src/branches/PHP_5_2/main/rfc1867.c 2009-11-16 13:34:57 UTC (rev
290820)
@@ -795,13 +795,8 @@
zend_llist header;
void *event_extra_data = NULL;
int llen = 0;
- char *max_uploads = INI_STR(max_file_uploads);
- int upload_cnt = 0;
+ int upload_cnt = INI_INT(max_file_uploads);
- if (max_uploads *max_uploads) {
- upload_cnt = atoi(max_uploads);
- }
-
if (SG(request_info).content_length SG(post_max_size)) {
sapi_module.sapi_error(E_WARNING, POST Content-Length of %ld
bytes exceeds the limit of %ld bytes, SG(request_info).content_length,
SG(post_max_size));
return;
Modified: php/php-src/branches/PHP_5_3/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_3/main/rfc1867.c 2009-11-16 13:34:48 UTC (rev
290819)
+++ php/php-src/branches/PHP_5_3/main/rfc1867.c 2009-11-16 13:34:57 UTC (rev
290820)
@@ -795,13 +795,8 @@
zend_llist header;
void *event_extra_data = NULL;
int llen = 0;
- char *max_uploads = INI_STR(max_file_uploads);
- int upload_cnt = 0;
+ int upload_cnt = INI_INT(max_file_uploads);
- if (max_uploads *max_uploads) {
- upload_cnt = atoi(max_uploads);
- }
-
if (SG(request_info).content_length SG(post_max_size)) {
sapi_module.sapi_error(E_WARNING, POST Content-Length of %ld
bytes exceeds the limit of %ld bytes, SG(request_info).content_length,
SG(post_max_size));
return;
Modified: php/php-src/trunk/main/rfc1867.c
===
--- php/php-src/trunk/main/rfc1867.c2009-11-16 13:34:48 UTC (rev 290819)
+++ php/php-src/trunk/main/rfc1867.c2009-11-16 13:34:57 UTC (rev 290820)
@@ -594,13 +594,8 @@
zend_llist header;
void *event_extra_data = NULL;
int llen = 0;
- char *max_uploads = INI_STR(max_file_uploads);
- int upload_cnt = 0;
+ int upload_cnt = INI_INT(max_file_uploads);
- if (max_uploads *max_uploads) {
- upload_cnt = atoi(max_uploads);
- }
-
if (SG(request_info).content_length SG(post_max_size)) {
sapi_module.sapi_error(E_WARNING, POST Content-Length of %ld
bytes exceeds the limit of %ld bytes, SG(request_info).content_length,
SG(post_max_size));
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/date/lib/timezonedb.h branches/PHP_5_3/ext/date/lib/timezonedb.h trunk/ext/date/lib/timezonedb.h
derick Mon, 16 Nov 2009 15:57:13 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290823
Log:
- Updated to version 2009.19 (2009s)
Changed paths:
U php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h
U php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h
U php/php-src/trunk/ext/date/lib/timezonedb.h
Modified: php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h
===
--- php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h 2009-11-16 14:52:05 UTC (rev 290822)
+++ php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h 2009-11-16 15:57:13 UTC (rev 290823)
@@ -501,68 +501,68 @@
{ Pacific/Enderbury , 0x039CD9 },
{ Pacific/Fakaofo , 0x039D47 },
{ Pacific/Fiji , 0x039D8B },
- { Pacific/Funafuti , 0x039E01 },
- { Pacific/Galapagos , 0x039E45 },
- { Pacific/Gambier , 0x039EBD },
- { Pacific/Guadalcanal , 0x039F22 },
- { Pacific/Guam , 0x039F77 },
- { Pacific/Honolulu , 0x039FCD },
- { Pacific/Johnston , 0x03A061 },
- { Pacific/Kiritimati, 0x03A0B3 },
- { Pacific/Kosrae, 0x03A11E },
- { Pacific/Kwajalein , 0x03A17B },
- { Pacific/Majuro, 0x03A1E7 },
- { Pacific/Marquesas , 0x03A246 },
- { Pacific/Midway, 0x03A2AD },
- { Pacific/Nauru , 0x03A337 },
- { Pacific/Niue , 0x03A3AF },
- { Pacific/Norfolk , 0x03A40D },
- { Pacific/Noumea, 0x03A462 },
- { Pacific/Pago_Pago , 0x03A4F2 },
- { Pacific/Palau , 0x03A57B },
- { Pacific/Pitcairn , 0x03A5BF },
- { Pacific/Ponape, 0x03A614 },
- { Pacific/Port_Moresby , 0x03A669 },
- { Pacific/Rarotonga , 0x03A6AD },
- { Pacific/Saipan, 0x03A789 },
- { Pacific/Samoa , 0x03A7EC },
- { Pacific/Tahiti, 0x03A875 },
- { Pacific/Tarawa, 0x03A8DA },
- { Pacific/Tongatapu , 0x03A92E },
- { Pacific/Truk , 0x03A9BA },
- { Pacific/Wake , 0x03AA13 },
- { Pacific/Wallis, 0x03AA63 },
- { Pacific/Yap , 0x03AAA7 },
- { Poland, 0x03AAEC },
- { Portugal , 0x03AECD },
- { PRC , 0x03B3C9 },
- { PST8PDT , 0x03B47A },
- { ROC , 0x03B7CB },
- { ROK , 0x03B8E3 },
- { Singapore , 0x03B987 },
- { Turkey, 0x03BA3E },
- { UCT , 0x03BE2B },
- { Universal , 0x03BE6F },
- { US/Alaska , 0x03BEB3 },
- { US/Aleutian , 0x03C21C },
- { US/Arizona, 0x03C582 },
- { US/Central, 0x03C610 },
- { US/East-Indiana , 0x03D01A },
- { US/Eastern, 0x03CB1B },
- { US/Hawaii , 0x03D284 },
- { US/Indiana-Starke , 0x03D312 },
- { US/Michigan , 0x03D683 },
- { US/Mountain , 0x03D9BA },
- { US/Pacific, 0x03DD33 },
- { US/Pacific-New, 0x03E138 },
- { US/Samoa , 0x03E53D },
- { UTC , 0x03E5C6 },
- { W-SU , 0x03E8BD },
- { WET , 0x03E60A },
- { Zulu , 0x03EBF8 },
+ { Pacific/Funafuti , 0x039E0B },
+ { Pacific/Galapagos , 0x039E4F },
+ { Pacific/Gambier , 0x039EC7 },
+ { Pacific/Guadalcanal , 0x039F2C },
+ { Pacific/Guam , 0x039F81 },
+ { Pacific/Honolulu , 0x039FD7 },
+ { Pacific/Johnston , 0x03A06B },
+ { Pacific/Kiritimati, 0x03A0BD },
+ { Pacific/Kosrae, 0x03A128 },
+ { Pacific/Kwajalein , 0x03A185 },
+ { Pacific/Majuro, 0x03A1F1 },
+ { Pacific/Marquesas , 0x03A250 },
+ { Pacific/Midway, 0x03A2B7 },
+ { Pacific/Nauru , 0x03A341 },
+ { Pacific/Niue , 0x03A3B9 },
+ { Pacific/Norfolk , 0x03A417 },
+ { Pacific/Noumea, 0x03A46C },
+ { Pacific/Pago_Pago , 0x03A4FC },
+ { Pacific/Palau , 0x03A585 },
+ { Pacific/Pitcairn , 0x03A5C9 },
+ {
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ zend_compile.c
felipe Mon, 16 Nov 2009 22:52:00 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290846 Log: - Added CG(encoding_declared) initialization Changed paths: U php/php-src/branches/PHP_5_3/Zend/zend_compile.c Modified: php/php-src/branches/PHP_5_3/Zend/zend_compile.c === --- php/php-src/branches/PHP_5_3/Zend/zend_compile.c2009-11-16 22:32:30 UTC (rev 290845) +++ php/php-src/branches/PHP_5_3/Zend/zend_compile.c2009-11-16 22:52:00 UTC (rev 290846) @@ -161,6 +161,7 @@ CG(encoding_detector) = NULL; CG(encoding_converter) = NULL; CG(encoding_oddlen) = NULL; + CG(encoding_declared) = 0; #endif /* ZEND_MULTIBYTE */ } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
