diff options
| author | Wez Furlong <wez@php.net> | 2002-04-19 10:06:41 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-04-19 10:06:41 +0000 |
| commit | 928bae9cf885ea5e4d76f980de8459b6dcad0cd1 (patch) | |
| tree | e52b900dcc9da71096a3badf527412da524820da /ext | |
| parent | fe6990cc6b365cd0e1e3f1ddd81c93b9e8ae23e5 (diff) | |
| download | php-git-928bae9cf885ea5e4d76f980de8459b6dcad0cd1.tar.gz | |
Make scheme part decoding rfc2396 compliant.
Change zlib:// and bzip2:// to compress.zlib:// and compress.bzip2://
Tidy up old socket/network code/comments.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/fsock.c | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib_fopen_wrapper.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c index 21eb6e8256..9d90788298 100644 --- a/ext/standard/fsock.c +++ b/ext/standard/fsock.c @@ -84,8 +84,6 @@ #ifdef ZTS static int fsock_globals_id; -#else -extern int le_fp; #endif #ifdef PHP_WIN32 diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index fb63e7d123..fbfd5820e3 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -181,7 +181,7 @@ PHP_MINIT_FUNCTION(zlib) #ifdef ZTS ts_allocate_id(&zlib_globals_id, sizeof(zend_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL); #endif - php_register_url_stream_wrapper("zlib", &php_stream_gzip_wrapper TSRMLS_CC); + php_register_url_stream_wrapper("compress.zlib", &php_stream_gzip_wrapper TSRMLS_CC); REGISTER_LONG_CONSTANT("FORCE_GZIP", CODING_GZIP, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FORCE_DEFLATE", CODING_DEFLATE, CONST_CS | CONST_PERSISTENT); diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c index 0886689634..034311b809 100644 --- a/ext/zlib/zlib_fopen_wrapper.c +++ b/ext/zlib/zlib_fopen_wrapper.c @@ -101,8 +101,8 @@ php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mod self = emalloc(sizeof(*self)); - if (strncasecmp("zlib://", path, 7) == 0) - path += 7; + if (strncasecmp("compress.zlib://", path, 16) == 0) + path += 16; else if (strncasecmp("zlib:", path, 5) == 0) path += 5; |