diff options
author | Ondřej Surý <ondrej@sury.org> | 2012-11-16 13:25:37 +0100 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2012-11-16 13:25:37 +0100 |
commit | 0b82e05fe264306004119e30119e665365331e17 (patch) | |
tree | b6ee689804e9ca3946a644a80760d821a032d42f /main | |
parent | b57a2691d5b72c3894e2d4e0f945cecc6b3a1953 (diff) | |
download | php-0b82e05fe264306004119e30119e665365331e17.tar.gz |
Imported Upstream version 5.5.0~alpha1upstream/5.5.0_alpha1
Diffstat (limited to 'main')
-rw-r--r-- | main/fopen_wrappers.h | 2 | ||||
-rw-r--r-- | main/logos.h | 1080 | ||||
-rw-r--r-- | main/main.c | 16 | ||||
-rw-r--r-- | main/network.c | 3 | ||||
-rw-r--r-- | main/output.c | 2 | ||||
-rw-r--r-- | main/php.h | 3 | ||||
-rw-r--r-- | main/php_config.h.in | 8 | ||||
-rw-r--r-- | main/php_logos.c | 99 | ||||
-rw-r--r-- | main/php_logos.h | 34 | ||||
-rw-r--r--[-rwxr-xr-x] | main/php_streams.h | 4 | ||||
-rw-r--r-- | main/php_variables.c | 17 | ||||
-rw-r--r-- | main/php_version.h | 10 | ||||
-rw-r--r-- | main/rfc1867.c | 8 | ||||
-rw-r--r--[-rwxr-xr-x] | main/streams/glob_wrapper.c | 0 | ||||
-rw-r--r-- | main/streams/php_stream_context.h | 8 | ||||
-rw-r--r--[-rwxr-xr-x] | main/streams/php_stream_glob_wrapper.h | 0 | ||||
-rw-r--r-- | main/streams/plain_wrapper.c | 97 | ||||
-rw-r--r--[-rwxr-xr-x] | main/streams/streams.c | 81 |
18 files changed, 85 insertions, 1387 deletions
diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h index 6dcc6e1cc..1d6394cb0 100644 --- a/main/fopen_wrappers.h +++ b/main/fopen_wrappers.h @@ -28,7 +28,7 @@ BEGIN_EXTERN_C() PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC); PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC); PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len TSRMLS_DC); -PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len, int realpath_mode TSRMLS_DC); +PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len, int use_realpath TSRMLS_DC); PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC); PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC); diff --git a/main/logos.h b/main/logos.h deleted file mode 100644 index 3b65cbbcf..000000000 --- a/main/logos.h +++ /dev/null @@ -1,1080 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#define CONTEXT_TYPE_IMAGE_GIF "Content-Type: image/gif" - -static const unsigned char zend_logo[] = { - 71, 73, 70, 56, 57, 97, 113, 0, 72, 0, - 213, 0, 0, 13, 13, 14, 1, 3, 6, 2, - 5, 9, 46, 68, 94, 21, 29, 39, 5, 15, - 26, 4, 10, 17, 29, 43, 58, 0, 1, 2, - 9, 25, 42, 38, 105, 171, 24, 67, 109, 13, - 36, 59, 10, 27, 45, 9, 25, 41, 35, 96, - 157, 32, 87, 142, 29, 79, 130, 26, 70, 114, - 20, 54, 87, 29, 77, 124, 10, 26, 42, 34, - 88, 141, 10, 24, 38, 11, 26, 41, 1, 2, - 3, 55, 80, 105, 45, 63, 81, 49, 53, 57, - 5, 15, 24, 9, 26, 42, 30, 85, 138, 33, - 92, 149, 26, 73, 117, 10, 28, 45, 32, 89, - 142, 30, 84, 134, 26, 72, 115, 15, 42, 67, - 23, 62, 99, 12, 32, 51, 7, 21, 33, 9, - 26, 41, 8, 23, 35, 7, 25, 37, 51, 58, - 63, 2, 4, 5, 25, 26, 26, 49, 50, 50, - 255, 102, 0, 255, 255, 255, 204, 204, 204, 199, - 199, 199, 191, 191, 191, 171, 171, 171, 146, 146, - 146, 115, 115, 115, 85, 85, 85, 60, 60, 60, - 55, 55, 55, 38, 38, 38, 7, 7, 7, 3, - 3, 3, 0, 0, 0, 44, 0, 0, 0, 0, - 113, 0, 72, 0, 0, 6, 255, 192, 153, 112, - 72, 44, 26, 143, 200, 164, 114, 121, 252, 49, - 159, 208, 168, 148, 248, 171, 58, 167, 210, 171, - 208, 170, 197, 122, 191, 70, 109, 23, 140, 236, - 138, 201, 232, 239, 121, 102, 221, 186, 217, 219, - 171, 83, 46, 110, 15, 207, 235, 180, 190, 124, - 135, 187, 229, 127, 127, 128, 112, 121, 108, 118, - 132, 123, 137, 77, 118, 120, 136, 115, 109, 117, - 85, 126, 147, 147, 128, 99, 138, 137, 99, 107, - 146, 146, 148, 133, 159, 125, 136, 152, 163, 151, - 135, 121, 144, 84, 157, 92, 169, 157, 111, 163, - 175, 176, 83, 151, 177, 180, 181, 161, 182, 184, - 185, 186, 187, 188, 189, 67, 54, 56, 58, 56, - 53, 190, 197, 88, 55, 57, 60, 63, 2, 43, - 2, 56, 198, 208, 74, 192, 58, 0, 63, 5, - 12, 11, 35, 35, 12, 47, 209, 222, 67, 53, - 201, 203, 34, 19, 20, 218, 231, 37, 63, 54, - 223, 222, 60, 2, 216, 231, 241, 231, 206, 76, - 193, 55, 236, 176, 63, 39, 242, 252, 35, 40, - 58, 75, 114, 8, 40, 240, 227, 25, 62, 76, - 60, 24, 244, 147, 55, 161, 202, 11, 24, 57, - 134, 17, 201, 241, 99, 130, 191, 130, 7, 21, - 225, 48, 176, 48, 30, 137, 5, 11, 38, 48, - 88, 81, 5, 198, 51, 138, 22, 181, 53, 52, - 152, 49, 141, 141, 31, 230, 58, 46, 60, 129, - 194, 74, 202, 115, 43, 91, 234, 1, 112, 83, - 102, 63, 255, 18, 38, 122, 226, 252, 145, 67, - 39, 153, 26, 47, 68, 248, 92, 186, 176, 97, - 81, 163, 88, 108, 188, 48, 80, 130, 169, 85, - 134, 68, 161, 74, 177, 1, 160, 0, 137, 171, - 96, 135, 62, 213, 186, 132, 171, 215, 176, 104, - 71, 52, 188, 71, 54, 9, 210, 179, 105, 195, - 166, 99, 219, 214, 198, 58, 34, 48, 12, 124, - 213, 38, 163, 175, 223, 191, 50, 22, 132, 216, - 139, 182, 132, 0, 30, 196, 250, 218, 37, 70, - 198, 198, 141, 199, 144, 31, 223, 253, 114, 163, - 10, 0, 97, 192, 126, 100, 59, 7, 24, 176, - 10, 20, 229, 210, 146, 48, 128, 88, 72, 223, - 28, 57, 38, 111, 197, 17, 163, 181, 235, 215, - 58, 116, 68, 100, 60, 5, 134, 136, 18, 19, - 80, 24, 168, 162, 48, 94, 95, 21, 6, 82, - 168, 80, 209, 215, 128, 1, 20, 39, 8, 95, - 37, 81, 160, 180, 105, 25, 177, 233, 62, 1, - 246, 186, 186, 245, 24, 209, 177, 84, 140, 71, - 97, 130, 114, 109, 33, 76, 48, 152, 176, 192, - 111, 135, 20, 222, 211, 54, 167, 61, 163, 111, - 246, 39, 55, 174, 203, 175, 254, 30, 74, 229, - 152, 62, 73, 132, 24, 60, 162, 47, 131, 14, - 12, 132, 224, 155, 95, 130, 145, 208, 89, 129, - 40, 116, 211, 25, 12, 58, 72, 135, 68, 124, - 214, 197, 38, 161, 14, 243, 73, 200, 222, 18, - 27, 161, 213, 215, 4, 159, 37, 199, 255, 25, - 96, 12, 116, 230, 223, 9, 11, 252, 32, 226, - 11, 13, 74, 35, 223, 132, 19, 174, 24, 27, - 75, 76, 192, 128, 66, 88, 126, 161, 160, 66, - 122, 124, 201, 112, 2, 3, 195, 125, 54, 65, - 95, 29, 4, 87, 227, 9, 126, 233, 192, 3, - 12, 125, 161, 232, 160, 93, 207, 184, 200, 98, - 139, 17, 74, 24, 197, 118, 96, 249, 7, 160, - 128, 31, 242, 72, 30, 72, 33, 244, 149, 2, - 122, 229, 201, 0, 224, 105, 60, 52, 216, 23, - 131, 14, 226, 96, 194, 1, 78, 74, 152, 195, - 13, 196, 208, 192, 90, 148, 177, 217, 7, 83, - 149, 50, 112, 136, 220, 94, 34, 22, 216, 159, - 12, 195, 101, 227, 37, 113, 50, 192, 0, 3, - 156, 238, 165, 72, 196, 11, 21, 178, 184, 228, - 117, 19, 66, 145, 225, 85, 53, 222, 72, 152, - 136, 42, 152, 32, 224, 111, 42, 8, 10, 40, - 161, 101, 222, 96, 67, 95, 61, 40, 58, 3, - 13, 55, 24, 112, 221, 101, 19, 226, 64, 131, - 17, 54, 64, 42, 229, 19, 50, 226, 249, 95, - 128, 127, 238, 23, 166, 113, 194, 105, 250, 103, - 160, 191, 18, 90, 232, 13, 59, 0, 249, 130, - 168, 56, 160, 198, 195, 10, 214, 161, 144, 1, - 131, 245, 21, 1, 33, 125, 177, 141, 181, 4, - 149, 76, 137, 232, 23, 3, 38, 132, 9, 216, - 9, 93, 126, 234, 105, 160, 34, 94, 208, 129, - 14, 7, 152, 112, 255, 2, 4, 40, 84, 80, - 157, 8, 30, 176, 154, 195, 133, 68, 200, 250, - 34, 124, 119, 102, 171, 109, 113, 157, 142, 16, - 238, 111, 160, 113, 58, 110, 167, 38, 252, 213, - 192, 193, 12, 72, 32, 193, 3, 15, 128, 192, - 128, 7, 175, 121, 32, 66, 7, 101, 230, 240, - 42, 18, 53, 216, 171, 131, 106, 73, 224, 32, - 0, 88, 221, 217, 216, 227, 200, 190, 234, 39, - 210, 112, 12, 36, 23, 158, 175, 254, 154, 160, - 105, 9, 5, 236, 88, 129, 7, 41, 83, 240, - 65, 195, 32, 56, 236, 128, 107, 14, 36, 208, - 64, 10, 24, 41, 161, 177, 181, 74, 84, 182, - 194, 4, 85, 45, 181, 239, 134, 11, 236, 165, - 31, 151, 95, 233, 199, 223, 8, 82, 27, 40, - 3, 9, 39, 144, 56, 24, 4, 92, 119, 61, - 129, 3, 96, 135, 221, 128, 8, 12, 0, 64, - 239, 47, 26, 59, 88, 52, 53, 227, 132, 182, - 208, 210, 128, 178, 76, 163, 12, 46, 135, 208, - 245, 221, 92, 3, 21, 54, 216, 9, 152, 208, - 48, 64, 72, 12, 237, 197, 52, 0, 152, 208, - 209, 111, 193, 141, 204, 239, 102, 104, 45, 96, - 128, 9, 20, 224, 45, 249, 215, 97, 51, 240, - 1, 8, 10, 152, 80, 20, 14, 56, 208, 213, - 38, 199, 181, 245, 214, 207, 111, 96, 130, 4, - 146, 72, 114, 135, 69, 194, 10, 38, 64, 0, - 130, 228, 120, 71, 240, 181, 8, 145, 67, 240, - 255, 128, 2, 44, 164, 0, 26, 2, 66, 180, - 9, 163, 23, 56, 20, 112, 184, 184, 242, 232, - 119, 224, 212, 127, 18, 56, 152, 95, 14, 252, - 8, 88, 129, 120, 255, 37, 216, 205, 17, 68, - 160, 192, 3, 24, 212, 64, 131, 198, 58, 92, - 12, 70, 101, 223, 125, 8, 172, 60, 218, 166, - 252, 149, 136, 41, 251, 21, 64, 249, 201, 117, - 221, 89, 202, 151, 131, 112, 251, 9, 211, 194, - 54, 161, 218, 88, 212, 128, 237, 128, 207, 35, - 15, 164, 144, 125, 65, 78, 141, 206, 3, 164, - 0, 245, 69, 0, 34, 248, 95, 10, 134, 68, - 2, 8, 244, 101, 71, 97, 3, 77, 237, 70, - 240, 0, 18, 248, 110, 15, 58, 80, 10, 63, - 48, 37, 55, 47, 129, 169, 128, 86, 10, 152, - 12, 132, 19, 166, 2, 36, 112, 132, 31, 20, - 83, 128, 28, 40, 3, 6, 52, 207, 116, 91, - 227, 218, 3, 218, 68, 52, 50, 224, 32, 95, - 228, 147, 1, 175, 134, 211, 65, 226, 13, 138, - 116, 222, 249, 77, 1, 10, 38, 3, 7, 52, - 160, 47, 96, 91, 0, 11, 83, 224, 128, 62, - 197, 176, 107, 32, 224, 222, 217, 192, 240, 130, - 25, 109, 16, 133, 91, 242, 159, 15, 63, 37, - 176, 63, 25, 64, 0, 68, 108, 128, 7, 144, - 232, 0, 37, 146, 81, 68, 14, 208, 20, 20, - 163, 72, 167, 216, 128, 14, 85, 201, 66, 205, - 155, 110, 224, 61, 37, 220, 255, 16, 63, 226, - 235, 215, 135, 194, 5, 44, 78, 249, 5, 61, - 86, 251, 65, 5, 36, 208, 23, 15, 52, 177, - 136, 101, 100, 97, 18, 195, 197, 171, 52, 218, - 205, 117, 51, 108, 163, 169, 132, 16, 171, 54, - 118, 174, 142, 69, 48, 75, 248, 224, 22, 162, - 45, 146, 171, 51, 8, 160, 221, 25, 17, 105, - 70, 82, 90, 237, 91, 131, 137, 164, 37, 137, - 80, 73, 238, 221, 11, 86, 93, 9, 95, 242, - 180, 101, 128, 46, 10, 236, 148, 126, 177, 6, - 5, 70, 153, 68, 69, 38, 18, 2, 255, 42, - 34, 104, 34, 160, 74, 106, 9, 99, 8, 245, - 51, 230, 147, 126, 55, 131, 26, 196, 178, 35, - 225, 25, 153, 52, 131, 82, 55, 240, 84, 19, - 107, 60, 234, 11, 0, 12, 16, 1, 16, 148, - 160, 110, 43, 123, 100, 56, 243, 22, 2, 145, - 128, 45, 101, 16, 152, 15, 118, 44, 54, 131, - 100, 218, 239, 73, 111, 58, 66, 13, 120, 0, - 151, 133, 60, 205, 116, 248, 20, 12, 5, 246, - 227, 52, 126, 106, 195, 120, 50, 56, 146, 1, - 46, 247, 1, 126, 86, 141, 156, 79, 132, 192, - 61, 67, 240, 1, 117, 182, 6, 85, 141, 90, - 38, 232, 134, 176, 17, 89, 198, 165, 35, 134, - 17, 70, 14, 92, 32, 63, 134, 141, 224, 117, - 176, 11, 105, 215, 44, 232, 208, 136, 178, 72, - 34, 118, 212, 203, 69, 173, 226, 148, 26, 216, - 133, 7, 255, 39, 80, 192, 4, 102, 42, 191, - 17, 136, 52, 164, 37, 109, 211, 253, 48, 137, - 49, 122, 90, 116, 165, 255, 100, 64, 86, 40, - 74, 128, 22, 0, 224, 6, 48, 152, 128, 2, - 64, 122, 211, 187, 229, 84, 153, 142, 226, 169, - 18, 230, 41, 128, 164, 1, 149, 31, 37, 98, - 166, 93, 134, 192, 129, 133, 49, 181, 169, 36, - 125, 234, 147, 36, 68, 71, 47, 80, 213, 170, - 252, 32, 79, 92, 232, 177, 4, 14, 80, 32, - 103, 77, 229, 218, 83, 177, 51, 214, 6, 73, - 53, 10, 103, 237, 71, 67, 126, 96, 0, 164, - 133, 69, 4, 128, 147, 134, 15, 72, 240, 85, - 174, 229, 236, 176, 175, 203, 105, 93, 223, 116, - 215, 41, 228, 53, 30, 43, 177, 65, 14, 94, - 80, 133, 21, 160, 64, 93, 75, 153, 0, 0, - 158, 224, 130, 19, 60, 224, 110, 57, 99, 216, - 237, 74, 0, 130, 8, 120, 192, 3, 99, 243, - 192, 97, 234, 58, 161, 120, 42, 226, 177, 106, - 9, 26, 37, 57, 167, 131, 23, 8, 207, 39, - 20, 248, 1, 254, 136, 80, 3, 20, 44, 21, - 180, 32, 32, 79, 4, 80, 16, 128, 11, 64, - 64, 4, 34, 80, 65, 7, 94, 80, 38, 214, - 202, 102, 183, 105, 168, 1, 12, 170, 26, 219, - 26, 34, 19, 135, 29, 41, 128, 117, 137, 128, - 3, 9, 252, 214, 176, 15, 24, 64, 15, 56, - 247, 12, 24, 168, 75, 4, 6, 0, 135, 192, - 14, 156, 139, 82, 90, 8, 164, 38, 219, 29, - 2, 79, 150, 194, 0, 24, 44, 97, 7, 22, - 184, 29, 195, 58, 106, 223, 58, 230, 160, 156, - 68, 89, 108, 89, 115, 145, 3, 147, 48, 33, - 131, 50, 89, 0, 3, 4, 16, 95, 33, 220, - 224, 5, 26, 64, 193, 91, 111, 167, 57, 35, - 132, 35, 53, 148, 116, 12, 100, 166, 248, 13, - 143, 241, 163, 59, 34, 16, 192, 15, 120, 208, - 222, 36, 208, 192, 49, 63, 216, 192, 9, 36, - 192, 128, 137, 114, 152, 44, 47, 217, 140, 130, - 9, 114, 25, 28, 76, 148, 9, 162, 2, 128, - 141, 219, 50, 5, 122, 134, 120, 196, 174, 141, - 46, 143, 167, 96, 131, 23, 221, 120, 200, 72, - 214, 74, 16, 0, 0, 59 }; - -static const unsigned char php_logo[] = { - 71, 73, 70, 56, 57, 97, 120, 0, 67, 0, - 230, 106, 0, 127, 130, 184, 57, 55, 71, 40, - 37, 42, 204, 205, 226, 161, 164, 203, 211, 213, - 231, 178, 180, 212, 67, 66, 88, 131, 134, 185, - 130, 131, 179, 82, 82, 114, 144, 146, 194, 194, - 196, 222, 170, 172, 208, 76, 75, 99, 91, 92, - 131, 221, 222, 236, 59, 56, 60, 110, 113, 165, - 106, 109, 157, 97, 99, 141, 117, 121, 177, 123, - 126, 181, 229, 230, 240, 153, 156, 198, 140, 141, - 193, 185, 186, 217, 107, 107, 146, 78, 78, 107, - 113, 116, 169, 122, 122, 163, 136, 139, 189, 114, - 116, 163, 116, 115, 152, 142, 144, 193, 90, 91, - 126, 226, 227, 239, 123, 125, 173, 164, 165, 208, - 109, 112, 162, 114, 118, 172, 149, 150, 200, 187, - 189, 217, 116, 120, 174, 133, 136, 187, 146, 149, - 195, 216, 217, 234, 146, 146, 196, 100, 102, 146, - 107, 110, 159, 165, 168, 206, 148, 150, 197, 46, - 43, 47, 83, 81, 104, 179, 180, 215, 108, 106, - 140, 92, 91, 118, 138, 141, 191, 102, 104, 150, - 104, 106, 154, 156, 159, 200, 49, 46, 57, 174, - 176, 211, 156, 156, 205, 85, 86, 120, 158, 161, - 202, 150, 153, 197, 129, 130, 175, 103, 105, 151, - 63, 61, 80, 188, 190, 218, 94, 96, 137, 152, - 153, 200, 140, 142, 191, 137, 138, 186, 87, 88, - 124, 182, 183, 215, 213, 215, 232, 34, 30, 32, - 108, 111, 158, 206, 208, 228, 191, 192, 220, 119, - 123, 180, 118, 120, 167, 95, 94, 125, 153, 153, - 204, 110, 111, 152, 115, 119, 174, 34, 30, 31, - 255, 255, 255, 144, 142, 143, 89, 86, 87, 199, - 198, 199, 238, 238, 245, 213, 212, 213, 246, 246, - 250, 130, 128, 129, 172, 170, 171, 116, 114, 115, - 241, 240, 241, 158, 156, 157, 227, 226, 227, 75, - 72, 73, 185, 184, 185, 103, 100, 101, 137, 137, - 182, 0, 255, 0, 71, 70, 95, 223, 224, 237, - 155, 156, 204, 105, 107, 156, 111, 115, 167, 140, - 140, 186, 184, 185, 217, 184, 186, 215, 154, 155, - 204, 167, 170, 207, 219, 220, 235, 154, 156, 201, - 102, 100, 132, 104, 103, 137, 167, 168, 210, 110, - 112, 160, 139, 139, 185, 198, 199, 224, 199, 201, - 225, 105, 108, 156, 151, 152, 203, 33, 249, 4, - 1, 0, 0, 106, 0, 44, 0, 0, 0, 0, - 120, 0, 67, 0, 0, 7, 255, 128, 106, 130, - 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, - 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 151, 150, 109, 63, 109, 115, 152, 158, 159, 160, - 63, 121, 121, 54, 62, 26, 113, 76, 26, 26, - 76, 6, 62, 62, 13, 50, 4, 65, 60, 24, - 66, 45, 11, 73, 34, 57, 31, 25, 57, 34, - 47, 41, 160, 194, 161, 13, 26, 12, 125, 77, - 5, 80, 80, 3, 125, 124, 12, 81, 81, 42, - 114, 172, 175, 116, 177, 179, 66, 51, 45, 186, - 31, 8, 0, 22, 22, 21, 87, 40, 37, 22, - 9, 25, 193, 195, 235, 140, 38, 113, 124, 46, - 108, 108, 16, 16, 117, 46, 201, 3, 212, 50, - 179, 34, 31, 254, 44, 0, 17, 8, 4, 64, - 176, 224, 55, 130, 225, 164, 172, 64, 241, 70, - 194, 9, 63, 59, 158, 76, 25, 146, 132, 157, - 69, 53, 65, 108, 12, 96, 67, 226, 130, 71, - 18, 36, 242, 53, 16, 178, 64, 138, 201, 147, - 40, 83, 170, 92, 121, 114, 92, 7, 9, 19, - 118, 232, 128, 65, 225, 8, 5, 43, 67, 68, - 92, 196, 20, 132, 9, 20, 142, 30, 47, 184, - 48, 66, 167, 5, 203, 163, 72, 147, 162, 188, - 242, 38, 6, 140, 35, 71, 30, 140, 88, 114, - 196, 131, 206, 157, 144, 126, 104, 116, 1, 129, - 35, 4, 35, 4, 88, 40, 29, 75, 54, 233, - 149, 19, 58, 30, 44, 1, 162, 64, 193, 136, - 41, 51, 255, 176, 46, 50, 161, 161, 64, 19, - 23, 117, 10, 24, 72, 82, 182, 175, 95, 164, - 29, 96, 44, 81, 192, 129, 131, 3, 60, 9, - 228, 26, 202, 19, 101, 0, 148, 2, 3, 124, - 228, 248, 187, 114, 1, 134, 203, 152, 49, 124, - 160, 156, 244, 13, 5, 5, 14, 214, 172, 81, - 224, 65, 177, 154, 60, 70, 248, 244, 25, 192, - 100, 6, 231, 149, 31, 178, 112, 153, 77, 155, - 75, 151, 215, 74, 221, 44, 89, 115, 224, 128, - 131, 16, 59, 221, 69, 97, 192, 160, 1, 2, - 220, 43, 49, 112, 193, 194, 188, 185, 153, 219, - 200, 147, 118, 216, 93, 164, 200, 154, 210, 195, - 126, 248, 144, 99, 68, 5, 15, 11, 209, 87, - 170, 32, 211, 188, 185, 152, 2, 225, 149, 94, - 121, 112, 32, 64, 0, 14, 112, 64, 153, 48, - 192, 68, 14, 1, 0, 233, 87, 22, 16, 83, - 158, 57, 25, 21, 249, 41, 245, 134, 2, 238, - 245, 112, 7, 38, 115, 208, 225, 131, 1, 50, - 28, 23, 160, 74, 93, 152, 209, 31, 22, 92, - 16, 240, 160, 82, 49, 172, 209, 67, 15, 7, - 236, 81, 201, 15, 50, 52, 208, 64, 73, 23, - 166, 4, 64, 22, 19, 98, 145, 197, 102, 37, - 38, 245, 64, 0, 27, 2, 39, 73, 27, 4, - 236, 227, 96, 139, 39, 41, 55, 161, 25, 95, - 224, 168, 148, 31, 69, 208, 64, 3, 21, 145, - 216, 17, 4, 1, 51, 128, 135, 212, 255, 7, - 153, 53, 217, 36, 139, 71, 169, 16, 198, 132, - 98, 92, 208, 36, 137, 44, 49, 233, 228, 150, - 248, 141, 133, 130, 3, 52, 8, 80, 195, 35, - 72, 96, 16, 4, 148, 71, 125, 240, 69, 22, - 108, 182, 233, 230, 155, 89, 116, 81, 64, 3, - 93, 162, 84, 0, 24, 19, 146, 1, 103, 155, - 23, 12, 96, 225, 73, 11, 236, 41, 40, 155, - 93, 12, 208, 128, 82, 64, 8, 32, 128, 3, - 141, 204, 32, 4, 6, 98, 41, 69, 192, 114, - 41, 86, 106, 6, 24, 92, 124, 1, 32, 74, - 93, 108, 81, 105, 138, 52, 108, 161, 69, 25, - 93, 144, 104, 192, 148, 159, 78, 184, 5, 24, - 94, 116, 113, 40, 82, 35, 8, 224, 4, 163, - 138, 108, 35, 196, 141, 73, 141, 151, 234, 167, - 91, 120, 1, 65, 151, 39, 238, 250, 41, 24, - 99, 96, 32, 197, 0, 120, 10, 171, 106, 25, - 3, 36, 53, 130, 19, 78, 224, 144, 72, 10, - 34, 180, 128, 102, 82, 16, 240, 167, 108, 138, - 97, 64, 96, 18, 6, 94, 108, 155, 34, 26, - 183, 93, 224, 169, 184, 229, 209, 224, 69, 179, - 72, 173, 1, 45, 118, 133, 252, 225, 203, 100, - 101, 125, 33, 33, 186, 253, 121, 1, 160, 148, - 248, 230, 219, 0, 138, 253, 54, 71, 67, 25, - 127, 30, 21, 128, 19, 2, 44, 96, 72, 63, - 244, 146, 21, 91, 192, 229, 109, 209, 227, 157, - 16, 51, 167, 197, 255, 5, 225, 86, 140, 133, - 24, 208, 29, 213, 129, 172, 99, 18, 146, 2, - 2, 31, 212, 57, 214, 164, 59, 194, 57, 198, - 25, 218, 78, 232, 5, 1, 157, 78, 200, 197, - 155, 99, 112, 129, 70, 138, 90, 100, 129, 106, - 196, 112, 150, 113, 198, 185, 19, 150, 129, 37, - 75, 10, 64, 155, 6, 33, 222, 224, 58, 150, - 174, 253, 137, 225, 45, 74, 11, 52, 208, 5, - 121, 19, 106, 193, 0, 192, 253, 173, 136, 18, - 6, 13, 124, 17, 65, 213, 89, 104, 81, 53, - 187, 128, 26, 240, 69, 178, 253, 133, 97, 128, - 82, 52, 204, 58, 200, 31, 0, 32, 160, 100, - 89, 217, 230, 185, 169, 137, 89, 124, 221, 116, - 22, 25, 151, 199, 227, 74, 16, 0, 221, 92, - 206, 130, 51, 119, 198, 218, 42, 125, 48, 6, - 206, 119, 31, 181, 4, 180, 10, 171, 33, 130, - 5, 38, 147, 101, 175, 204, 5, 167, 20, 184, - 170, 58, 83, 249, 116, 74, 49, 247, 119, 70, - 22, 52, 4, 109, 236, 74, 161, 151, 167, 69, - 227, 44, 117, 0, 237, 13, 130, 176, 144, 80, - 95, 15, 79, 56, 198, 181, 39, 109, 222, 31, - 26, 89, 160, 221, 220, 127, 42, 5, 27, 116, - 25, 19, 210, 144, 197, 81, 169, 15, 206, 58, - 75, 69, 184, 173, 70, 56, 115, 147, 133, 114, - 127, 17, 244, 200, 210, 229, 253, 17, 142, 185, - 74, 224, 22, 159, 197, 25, 170, 94, 112, 20, - 255, 214, 229, 1, 175, 20, 7, 78, 244, 32, - 72, 5, 148, 49, 93, 30, 26, 159, 167, 84, - 123, 218, 228, 55, 119, 187, 74, 252, 246, 183, - 69, 216, 99, 179, 132, 1, 241, 219, 83, 10, - 5, 160, 37, 136, 21, 80, 166, 110, 217, 91, - 158, 73, 12, 0, 190, 160, 245, 173, 57, 213, - 211, 143, 239, 152, 3, 134, 44, 20, 14, 11, - 135, 99, 9, 3, 168, 214, 159, 251, 9, 144, - 128, 41, 184, 2, 251, 252, 130, 189, 242, 84, - 136, 37, 201, 99, 78, 4, 58, 183, 187, 248, - 157, 36, 133, 88, 8, 3, 233, 76, 183, 18, - 0, 120, 109, 66, 228, 34, 203, 0, 157, 32, - 8, 20, 24, 176, 47, 194, 235, 32, 238, 142, - 69, 169, 236, 245, 174, 106, 203, 11, 98, 121, - 188, 0, 192, 116, 29, 79, 63, 28, 44, 79, - 24, 20, 184, 146, 29, 10, 162, 3, 40, 24, - 33, 89, 116, 68, 189, 39, 162, 228, 3, 5, - 240, 66, 233, 250, 67, 131, 49, 124, 225, 130, - 39, 76, 73, 247, 38, 244, 189, 240, 113, 15, - 2, 98, 156, 80, 245, 42, 119, 20, 43, 170, - 97, 33, 90, 92, 90, 20, 153, 67, 46, 21, - 248, 81, 5, 16, 232, 194, 24, 180, 48, 70, - 209, 13, 160, 126, 204, 241, 32, 74, 242, 199, - 51, 177, 101, 175, 11, 127, 4, 100, 23, 202, - 224, 72, 153, 81, 113, 37, 232, 83, 223, 243, - 58, 112, 133, 190, 236, 71, 255, 85, 90, 8, - 101, 40, 197, 112, 175, 20, 137, 225, 11, 4, - 120, 160, 10, 189, 104, 167, 9, 98, 161, 130, - 23, 20, 149, 40, 181, 64, 202, 97, 137, 175, - 44, 205, 163, 213, 7, 222, 208, 129, 190, 68, - 72, 99, 104, 248, 194, 2, 78, 133, 67, 23, - 154, 196, 92, 19, 146, 97, 33, 3, 118, 202, - 161, 73, 231, 117, 130, 72, 129, 4, 222, 240, - 67, 165, 40, 177, 95, 205, 60, 150, 43, 173, - 182, 18, 68, 98, 129, 137, 26, 3, 131, 48, - 251, 242, 56, 39, 68, 238, 121, 18, 232, 229, - 88, 214, 216, 47, 26, 156, 97, 156, 82, 64, - 102, 127, 184, 240, 170, 173, 169, 146, 57, 109, - 12, 88, 4, 206, 112, 1, 103, 178, 205, 121, - 130, 120, 193, 9, 36, 208, 73, 165, 48, 82, - 92, 102, 32, 195, 24, 6, 80, 167, 25, 118, - 208, 159, 196, 212, 31, 255, 240, 101, 6, 25, - 50, 128, 142, 73, 41, 154, 19, 142, 70, 136, - 33, 156, 224, 13, 99, 161, 152, 254, 102, 57, - 75, 50, 112, 97, 12, 133, 66, 83, 160, 72, - 26, 74, 86, 158, 68, 5, 92, 96, 233, 232, - 46, 40, 6, 150, 134, 210, 164, 40, 101, 192, - 16, 165, 3, 50, 67, 164, 224, 4, 39, 80, - 39, 82, 96, 200, 133, 11, 208, 131, 30, 5, - 248, 35, 1, 252, 105, 18, 64, 30, 245, 168, - 153, 3, 212, 0, 158, 74, 143, 67, 46, 147, - 57, 94, 255, 48, 234, 81, 147, 234, 71, 2, - 236, 116, 44, 7, 75, 216, 33, 146, 16, 131, - 19, 160, 0, 41, 215, 76, 36, 83, 125, 36, - 133, 5, 52, 177, 60, 89, 192, 40, 114, 220, - 229, 4, 120, 25, 34, 1, 101, 45, 104, 114, - 238, 185, 66, 182, 178, 164, 1, 13, 140, 88, - 199, 242, 83, 78, 105, 41, 162, 4, 121, 101, - 201, 65, 249, 104, 76, 191, 74, 129, 1, 149, - 108, 14, 24, 208, 19, 160, 114, 210, 106, 17, - 136, 53, 171, 4, 171, 198, 0, 199, 170, 68, - 119, 82, 188, 36, 101, 52, 122, 89, 70, 148, - 96, 2, 49, 232, 64, 30, 165, 64, 212, 122, - 122, 214, 36, 121, 115, 217, 233, 162, 211, 129, - 3, 64, 171, 180, 141, 72, 0, 106, 37, 160, - 197, 180, 98, 97, 12, 107, 245, 209, 2, 22, - 199, 70, 185, 250, 133, 8, 61, 128, 150, 97, - 35, 161, 132, 39, 76, 64, 179, 82, 248, 223, - 22, 166, 75, 93, 222, 189, 214, 158, 212, 165, - 46, 24, 6, 251, 26, 5, 200, 74, 0, 50, - 154, 196, 11, 64, 224, 135, 24, 240, 22, 0, - 5, 160, 42, 61, 16, 119, 93, 41, 160, 87, - 189, 16, 112, 45, 101, 136, 112, 48, 39, 68, - 128, 163, 150, 72, 128, 27, 80, 251, 134, 213, - 182, 215, 175, 39, 176, 173, 114, 65, 241, 130, - 41, 248, 1, 181, 170, 253, 175, 95, 81, 192, - 1, 89, 57, 161, 8, 248, 5, 133, 255, 18, - 244, 224, 134, 3, 247, 87, 193, 37, 58, 193, - 26, 28, 220, 131, 240, 178, 131, 5, 20, 62, - 176, 4, 206, 138, 225, 240, 28, 225, 0, 138, - 18, 64, 15, 96, 167, 24, 22, 128, 96, 7, - 110, 112, 67, 12, 168, 89, 98, 202, 248, 129, - 3, 1, 8, 147, 0, 2, 192, 98, 211, 8, - 34, 9, 37, 32, 194, 14, 96, 60, 1, 26, - 215, 56, 41, 19, 32, 80, 15, 132, 36, 38, - 187, 250, 120, 16, 41, 72, 128, 30, 116, 64, - 4, 33, 187, 33, 168, 254, 197, 240, 27, 142, - 128, 227, 13, 45, 185, 8, 120, 120, 193, 147, - 23, 241, 2, 41, 235, 224, 204, 103, 222, 193, - 71, 73, 124, 221, 29, 28, 65, 1, 237, 129, - 209, 134, 14, 112, 3, 15, 141, 249, 17, 47, - 64, 192, 20, 136, 0, 131, 62, 251, 153, 8, - 126, 248, 168, 80, 243, 51, 1, 34, 60, 0, - 52, 213, 113, 143, 162, 113, 16, 2, 59, 223, - 153, 18, 34, 24, 194, 158, 41, 64, 233, 74, - 83, 250, 8, 125, 174, 112, 160, 223, 192, 105, - 78, 75, 224, 211, 159, 6, 42, 80, 137, 112, - 105, 182, 136, 166, 55, 7, 168, 78, 17, 2, - 112, 0, 28, 108, 32, 49, 143, 22, 70, 10, - 62, 80, 2, 16, 88, 1, 42, 80, 121, 128, - 174, 119, 61, 149, 37, 172, 5, 8, 108, 105, - 11, 97, 10, 99, 152, 208, 156, 186, 55, 69, - 80, 0, 21, 110, 56, 48, 4, 49, 199, 90, - 49, 41, 80, 2, 2, 60, 224, 129, 13, 108, - 32, 45, 190, 6, 118, 176, 219, 66, 108, 195, - 112, 128, 10, 35, 24, 129, 21, 172, 80, 130, - 102, 63, 251, 220, 139, 16, 65, 26, 16, 112, - 21, 116, 187, 251, 221, 240, 142, 119, 188, 3, - 1, 0, 59, 0 }; - -static const unsigned char php_egg_logo[] = { - 71, 73, 70, 56, 57, 97, 120, 0, 67, 0, - 231, 255, 0, 18, 25, 33, 32, 30, 34, 28, - 33, 44, 15, 35, 71, 6, 37, 85, 37, 40, - 47, 34, 41, 53, 41, 40, 43, 9, 47, 109, - 30, 45, 68, 21, 48, 84, 51, 46, 55, 43, - 49, 59, 31, 59, 98, 15, 61, 128, 58, 55, - 69, 50, 57, 74, 0, 66, 144, 56, 58, 60, - 54, 59, 71, 32, 66, 113, 60, 65, 67, 63, - 65, 84, 63, 68, 79, 28, 79, 145, 15, 82, - 162, 75, 72, 98, 68, 78, 86, 74, 77, 88, - 50, 82, 122, 41, 85, 134, 76, 78, 108, 70, - 83, 101, 5, 94, 190, 0, 95, 197, 86, 80, - 101, 28, 92, 159, 80, 84, 96, 83, 83, 115, - 81, 87, 89, 22, 97, 183, 86, 88, 85, 0, - 102, 210, 8, 101, 204, 24, 100, 177, 85, 90, - 127, 35, 101, 169, 42, 100, 159, 88, 92, 103, - 0, 107, 216, 69, 95, 132, 0, 108, 210, 84, - 93, 112, 94, 90, 117, 18, 105, 201, 96, 92, - 105, 89, 96, 98, 94, 93, 135, 94, 94, 126, - 30, 106, 210, 7, 112, 222, 33, 108, 198, 16, - 114, 217, 27, 113, 198, 24, 113, 209, 59, 108, - 159, 96, 100, 138, 0, 120, 229, 44, 112, 180, - 49, 112, 171, 71, 108, 148, 99, 104, 115, 90, - 106, 125, 27, 115, 232, 100, 102, 147, 42, 115, - 192, 86, 110, 137, 9, 123, 239, 106, 108, 105, - 105, 105, 138, 33, 118, 228, 12, 125, 227, 48, - 117, 208, 16, 126, 222, 37, 120, 224, 20, 125, - 235, 35, 123, 213, 50, 121, 190, 43, 123, 206, - 40, 123, 220, 105, 110, 160, 59, 122, 182, 78, - 119, 158, 44, 122, 233, 3, 134, 250, 112, 112, - 151, 73, 123, 175, 113, 118, 114, 51, 128, 205, - 34, 129, 246, 11, 136, 245, 34, 130, 240, 113, - 117, 149, 111, 116, 166, 111, 119, 141, 48, 130, - 221, 38, 132, 235, 53, 130, 215, 97, 124, 146, - 116, 122, 124, 117, 121, 131, 54, 130, 229, 41, - 135, 232, 68, 130, 223, 46, 135, 246, 65, 134, - 202, 42, 137, 241, 75, 131, 205, 124, 121, 161, - 101, 125, 191, 86, 128, 210, 121, 122, 169, 105, - 128, 157, 121, 122, 180, 114, 124, 181, 94, 128, - 201, 81, 134, 185, 46, 138, 252, 76, 135, 195, - 34, 142, 252, 62, 137, 229, 63, 138, 217, 33, - 144, 247, 58, 139, 223, 56, 141, 246, 54, 143, - 234, 57, 143, 241, 102, 135, 193, 129, 130, 176, - 122, 136, 144, 46, 148, 252, 45, 149, 246, 118, - 133, 191, 65, 146, 231, 73, 146, 216, 129, 133, - 185, 135, 135, 156, 69, 148, 226, 44, 153, 255, - 94, 143, 216, 132, 136, 175, 88, 146, 207, 137, - 139, 136, 93, 146, 197, 95, 147, 188, 137, 139, - 150, 104, 146, 178, 122, 143, 172, 135, 139, 191, - 57, 156, 254, 67, 154, 245, 70, 154, 239, 134, - 141, 180, 117, 145, 201, 120, 146, 190, 79, 154, - 233, 140, 141, 188, 129, 144, 194, 142, 142, 176, - 137, 147, 156, 88, 155, 222, 82, 157, 230, 93, - 157, 218, 66, 162, 253, 100, 157, 210, 77, 161, - 247, 55, 168, 255, 81, 162, 241, 148, 148, 195, - 145, 149, 202, 127, 156, 204, 77, 166, 255, 142, - 155, 177, 141, 153, 200, 123, 160, 193, 73, 171, - 255, 93, 167, 240, 96, 167, 234, 152, 158, 160, - 101, 167, 228, 119, 164, 206, 155, 158, 171, 110, - 167, 219, 156, 155, 203, 89, 172, 252, 128, 164, - 219, 151, 163, 174, 81, 178, 255, 158, 162, 202, - 102, 175, 249, 93, 178, 251, 108, 175, 237, 103, - 177, 244, 166, 168, 165, 97, 182, 255, 87, 185, - 255, 149, 174, 216, 125, 181, 235, 110, 185, 252, - 117, 183, 254, 171, 172, 209, 166, 175, 197, 103, - 190, 255, 174, 176, 189, 140, 183, 221, 128, 184, - 248, 120, 187, 249, 179, 180, 184, 115, 193, 253, - 170, 183, 193, 174, 181, 215, 107, 197, 255, 135, - 191, 246, 151, 192, 219, 187, 183, 213, 128, 197, - 253, 121, 202, 255, 147, 198, 239, 188, 191, 219, - 148, 200, 252, 192, 193, 197, 134, 205, 254, 171, - 199, 236, 183, 199, 218, 163, 207, 251, 142, 213, - 255, 158, 211, 253, 195, 205, 217, 166, 211, 245, - 205, 204, 228, 153, 218, 255, 190, 210, 236, 186, - 212, 231, 177, 213, 248, 162, 224, 255, 188, 221, - 250, 214, 219, 221, 214, 219, 233, 174, 229, 254, - 198, 225, 247, 209, 226, 248, 186, 233, 251, 227, - 230, 239, 225, 241, 252, 253, 255, 252, 255, 255, - 255, 33, 249, 4, 1, 10, 0, 255, 0, 44, - 0, 0, 0, 0, 120, 0, 67, 0, 0, 8, - 254, 0, 255, 9, 28, 72, 176, 160, 193, 131, - 8, 19, 42, 92, 200, 176, 161, 195, 135, 16, - 35, 74, 156, 72, 177, 162, 197, 139, 22, 131, - 105, 12, 134, 177, 163, 199, 143, 193, 164, 73, - 227, 38, 141, 28, 56, 112, 228, 76, 146, 20, - 41, 205, 152, 75, 99, 183, 100, 201, 50, 101, - 202, 147, 77, 79, 166, 102, 205, 250, 200, 19, - 100, 73, 114, 239, 238, 221, 123, 71, 148, 104, - 202, 163, 224, 86, 138, 124, 25, 115, 166, 205, - 72, 145, 246, 72, 221, 195, 39, 207, 30, 69, - 158, 118, 246, 220, 202, 208, 24, 184, 160, 252, - 248, 9, 29, 59, 212, 100, 75, 99, 53, 159, - 66, 93, 203, 182, 109, 84, 169, 124, 248, 156, - 57, 163, 165, 174, 150, 60, 138, 76, 113, 221, - 251, 207, 24, 183, 119, 97, 3, 135, 125, 71, - 78, 90, 76, 62, 142, 70, 141, 18, 53, 109, - 170, 227, 199, 144, 35, 75, 157, 91, 87, 137, - 229, 28, 74, 190, 228, 229, 139, 209, 43, 96, - 193, 247, 10, 203, 114, 212, 167, 82, 47, 93, - 197, 138, 81, 163, 166, 173, 19, 47, 201, 176, - 99, 59, 166, 171, 36, 135, 237, 22, 45, 114, - 216, 209, 203, 25, 98, 176, 191, 66, 195, 134, - 54, 230, 233, 150, 179, 100, 197, 106, 181, 90, - 158, 171, 57, 179, 110, 231, 124, 185, 145, 77, - 157, 186, 150, 218, 45, 76, 104, 111, 145, 71, - 86, 239, 133, 198, 200, 254, 145, 189, 199, 205, - 212, 212, 115, 244, 232, 157, 107, 86, 172, 185, - 234, 92, 197, 154, 137, 11, 231, 11, 77, 245, - 251, 178, 207, 40, 201, 254, 225, 131, 134, 39, - 138, 124, 103, 80, 73, 68, 13, 37, 141, 39, - 144, 213, 115, 14, 60, 235, 116, 211, 12, 123, - 197, 136, 67, 141, 106, 226, 156, 51, 78, 16, - 92, 208, 194, 7, 126, 28, 70, 166, 159, 9, - 26, 132, 104, 130, 29, 2, 254, 67, 32, 81, - 224, 200, 18, 91, 56, 240, 208, 35, 78, 51, - 238, 49, 40, 223, 58, 240, 88, 99, 132, 31, - 207, 168, 131, 14, 55, 206, 56, 115, 203, 41, - 167, 172, 229, 73, 36, 158, 196, 133, 216, 83, - 29, 58, 166, 69, 11, 26, 88, 96, 129, 6, - 95, 112, 230, 213, 81, 210, 188, 21, 27, 59, - 208, 208, 179, 14, 123, 205, 81, 227, 96, 55, - 235, 208, 227, 14, 23, 126, 244, 162, 204, 49, - 200, 64, 3, 13, 51, 194, 232, 162, 139, 50, - 105, 106, 131, 13, 54, 225, 132, 227, 205, 157, - 207, 96, 243, 204, 48, 195, 244, 72, 28, 126, - 103, 48, 233, 164, 6, 36, 246, 20, 210, 81, - 198, 224, 87, 143, 48, 12, 78, 8, 75, 43, - 242, 21, 3, 38, 60, 227, 116, 224, 2, 22, - 135, 32, 162, 41, 33, 112, 208, 129, 72, 35, - 135, 8, 242, 72, 40, 163, 150, 82, 202, 42, - 186, 172, 178, 203, 46, 169, 170, 154, 76, 50, - 254, 123, 158, 194, 97, 14, 22, 60, 240, 192, - 7, 188, 117, 228, 23, 74, 198, 88, 41, 219, - 56, 189, 36, 19, 203, 57, 235, 80, 147, 11, - 44, 176, 20, 211, 96, 51, 240, 192, 195, 14, - 5, 36, 88, 129, 8, 33, 116, 200, 81, 198, - 181, 101, 208, 1, 199, 27, 220, 110, 59, 69, - 22, 130, 20, 82, 200, 35, 165, 76, 34, 110, - 33, 147, 64, 162, 174, 42, 192, 200, 122, 223, - 25, 38, 216, 186, 192, 19, 24, 133, 52, 82, - 149, 247, 161, 179, 203, 35, 136, 8, 243, 72, - 57, 244, 80, 179, 220, 39, 185, 192, 163, 77, - 55, 244, 236, 227, 14, 5, 17, 0, 65, 7, - 25, 101, 120, 81, 197, 196, 216, 82, 97, 49, - 21, 81, 68, 145, 69, 22, 105, 116, 236, 113, - 26, 161, 148, 59, 136, 24, 98, 64, 210, 203, - 40, 28, 106, 161, 193, 2, 11, 88, 144, 171, - 68, 246, 74, 163, 226, 125, 207, 156, 105, 8, - 25, 212, 54, 218, 202, 39, 4, 227, 115, 142, - 54, 233, 177, 211, 65, 4, 51, 84, 113, 109, - 21, 77, 52, 1, 69, 23, 19, 15, 1, 197, - 16, 84, 12, 17, 197, 182, 112, 8, 146, 198, - 20, 86, 147, 139, 204, 49, 169, 78, 50, 200, - 32, 144, 56, 210, 97, 14, 15, 176, 28, 37, - 204, 198, 180, 228, 107, 108, 158, 60, 19, 202, - 43, 159, 200, 225, 133, 28, 175, 224, 3, 15, - 50, 176, 80, 2, 75, 254, 51, 94, 34, 140, - 143, 208, 68, 119, 129, 45, 210, 93, 48, 13, - 197, 210, 60, 240, 0, 133, 15, 111, 104, 138, - 8, 28, 27, 79, 1, 199, 35, 163, 234, 18, - 139, 155, 233, 206, 177, 97, 202, 22, 28, 112, - 128, 14, 17, 5, 227, 210, 204, 213, 69, 178, - 11, 40, 160, 16, 194, 8, 33, 134, 52, 17, - 142, 122, 197, 236, 156, 11, 51, 185, 52, 3, - 244, 62, 128, 207, 16, 49, 182, 93, 36, 125, - 120, 23, 135, 67, 193, 131, 15, 112, 148, 147, - 143, 58, 216, 8, 3, 249, 198, 89, 192, 1, - 199, 33, 143, 196, 18, 203, 42, 144, 104, 222, - 33, 31, 26, 120, 62, 194, 67, 162, 255, 121, - 159, 35, 149, 104, 58, 135, 21, 100, 64, 92, - 69, 139, 198, 238, 156, 236, 222, 226, 208, 131, - 207, 56, 13, 56, 80, 116, 19, 215, 54, 81, - 197, 24, 73, 23, 126, 248, 16, 62, 248, 144, - 133, 62, 110, 112, 194, 50, 202, 113, 8, 231, - 101, 193, 7, 64, 152, 220, 184, 30, 129, 42, - 93, 168, 66, 108, 29, 50, 129, 231, 52, 208, - 16, 89, 220, 162, 87, 248, 137, 68, 29, 178, - 160, 6, 53, 188, 225, 5, 85, 176, 86, 21, - 232, 1, 15, 113, 228, 98, 57, 173, 104, 143, - 151, 224, 241, 190, 248, 249, 160, 126, 114, 136, - 161, 181, 202, 16, 53, 167, 13, 97, 120, 105, - 184, 7, 7, 12, 224, 4, 111, 192, 65, 114, - 254, 144, 3, 66, 26, 14, 145, 6, 43, 88, - 1, 11, 107, 128, 196, 42, 86, 1, 65, 14, - 181, 224, 0, 1, 160, 160, 66, 100, 114, 139, - 181, 197, 230, 22, 117, 152, 194, 20, 162, 160, - 134, 42, 144, 64, 10, 248, 163, 67, 122, 214, - 17, 187, 79, 232, 45, 23, 226, 16, 7, 62, - 240, 97, 13, 5, 16, 109, 12, 215, 98, 4, - 207, 64, 193, 51, 77, 53, 66, 83, 84, 240, - 65, 26, 218, 113, 1, 3, 180, 1, 27, 144, - 19, 196, 183, 128, 128, 196, 66, 132, 98, 13, - 63, 72, 228, 15, 176, 32, 134, 68, 52, 241, - 62, 45, 8, 64, 0, 106, 144, 144, 89, 152, - 66, 22, 8, 186, 207, 40, 214, 32, 8, 107, - 216, 194, 5, 67, 144, 218, 15, 134, 208, 5, - 68, 184, 15, 30, 205, 120, 148, 25, 97, 1, - 157, 125, 208, 227, 25, 3, 136, 64, 12, 232, - 215, 136, 121, 200, 35, 31, 249, 168, 71, 61, - 242, 33, 143, 118, 108, 67, 30, 208, 128, 195, - 32, 218, 49, 1, 1, 180, 1, 121, 199, 120, - 197, 35, 136, 184, 134, 102, 146, 11, 137, 88, - 80, 228, 37, 104, 145, 36, 13, 72, 178, 80, - 5, 153, 5, 78, 50, 73, 157, 72, 92, 98, - 13, 135, 208, 135, 63, 252, 129, 132, 40, 116, - 193, 105, 192, 11, 5, 62, 92, 217, 140, 157, - 49, 162, 21, 104, 60, 199, 62, 224, 225, 10, - 2, 68, 128, 10, 114, 254, 32, 196, 49, 178, - 113, 129, 11, 112, 224, 159, 37, 224, 192, 6, - 46, 176, 129, 108, 148, 99, 21, 213, 40, 230, - 1, 78, 128, 3, 55, 240, 34, 29, 216, 8, - 197, 36, 122, 81, 10, 114, 61, 2, 93, 107, - 136, 230, 28, 230, 96, 13, 43, 202, 230, 1, - 1, 56, 128, 119, 10, 146, 150, 251, 240, 65, - 21, 88, 200, 194, 60, 198, 233, 143, 84, 164, - 193, 104, 72, 43, 195, 49, 214, 8, 143, 216, - 49, 226, 157, 197, 208, 70, 251, 216, 193, 5, - 2, 100, 160, 10, 129, 64, 4, 54, 54, 81, - 2, 24, 148, 128, 6, 48, 160, 193, 81, 3, - 202, 0, 115, 120, 99, 19, 19, 40, 128, 1, - 74, 208, 79, 6, 20, 32, 12, 222, 8, 133, - 45, 136, 241, 141, 103, 232, 194, 84, 143, 72, - 195, 15, 196, 112, 9, 87, 248, 226, 22, 28, - 58, 3, 20, 183, 71, 144, 89, 16, 201, 163, - 145, 185, 68, 74, 7, 145, 130, 106, 140, 83, - 15, 136, 40, 131, 181, 154, 48, 6, 111, 140, - 145, 61, 173, 72, 214, 131, 210, 83, 41, 2, - 160, 128, 12, 140, 104, 68, 57, 220, 80, 212, - 106, 224, 50, 151, 250, 248, 69, 9, 24, 208, - 6, 126, 28, 225, 2, 1, 32, 70, 53, 126, - 193, 88, 1, 0, 96, 17, 165, 96, 2, 65, - 113, 16, 6, 76, 96, 98, 27, 202, 16, 43, - 89, 51, 193, 10, 82, 108, 174, 58, 38, 144, - 254, 228, 203, 134, 4, 87, 200, 220, 1, 11, - 64, 160, 66, 16, 12, 80, 128, 118, 216, 195, - 5, 141, 40, 31, 182, 216, 145, 30, 23, 181, - 135, 149, 212, 8, 19, 60, 188, 145, 0, 4, - 100, 225, 19, 59, 155, 7, 13, 78, 80, 130, - 109, 60, 67, 24, 141, 128, 67, 33, 204, 81, - 130, 2, 84, 224, 30, 37, 152, 128, 4, 242, - 113, 167, 121, 216, 162, 152, 39, 120, 6, 8, - 4, 192, 128, 13, 112, 160, 159, 6, 192, 68, - 41, 122, 240, 131, 65, 0, 2, 16, 115, 48, - 171, 51, 238, 3, 69, 41, 254, 195, 173, 181, - 125, 12, 31, 122, 0, 132, 25, 248, 192, 3, - 211, 56, 0, 13, 54, 145, 5, 50, 236, 149, - 126, 236, 104, 17, 60, 186, 113, 44, 73, 73, - 120, 29, 174, 136, 37, 28, 102, 215, 10, 121, - 208, 192, 13, 71, 72, 135, 50, 38, 22, 133, - 66, 164, 163, 187, 12, 216, 6, 7, 24, 112, - 132, 114, 192, 33, 13, 144, 248, 69, 1, 0, - 112, 2, 98, 126, 54, 30, 211, 32, 6, 26, - 120, 11, 12, 32, 244, 64, 12, 115, 240, 195, - 18, 174, 0, 8, 87, 144, 226, 20, 164, 147, - 76, 36, 3, 48, 82, 243, 4, 120, 42, 3, - 182, 193, 10, 86, 48, 3, 18, 20, 32, 0, - 2, 32, 129, 26, 200, 80, 133, 194, 53, 129, - 12, 236, 160, 17, 60, 210, 7, 11, 113, 172, - 227, 204, 225, 144, 129, 254, 97, 65, 33, 12, - 129, 165, 131, 3, 55, 112, 131, 45, 142, 81, - 5, 42, 188, 225, 17, 237, 88, 241, 2, 36, - 107, 128, 69, 196, 66, 13, 130, 120, 6, 26, - 60, 187, 136, 106, 120, 22, 23, 186, 224, 90, - 60, 12, 0, 0, 78, 76, 161, 7, 88, 152, - 67, 16, 92, 176, 4, 34, 92, 97, 11, 91, - 200, 132, 53, 204, 35, 153, 51, 72, 146, 94, - 255, 120, 242, 84, 60, 177, 4, 41, 171, 64, - 5, 59, 0, 2, 5, 18, 128, 1, 56, 220, - 236, 90, 189, 83, 3, 59, 206, 97, 230, 102, - 64, 55, 23, 201, 61, 179, 55, 26, 128, 128, - 52, 188, 162, 24, 204, 128, 196, 52, 56, 0, - 131, 77, 88, 67, 24, 132, 64, 196, 33, 212, - 241, 139, 11, 20, 224, 8, 104, 184, 128, 0, - 170, 129, 8, 53, 100, 193, 25, 16, 0, 0, - 0, 182, 49, 104, 6, 36, 67, 153, 143, 184, - 68, 2, 0, 192, 133, 52, 160, 0, 11, 87, - 120, 129, 11, 88, 192, 110, 18, 144, 128, 8, - 153, 118, 70, 162, 34, 99, 129, 40, 10, 196, - 164, 128, 232, 193, 10, 98, 16, 131, 29, 248, - 27, 8, 133, 224, 32, 33, 132, 123, 173, 70, - 172, 35, 141, 235, 64, 6, 116, 97, 65, 172, - 51, 103, 98, 0, 25, 120, 133, 48, 218, 163, - 138, 84, 252, 51, 27, 232, 160, 6, 51, 160, - 193, 142, 108, 28, 97, 2, 12, 176, 7, 18, - 254, 250, 136, 142, 14, 102, 161, 19, 140, 102, - 64, 59, 178, 189, 1, 109, 188, 34, 20, 133, - 240, 131, 103, 57, 113, 136, 31, 44, 97, 14, - 91, 32, 1, 187, 89, 224, 110, 23, 144, 160, - 8, 96, 240, 3, 46, 146, 44, 149, 15, 4, - 96, 1, 247, 174, 206, 41, 176, 96, 131, 29, - 240, 32, 6, 42, 224, 247, 14, 124, 16, 5, - 58, 88, 221, 193, 85, 240, 2, 51, 194, 113, - 142, 110, 72, 40, 23, 202, 233, 70, 179, 202, - 209, 1, 2, 212, 129, 25, 108, 202, 133, 55, - 208, 192, 129, 18, 152, 227, 30, 230, 216, 6, - 49, 156, 64, 108, 8, 164, 226, 30, 48, 152, - 192, 6, 158, 65, 7, 53, 88, 1, 9, 158, - 61, 194, 52, 102, 76, 12, 109, 8, 35, 22, - 144, 232, 196, 161, 225, 32, 134, 43, 92, 161, - 8, 47, 120, 1, 17, 212, 237, 110, 12, 252, - 28, 211, 156, 128, 140, 18, 36, 41, 144, 215, - 194, 198, 19, 115, 0, 194, 10, 84, 192, 131, - 33, 240, 187, 223, 62, 160, 66, 178, 7, 14, - 49, 50, 208, 233, 96, 231, 152, 16, 123, 230, - 83, 142, 12, 59, 32, 22, 26, 103, 70, 43, - 230, 1, 130, 182, 95, 128, 6, 19, 184, 64, - 240, 139, 234, 134, 120, 84, 99, 197, 109, 240, - 134, 26, 232, 80, 7, 11, 104, 123, 27, 72, - 0, 192, 6, 228, 49, 14, 61, 165, 131, 6, - 0, 144, 0, 43, 4, 254, 49, 136, 43, 16, - 33, 8, 30, 136, 60, 188, 225, 237, 238, 23, - 20, 97, 11, 153, 127, 204, 230, 3, 240, 223, - 234, 140, 2, 11, 83, 142, 58, 15, 202, 80, - 133, 167, 199, 96, 8, 141, 128, 155, 33, 62, - 65, 6, 67, 112, 29, 26, 21, 114, 14, 204, - 144, 83, 212, 112, 14, 222, 80, 118, 98, 128, - 12, 180, 35, 12, 185, 32, 15, 16, 0, 103, - 71, 0, 98, 71, 0, 3, 48, 224, 6, 219, - 48, 15, 143, 32, 9, 28, 48, 1, 188, 80, - 14, 84, 160, 6, 137, 192, 104, 23, 144, 14, - 217, 38, 1, 188, 112, 130, 188, 0, 3, 152, - 149, 10, 230, 50, 8, 150, 22, 4, 50, 0, - 6, 91, 64, 4, 46, 224, 2, 145, 7, 126, - 65, 16, 4, 91, 128, 11, 234, 199, 121, 255, - 16, 23, 178, 81, 7, 82, 32, 2, 168, 22, - 3, 62, 48, 4, 100, 160, 6, 79, 23, 5, - 135, 240, 10, 173, 48, 45, 251, 7, 13, 231, - 160, 38, 102, 118, 14, 117, 82, 39, 126, 0, - 113, 186, 128, 12, 12, 88, 11, 185, 176, 13, - 19, 112, 3, 37, 192, 15, 185, 84, 15, 243, - 16, 15, 234, 112, 12, 136, 80, 10, 237, 64, - 12, 196, 112, 15, 215, 64, 5, 112, 128, 11, - 22, 208, 103, 182, 32, 1, 0, 192, 0, 239, - 5, 80, 23, 208, 6, 207, 80, 8, 96, 3, - 111, 70, 128, 6, 118, 192, 4, 96, 0, 121, - 254, 36, 240, 2, 96, 176, 33, 150, 192, 5, - 92, 224, 43, 235, 39, 16, 103, 224, 121, 144, - 49, 10, 63, 48, 3, 163, 23, 3, 195, 243, - 129, 101, 160, 6, 169, 247, 10, 200, 0, 10, - 204, 209, 10, 194, 16, 14, 201, 195, 34, 7, - 151, 12, 225, 0, 12, 10, 224, 0, 147, 160, - 13, 180, 227, 133, 208, 240, 11, 196, 230, 6, - 253, 112, 12, 159, 208, 119, 86, 103, 8, 214, - 246, 10, 209, 80, 14, 209, 0, 10, 67, 0, - 7, 227, 16, 15, 247, 192, 15, 72, 192, 91, - 246, 176, 13, 169, 176, 8, 110, 144, 10, 214, - 5, 61, 35, 227, 2, 91, 32, 3, 86, 33, - 21, 92, 0, 6, 47, 224, 1, 50, 32, 10, - 176, 17, 137, 63, 72, 137, 142, 113, 10, 98, - 208, 116, 81, 199, 111, 60, 64, 5, 143, 83, - 6, 67, 160, 6, 177, 16, 14, 208, 160, 13, - 106, 194, 12, 200, 160, 12, 218, 112, 12, 82, - 152, 12, 187, 160, 10, 151, 64, 1, 8, 240, - 3, 10, 184, 51, 148, 208, 10, 139, 85, 2, - 37, 176, 9, 253, 32, 12, 134, 80, 6, 251, - 83, 62, 84, 144, 45, 141, 64, 8, 84, 192, - 3, 158, 8, 4, 86, 64, 10, 28, 32, 0, - 56, 224, 13, 194, 176, 11, 222, 80, 14, 202, - 16, 10, 135, 32, 46, 141, 7, 111, 45, 224, - 24, 145, 144, 9, 91, 0, 6, 70, 0, 6, - 112, 101, 116, 72, 247, 254, 15, 123, 112, 6, - 176, 65, 11, 63, 176, 111, 59, 208, 111, 154, - 216, 142, 135, 0, 10, 136, 16, 10, 194, 160, - 13, 201, 160, 13, 117, 34, 14, 208, 128, 12, - 186, 208, 11, 187, 112, 9, 128, 224, 1, 20, - 64, 0, 8, 96, 3, 203, 1, 11, 159, 112, - 83, 175, 80, 15, 52, 208, 118, 196, 144, 15, - 185, 32, 66, 67, 80, 5, 100, 64, 7, 81, - 83, 56, 85, 48, 3, 20, 233, 3, 54, 208, - 3, 157, 192, 0, 0, 64, 12, 208, 0, 10, - 63, 4, 7, 202, 54, 146, 133, 48, 7, 151, - 64, 4, 96, 112, 146, 144, 225, 7, 96, 192, - 5, 226, 40, 21, 245, 38, 69, 158, 48, 23, - 145, 97, 10, 115, 96, 3, 34, 48, 122, 231, - 88, 122, 112, 160, 6, 165, 16, 11, 161, 112, - 12, 202, 112, 9, 151, 16, 14, 226, 32, 143, - 244, 40, 6, 24, 224, 0, 8, 128, 0, 17, - 128, 2, 135, 128, 66, 173, 64, 9, 140, 64, - 9, 185, 208, 15, 196, 144, 10, 191, 192, 15, - 236, 0, 10, 114, 96, 56, 93, 32, 7, 73, - 120, 67, 80, 64, 5, 59, 128, 132, 84, 0, - 4, 107, 48, 104, 5, 240, 13, 194, 0, 10, - 111, 0, 4, 64, 32, 57, 105, 128, 46, 171, - 48, 7, 223, 39, 4, 145, 1, 132, 157, 246, - 105, 2, 49, 11, 115, 33, 142, 167, 240, 3, - 54, 224, 3, 153, 152, 56, 80, 243, 6, 112, - 254, 0, 138, 177, 32, 12, 208, 160, 10, 106, - 130, 13, 0, 24, 14, 197, 128, 148, 107, 208, - 3, 86, 32, 138, 202, 193, 51, 85, 121, 83, - 173, 112, 14, 229, 192, 14, 234, 80, 14, 173, - 160, 87, 101, 0, 60, 33, 148, 132, 112, 32, - 60, 60, 48, 3, 184, 233, 3, 170, 224, 75, - 237, 128, 13, 79, 72, 5, 84, 246, 45, 83, - 0, 136, 221, 71, 4, 50, 64, 147, 29, 178, - 100, 35, 37, 147, 132, 249, 24, 137, 128, 152, - 43, 224, 111, 57, 121, 132, 92, 4, 7, 161, - 160, 12, 111, 162, 11, 115, 32, 153, 199, 176, - 117, 63, 83, 158, 244, 8, 10, 148, 48, 144, - 237, 25, 8, 44, 26, 8, 114, 16, 8, 169, - 193, 8, 11, 41, 56, 133, 195, 3, 244, 99, - 117, 84, 80, 5, 80, 192, 111, 244, 195, 63, - 64, 16, 10, 186, 32, 12, 5, 234, 3, 49, - 48, 3, 195, 153, 6, 88, 48, 50, 240, 246, - 1, 73, 178, 7, 253, 213, 86, 90, 224, 160, - 142, 33, 6, 33, 48, 101, 254, 118, 67, 169, - 39, 8, 175, 208, 132, 210, 179, 11, 189, 176, - 5, 202, 160, 12, 107, 194, 117, 83, 216, 10, - 180, 83, 149, 44, 234, 5, 99, 224, 5, 127, - 224, 5, 110, 58, 6, 178, 89, 6, 74, 51, - 49, 80, 192, 144, 246, 83, 6, 159, 210, 119, - 166, 55, 75, 12, 57, 3, 213, 201, 132, 160, - 160, 6, 81, 48, 4, 254, 51, 48, 3, 89, - 96, 68, 73, 234, 125, 65, 96, 2, 73, 18, - 91, 1, 240, 50, 255, 160, 8, 81, 234, 24, - 142, 176, 4, 33, 32, 2, 137, 57, 3, 84, - 0, 5, 29, 84, 53, 64, 154, 42, 170, 144, - 9, 92, 112, 9, 165, 16, 143, 196, 98, 133, - 12, 184, 51, 104, 170, 166, 99, 176, 166, 115, - 227, 162, 173, 154, 52, 247, 217, 101, 89, 87, - 6, 132, 208, 8, 62, 89, 5, 67, 144, 147, - 19, 195, 3, 43, 96, 3, 81, 240, 10, 141, - 160, 6, 95, 217, 159, 126, 106, 3, 71, 36, - 6, 68, 80, 4, 50, 144, 36, 106, 21, 0, - 108, 5, 165, 147, 42, 21, 166, 96, 169, 83, - 214, 111, 137, 83, 5, 206, 3, 10, 161, 48, - 61, 170, 224, 7, 32, 0, 1, 50, 0, 9, - 186, 64, 39, 86, 104, 120, 202, 161, 170, 140, - 224, 166, 106, 250, 7, 109, 234, 166, 49, 228, - 5, 134, 224, 5, 73, 67, 63, 114, 80, 5, - 183, 154, 58, 55, 164, 2, 177, 73, 6, 80, - 96, 164, 108, 214, 10, 92, 198, 63, 51, 16, - 2, 6, 75, 95, 138, 42, 165, 248, 1, 82, - 34, 117, 16, 166, 80, 23, 155, 115, 11, 87, - 96, 161, 51, 192, 111, 156, 170, 108, 160, 32, - 61, 171, 192, 10, 32, 16, 124, 48, 208, 9, - 189, 128, 148, 208, 16, 14, 176, 72, 59, 55, - 69, 154, 129, 192, 166, 127, 176, 166, 114, 163, - 254, 166, 94, 0, 49, 77, 192, 3, 73, 208, - 4, 115, 67, 6, 160, 128, 171, 132, 160, 6, - 60, 10, 49, 60, 96, 3, 112, 112, 179, 100, - 16, 8, 236, 8, 4, 54, 96, 176, 33, 128, - 2, 40, 192, 2, 68, 160, 4, 213, 116, 77, - 9, 33, 169, 90, 48, 21, 115, 160, 111, 153, - 184, 3, 114, 136, 58, 135, 208, 173, 171, 224, - 10, 253, 132, 6, 81, 113, 10, 172, 240, 38, - 216, 160, 13, 242, 40, 164, 104, 250, 7, 129, - 224, 174, 129, 192, 8, 114, 208, 166, 134, 128, - 63, 17, 147, 56, 77, 32, 155, 132, 32, 138, - 136, 80, 5, 58, 11, 5, 47, 219, 5, 253, - 9, 7, 46, 74, 8, 236, 232, 3, 244, 133, - 2, 71, 139, 180, 44, 16, 4, 73, 178, 100, - 148, 164, 16, 121, 80, 23, 82, 225, 10, 55, - 153, 137, 70, 168, 6, 136, 32, 8, 47, 86, - 8, 165, 160, 9, 19, 96, 6, 142, 193, 7, - 163, 176, 11, 202, 192, 117, 242, 232, 78, 108, - 235, 174, 238, 58, 6, 104, 203, 170, 73, 227, - 5, 73, 48, 179, 65, 139, 171, 175, 80, 109, - 84, 80, 52, 178, 217, 4, 187, 58, 4, 217, - 82, 5, 83, 99, 5, 61, 128, 180, 190, 203, - 2, 46, 192, 180, 78, 36, 73, 254, 197, 184, - 117, 145, 7, 180, 192, 116, 138, 201, 111, 133, - 74, 117, 89, 112, 8, 186, 160, 9, 23, 16, - 25, 159, 171, 83, 240, 254, 120, 66, 104, 58, - 6, 129, 176, 166, 174, 10, 167, 100, 80, 175, - 245, 138, 51, 160, 144, 11, 112, 153, 71, 47, - 84, 62, 49, 91, 122, 116, 0, 60, 81, 0, - 4, 152, 122, 180, 75, 144, 1, 25, 112, 184, - 17, 68, 188, 15, 209, 184, 90, 80, 173, 54, - 80, 168, 167, 39, 60, 22, 243, 6, 208, 43, - 189, 146, 49, 10, 218, 112, 174, 19, 119, 44, - 60, 67, 186, 45, 234, 162, 114, 80, 175, 93, - 86, 6, 159, 0, 10, 177, 11, 7, 81, 112, - 132, 47, 75, 175, 78, 99, 52, 60, 160, 2, - 86, 90, 168, 54, 176, 4, 46, 144, 1, 87, - 112, 141, 213, 113, 6, 245, 102, 111, 16, 33, - 169, 138, 48, 177, 152, 184, 147, 19, 153, 122, - 28, 154, 12, 156, 48, 189, 146, 241, 12, 87, - 8, 13, 26, 215, 30, 237, 89, 11, 200, 128, - 12, 178, 3, 93, 235, 234, 5, 101, 144, 132, - 208, 149, 41, 21, 252, 144, 220, 27, 60, 117, - 250, 116, 161, 228, 163, 132, 116, 5, 46, 144, - 8, 248, 161, 4, 11, 32, 73, 139, 27, 17, - 166, 240, 5, 144, 208, 3, 251, 187, 111, 165, - 39, 135, 136, 240, 10, 146, 41, 192, 146, 113, - 10, 231, 96, 133, 212, 32, 12, 112, 195, 162, - 104, 27, 8, 173, 0, 55, 183, 214, 10, 55, - 85, 149, 79, 200, 173, 144, 99, 96, 170, 35, - 92, 192, 51, 4, 116, 64, 127, 161, 244, 129, - 254, 83, 80, 156, 147, 16, 100, 222, 8, 91, - 80, 116, 0, 103, 51, 17, 193, 192, 10, 145, - 123, 161, 6, 118, 181, 175, 240, 38, 153, 64, - 195, 53, 76, 178, 218, 128, 12, 185, 80, 149, - 109, 251, 7, 132, 32, 7, 134, 240, 7, 49, - 180, 182, 107, 11, 187, 91, 122, 8, 82, 96, - 3, 89, 128, 8, 173, 208, 8, 154, 92, 6, - 141, 208, 8, 129, 96, 8, 3, 103, 117, 207, - 35, 81, 27, 203, 131, 212, 161, 4, 32, 21, - 0, 18, 0, 169, 18, 49, 14, 107, 128, 137, - 251, 150, 122, 87, 43, 12, 245, 8, 12, 27, - 240, 151, 82, 241, 12, 218, 64, 13, 56, 44, - 12, 181, 192, 8, 105, 123, 83, 210, 44, 55, - 160, 204, 162, 148, 64, 48, 185, 16, 10, 161, - 80, 68, 105, 48, 190, 114, 76, 205, 55, 149, - 79, 172, 71, 45, 112, 208, 8, 163, 178, 10, - 201, 128, 203, 176, 161, 5, 39, 60, 73, 30, - 49, 8, 82, 230, 197, 95, 169, 202, 109, 162, - 12, 192, 64, 3, 150, 0, 27, 201, 35, 12, - 108, 34, 12, 210, 220, 162, 55, 229, 162, 110, - 26, 203, 238, 249, 198, 177, 160, 12, 144, 48, - 8, 177, 112, 12, 194, 0, 148, 205, 1, 55, - 210, 44, 205, 229, 67, 7, 201, 6, 42, 12, - 148, 12, 190, 0, 27, 124, 240, 1, 80, 20, - 0, 46, 243, 17, 170, 96, 5, 133, 122, 155, - 31, 168, 202, 14, 141, 254, 12, 189, 128, 4, - 146, 32, 25, 124, 160, 13, 171, 44, 144, 45, - 106, 8, 134, 240, 162, 11, 188, 182, 208, 149, - 66, 229, 169, 13, 151, 160, 10, 247, 88, 10, - 68, 89, 182, 85, 233, 96, 194, 101, 209, 81, - 160, 108, 151, 211, 11, 192, 240, 24, 168, 192, - 7, 42, 243, 209, 11, 144, 200, 30, 145, 12, - 105, 80, 168, 205, 171, 6, 231, 252, 10, 151, - 179, 11, 156, 112, 4, 252, 188, 198, 100, 112, - 205, 46, 26, 208, 114, 243, 162, 238, 233, 133, - 104, 87, 143, 47, 192, 10, 202, 80, 10, 200, - 64, 148, 225, 160, 198, 104, 26, 8, 179, 137, - 183, 114, 120, 8, 166, 162, 212, 190, 66, 43, - 158, 115, 0, 243, 194, 21, 127, 232, 167, 51, - 224, 111, 84, 87, 203, 165, 176, 11, 154, 0, - 3, 220, 244, 24, 189, 16, 206, 14, 214, 182, - 11, 108, 8, 105, 107, 211, 239, 36, 12, 150, - 29, 39, 30, 176, 5, 172, 208, 11, 14, 205, - 12, 218, 80, 11, 235, 73, 9, 44, 42, 155, - 134, 128, 49, 181, 60, 9, 170, 48, 10, 230, - 161, 5, 31, 240, 0, 125, 253, 0, 160, 182, - 23, 147, 64, 180, 23, 58, 117, 84, 23, 5, - 130, 112, 42, 174, 0, 3, 150, 240, 151, 171, - 144, 58, 1, 205, 174, 114, 80, 205, 160, 108, - 214, 3, 25, 209, 185, 160, 13, 202, 208, 0, - 3, 224, 1, 151, 32, 166, 152, 57, 48, 134, - 254, 112, 83, 16, 115, 45, 114, 184, 6, 125, - 112, 7, 123, 160, 5, 241, 178, 0, 125, 61, - 2, 216, 196, 23, 144, 80, 96, 21, 91, 177, - 253, 19, 5, 83, 112, 216, 192, 80, 2, 95, - 96, 23, 82, 234, 9, 165, 128, 8, 65, 27, - 180, 110, 74, 8, 163, 221, 182, 54, 157, 205, - 181, 192, 128, 185, 240, 10, 208, 160, 11, 13, - 160, 0, 24, 0, 6, 208, 32, 158, 208, 208, - 30, 234, 42, 223, 85, 144, 5, 216, 45, 23, - 57, 208, 218, 44, 227, 221, 22, 240, 4, 90, - 241, 29, 170, 64, 157, 215, 170, 147, 196, 147, - 208, 201, 128, 4, 102, 96, 25, 32, 94, 23, - 147, 120, 7, 125, 176, 6, 113, 160, 6, 214, - 60, 55, 106, 122, 223, 114, 4, 79, 39, 148, - 11, 255, 77, 1, 20, 112, 5, 170, 48, 182, - 205, 12, 205, 159, 64, 57, 120, 144, 221, 219, - 157, 3, 38, 80, 43, 101, 195, 50, 19, 238, - 203, 189, 1, 185, 243, 188, 188, 62, 48, 5, - 202, 128, 13, 201, 192, 6, 110, 224, 86, 121, - 0, 226, 82, 174, 4, 34, 126, 6, 36, 222, - 7, 120, 96, 226, 220, 226, 56, 17, 44, 154, - 151, 227, 148, 118, 201, 10, 124, 50, 10, 142, - 176, 33, 215, 225, 227, 77, 2, 228, 182, 242, - 0, 53, 240, 5, 68, 94, 34, 229, 120, 169, - 137, 169, 2, 6, 150, 5, 229, 186, 206, 48, - 64, 16, 166, 160, 8, 192, 81, 62, 229, 32, - 142, 25, 84, 238, 222, 115, 49, 232, 132, 110, - 23, 215, 113, 25, 218, 17, 34, 78, 178, 232, - 181, 98, 1, 109, 30, 32, 37, 162, 16, 151, - 64, 184, 152, 26, 127, 73, 94, 10, 73, 9, - 12, 56, 128, 16, 218, 148, 7, 121, 240, 5, - 182, 17, 234, 162, 158, 3, 184, 129, 27, 218, - 113, 234, 218, 209, 31, 253, 17, 34, 172, 206, - 232, 38, 160, 3, 0, 82, 225, 145, 206, 16, - 148, 142, 169, 116, 126, 164, 186, 144, 12, 187, - 237, 16, 150, 20, 9, 118, 96, 7, 95, 240, - 5, 216, 145, 29, 168, 158, 234, 170, 174, 1, - 31, 160, 3, 184, 17, 236, 120, 33, 235, 179, - 254, 16, 144, 75, 184, 136, 153, 106, 22, 185, - 6, 147, 192, 10, 174, 176, 1, 60, 65, 19, - 145, 240, 230, 207, 222, 17, 128, 64, 184, 33, - 96, 164, 86, 144, 6, 225, 226, 165, 154, 32, - 1, 223, 190, 238, 21, 225, 10, 75, 128, 2, - 54, 240, 3, 66, 148, 6, 228, 178, 11, 192, - 192, 4, 236, 158, 239, 2, 17, 16, 0, 59}; - diff --git a/main/main.c b/main/main.c index 44c61c600..ccb98a647 100644 --- a/main/main.c +++ b/main/main.c @@ -86,7 +86,6 @@ #include "php_content_types.h" #include "php_ticks.h" -#include "php_logos.h" #include "php_streams.h" #include "php_open_temporary_file.h" @@ -552,7 +551,7 @@ PHP_INI_BEGIN() PHP_INI_ENTRY("mail.force_extra_parameters",NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnChangeMailForceExtra) PHP_INI_ENTRY("disable_functions", "", PHP_INI_SYSTEM, NULL) PHP_INI_ENTRY("disable_classes", "", PHP_INI_SYSTEM, NULL) - PHP_INI_ENTRY("max_file_uploads", "20", PHP_INI_SYSTEM|PHP_INI_PERDIR, NULL) + PHP_INI_ENTRY("max_file_uploads", "20", PHP_INI_SYSTEM|PHP_INI_PERDIR, NULL) STD_PHP_INI_BOOLEAN("allow_url_fopen", "1", PHP_INI_SYSTEM, OnUpdateBool, allow_url_fopen, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("allow_url_include", "0", PHP_INI_SYSTEM, OnUpdateBool, allow_url_include, php_core_globals, core_globals) @@ -2166,14 +2165,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod return FAILURE; } - /* initialize registry for images to be used in phpinfo() - (this uses configuration parameters from php.ini) - */ - if (php_init_info_logos() == FAILURE) { - php_printf("PHP: Unable to initialize info phpinfo logos.\n"); - return FAILURE; - } - zuv.html_errors = 1; zuv.import_use_extension = ".php"; php_startup_auto_globals(TSRMLS_C); @@ -2357,7 +2348,6 @@ void php_module_shutdown(TSRMLS_D) /* Destroys filter & transport registries too */ php_shutdown_stream_wrappers(module_number TSRMLS_CC); - php_shutdown_info_logos(); UNREGISTER_INI_ENTRIES(); /* close down the ini config */ @@ -2405,10 +2395,6 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) int retval = 0; EG(exit_status) = 0; - if (php_handle_special_queries(TSRMLS_C)) { - zend_file_handle_dtor(primary_file TSRMLS_CC); - return 0; - } #ifndef HAVE_BROKEN_GETCWD # define OLD_CWD_SIZE 4096 old_cwd = do_alloca(OLD_CWD_SIZE, use_heap); diff --git a/main/network.c b/main/network.c index 6c7031f98..b8380b00d 100644 --- a/main/network.c +++ b/main/network.c @@ -25,7 +25,10 @@ #include <stddef.h> + + #ifdef PHP_WIN32 +# include <Ws2tcpip.h> # include "win32/inet.h" # define O_RDONLY _O_RDONLY # include "win32/param.h" diff --git a/main/output.c b/main/output.c index e100057ca..534e0b627 100644 --- a/main/output.c +++ b/main/output.c @@ -1510,7 +1510,7 @@ PHP_FUNCTION(ob_get_status) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &full_status) == FAILURE) { return; } - + array_init(return_value); if (!OG(active)) { diff --git a/main/php.h b/main/php.h index 2a93118ac..1c1ffa3a6 100644 --- a/main/php.h +++ b/main/php.h @@ -26,7 +26,7 @@ #include <dmalloc.h> #endif -#define PHP_API_VERSION 20100412 +#define PHP_API_VERSION 20121113 #define PHP_HAVE_STREAMS #define YYDEBUG 0 @@ -60,7 +60,6 @@ # else # define PHPAPI # endif - # define THREAD_LS # define PHP_DIR_SEPARATOR '/' # define PHP_EOL "\n" diff --git a/main/php_config.h.in b/main/php_config.h.in index cd96c1418..e68ebde4e 100644 --- a/main/php_config.h.in +++ b/main/php_config.h.in @@ -559,9 +559,6 @@ /* Have cURL with SSL support */ #undef HAVE_CURL_SSL -/* */ -#undef HAVE_CURL_VERSION_INFO - /* Define to 1 if you have the `cuserid' function. */ #undef HAVE_CUSERID @@ -2087,7 +2084,10 @@ /* Enable compressed protocol support */ #undef MYSQLND_COMPRESSION_WANTED -/* Enable SSL support */ +/* Enable mysqlnd code that uses OpenSSL directly */ +#undef MYSQLND_HAVE_SSL + +/* Enable core mysqlnd SSL code */ #undef MYSQLND_SSL_SUPPORTED /* Whether mysqlnd is enabled */ diff --git a/main/php_logos.c b/main/php_logos.c deleted file mode 100644 index 3689f71e9..000000000 --- a/main/php_logos.c +++ /dev/null @@ -1,99 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Hartmut Holzgraefe <hholzgra@php.net> | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#include "php.h" -#include "logos.h" -#include "php_logos.h" -#include "ext/standard/info.h" -#include "SAPI.h" - -typedef struct _php_info_logo { - const char *mimetype; - int mimelen; - const unsigned char *data; - int size; -} php_info_logo; - -static HashTable phpinfo_logo_hash; - -PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype, const unsigned char *data, int size) -{ - php_info_logo info_logo; - - info_logo.mimetype = mimetype; - info_logo.mimelen = strlen(mimetype); - info_logo.data = data; - info_logo.size = size; - - return zend_hash_add(&phpinfo_logo_hash, logo_string, strlen(logo_string), &info_logo, sizeof(php_info_logo), NULL); -} - -PHPAPI int php_unregister_info_logo(char *logo_string) -{ - return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string)); -} - -int php_init_info_logos(void) -{ - if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE) - return FAILURE; - - php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo)); - php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo)); - php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo)); - - return SUCCESS; -} - -int php_shutdown_info_logos(void) -{ - zend_hash_destroy(&phpinfo_logo_hash); - return SUCCESS; -} - -#define CONTENT_TYPE_HEADER "Content-Type: " -int php_info_logos(const char *logo_string TSRMLS_DC) -{ - php_info_logo *logo_image; - char *content_header; - int len; - - if(FAILURE==zend_hash_find(&phpinfo_logo_hash, (char *) logo_string, strlen(logo_string), (void **)&logo_image)) - return 0; - - len = sizeof(CONTENT_TYPE_HEADER) - 1 + logo_image->mimelen; - content_header = emalloc(len + 1); - memcpy(content_header, CONTENT_TYPE_HEADER, sizeof(CONTENT_TYPE_HEADER) - 1); - memcpy(content_header + sizeof(CONTENT_TYPE_HEADER) - 1 , logo_image->mimetype, logo_image->mimelen); - content_header[len] = '\0'; - sapi_add_header(content_header, len, 0); - - PHPWRITE((char*)logo_image->data, logo_image->size); - return 1; -} - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ diff --git a/main/php_logos.h b/main/php_logos.h deleted file mode 100644 index b9e1144c0..000000000 --- a/main/php_logos.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - - -#ifndef _PHP_LOGOS_H -#define _PHP_LOGOS_H - -BEGIN_EXTERN_C() -PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype, const unsigned char *data, int size); -PHPAPI int php_unregister_info_logo(char *logo_string); -END_EXTERN_C() - -int php_init_info_logos(void); -int php_shutdown_info_logos(void); -int php_info_logos(const char *logo_string TSRMLS_DC); - -#endif /* _PHP_LOGOS_H */ diff --git a/main/php_streams.h b/main/php_streams.h index 82498d661..291fd0d0a 100755..100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -162,10 +162,6 @@ struct _php_stream_wrapper { php_stream_wrapper_ops *wops; /* operations the wrapper can perform */ void *abstract; /* context for the wrapper */ int is_url; /* so that PG(allow_url_fopen) can be respected */ - - /* support for wrappers to return (multiple) error messages to the stream opener */ - int err_count; /* unused */ - char **err_stack; /* unusued */ }; #define PHP_STREAM_FLAG_NO_SEEK 1 diff --git a/main/php_variables.c b/main/php_variables.c index 427966170..9952bd80b 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -27,7 +27,6 @@ #include "php_globals.h" #include "php_content_types.h" #include "SAPI.h" -#include "php_logos.h" #include "zend_globals.h" /* for systems that need to override reading of environment variables */ @@ -532,22 +531,6 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC) } /* }}} */ -/* {{{ php_handle_special_queries - */ -PHPAPI int php_handle_special_queries(TSRMLS_D) -{ - if (PG(expose_php) && SG(request_info).query_string && SG(request_info).query_string[0] == '=') { - if (php_info_logos(SG(request_info).query_string + 1 TSRMLS_CC)) { - return 1; - } else if (!strcmp(SG(request_info).query_string + 1, PHP_CREDITS_GUID)) { - php_print_credits(PHP_CREDITS_ALL TSRMLS_CC); - return 1; - } - } - return 0; -} -/* }}} */ - /* {{{ php_register_server_variables */ static inline void php_register_server_variables(TSRMLS_D) diff --git a/main/php_version.h b/main/php_version.h index cdd377472..bc4a236dc 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -1,8 +1,8 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 -#define PHP_MINOR_VERSION 4 -#define PHP_RELEASE_VERSION 8 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.4.8" -#define PHP_VERSION_ID 50408 +#define PHP_MINOR_VERSION 5 +#define PHP_RELEASE_VERSION 0 +#define PHP_EXTRA_VERSION "alpha1" +#define PHP_VERSION "5.5.0alpha1" +#define PHP_VERSION_ID 50500 diff --git a/main/rfc1867.c b/main/rfc1867.c index 5da3a9935..3ca2c1131 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -408,7 +408,7 @@ static int multipart_buffer_headers(multipart_buffer *self, zend_llist *header T /* get lines of text, or CRLF_CRLF */ - while( (line = get_line(self TSRMLS_CC)) && strlen(line) > 0 ) + while( (line = get_line(self TSRMLS_CC)) && line[0] != '\0' ) { /* add header to table */ char *key = line; @@ -979,7 +979,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */ continue; } - if (strlen(filename) == 0) { + if (filename[0] == '\0') { #if DEBUG_FILE_UPLOAD sapi_module.sapi_error(E_NOTICE, "No file uploaded"); #endif @@ -1063,12 +1063,12 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */ if (!cancel_upload && !end) { #if DEBUG_FILE_UPLOAD - sapi_module.sapi_error(E_NOTICE, "Missing mime boundary at the end of the data for file %s", strlen(filename) > 0 ? filename : ""); + sapi_module.sapi_error(E_NOTICE, "Missing mime boundary at the end of the data for file %s", filename[0] != '\0' ? filename : ""); #endif cancel_upload = UPLOAD_ERROR_C; } #if DEBUG_FILE_UPLOAD - if (strlen(filename) > 0 && total_bytes == 0 && !cancel_upload) { + if (filename[0] != '\0' && total_bytes == 0 && !cancel_upload) { sapi_module.sapi_error(E_WARNING, "Uploaded file size 0 - file [%s=%s] not saved", param, filename); cancel_upload = 5; } diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c index 7b568501e..7b568501e 100755..100644 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c diff --git a/main/streams/php_stream_context.h b/main/streams/php_stream_context.h index 5767b74d2..19acb0844 100644 --- a/main/streams/php_stream_context.h +++ b/main/streams/php_stream_context.h @@ -53,7 +53,6 @@ struct _php_stream_notifier { struct _php_stream_context { php_stream_notifier *notifier; zval *options; /* hash keyed by wrapper family or specific wrapper */ - zval *links; /* hash keyed by hostent for connection pooling */ int rsrc_id; /* used for auto-cleanup */ }; @@ -65,13 +64,6 @@ PHPAPI int php_stream_context_get_option(php_stream_context *context, PHPAPI int php_stream_context_set_option(php_stream_context *context, const char *wrappername, const char *optionname, zval *optionvalue); -PHPAPI int php_stream_context_get_link(php_stream_context *context, - const char *hostent, php_stream **stream); -PHPAPI int php_stream_context_set_link(php_stream_context *context, - const char *hostent, php_stream *stream); -PHPAPI int php_stream_context_del_link(php_stream_context *context, - php_stream *stream); - PHPAPI php_stream_notifier *php_stream_notification_alloc(void); PHPAPI void php_stream_notification_free(php_stream_notifier *notifier); END_EXTERN_C() diff --git a/main/streams/php_stream_glob_wrapper.h b/main/streams/php_stream_glob_wrapper.h index c584ff8f8..c584ff8f8 100755..100644 --- a/main/streams/php_stream_glob_wrapper.h +++ b/main/streams/php_stream_glob_wrapper.h diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 77e411377..80c22ce50 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -113,7 +113,7 @@ typedef struct { unsigned is_pipe:1; /* don't try and seek */ unsigned cached_fstat:1; /* sb is valid */ unsigned _reserved:29; - + int lock_flag; /* stores the lock state */ char *temp_file_name; /* if non-null, this is the path to a temporary file that * is to be deleted when the stream is closed */ @@ -139,7 +139,7 @@ static int do_fstat(php_stdio_stream_data *d, int force) if (!d->cached_fstat || force) { int fd; int r; - + PHP_STDIOP_GET_FD(fd, d); r = fstat(fd, &d->sb); d->cached_fstat = r == 0; @@ -152,7 +152,7 @@ static int do_fstat(php_stdio_stream_data *d, int force) static php_stream *_php_stream_fopen_from_fd_int(int fd, const char *mode, const char *persistent_id STREAMS_DC TSRMLS_DC) { php_stdio_stream_data *self; - + self = pemalloc_rel_orig(sizeof(*self), persistent_id); memset(self, 0, sizeof(*self)); self->file = NULL; @@ -161,14 +161,14 @@ static php_stream *_php_stream_fopen_from_fd_int(int fd, const char *mode, const self->is_process_pipe = 0; self->temp_file_name = NULL; self->fd = fd; - + return php_stream_alloc_rel(&php_stream_stdio_ops, self, persistent_id, mode); } static php_stream *_php_stream_fopen_from_file_int(FILE *file, const char *mode STREAMS_DC TSRMLS_DC) { php_stdio_stream_data *self; - + self = emalloc_rel_orig(sizeof(*self)); memset(self, 0, sizeof(*self)); self->file = file; @@ -213,7 +213,7 @@ PHPAPI php_stream *_php_stream_fopen_tmpfile(int dummy STREAMS_DC TSRMLS_DC) self->temp_file_name = opened_path; self->lock_flag = LOCK_UN; - + return stream; } close(fd); @@ -246,7 +246,7 @@ PHPAPI php_stream *_php_stream_fopen_from_fd(int fd, const char *mode, const cha } } #endif - + if (self->is_pipe) { stream->flags |= PHP_STREAM_FLAG_NO_SEEK; } else { @@ -285,7 +285,7 @@ PHPAPI php_stream *_php_stream_fopen_from_file(FILE *file, const char *mode STRE } } #endif - + if (self->is_pipe) { stream->flags |= PHP_STREAM_FLAG_NO_SEEK; } else { @@ -354,9 +354,9 @@ static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count TSRMLS so script can retry if desired */ ret = read(data->fd, buf, count); } - + stream->eof = (ret == 0 || (ret == (size_t)-1 && errno != EWOULDBLOCK && errno != EINTR && errno != EBADF)); - + } else { #if HAVE_FLUSHIO if (!data->is_pipe && data->last_op == 'w') @@ -393,7 +393,7 @@ static int php_stdiop_close(php_stream *stream, int close_handle TSRMLS_DC) data->file_mapping = NULL; } #endif - + if (close_handle) { if (data->file) { if (data->is_process_pipe) { @@ -463,14 +463,14 @@ static int php_stdiop_seek(php_stream *stream, off_t offset, int whence, off_t * if (data->fd >= 0) { off_t result; - + result = lseek(data->fd, offset, whence); if (result == (off_t)-1) return -1; *newoffset = result; return 0; - + } else { ret = fseek(data->file, offset, whence); *newoffset = ftell(data->file); @@ -484,7 +484,7 @@ static int php_stdiop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) php_stdio_stream_data *data = (php_stdio_stream_data*) stream->abstract; assert(data != NULL); - + /* as soon as someone touches the stdio layer, buffering may ensue, * so we need to stop using the fd directly in that case */ @@ -502,7 +502,7 @@ static int php_stdiop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) return FAILURE; } } - + *(FILE**)ret = data->file; data->fd = -1; } @@ -558,9 +558,9 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void int flags; int oldval; #endif - + PHP_STDIOP_GET_FD(fd, data); - + switch(option) { case PHP_STREAM_OPTION_BLOCKING: if (fd == -1) @@ -572,20 +572,20 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void flags &= ~O_NONBLOCK; else flags |= O_NONBLOCK; - + if (-1 == fcntl(fd, F_SETFL, flags)) return -1; return oldval; #else return -1; /* not yet implemented */ #endif - + case PHP_STREAM_OPTION_WRITE_BUFFER: if (data->file == NULL) { return -1; } - + if (ptrparam) size = *(size_t *)ptrparam; else @@ -594,10 +594,10 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void switch(value) { case PHP_STREAM_BUFFER_NONE: return setvbuf(data->file, NULL, _IONBF, 0); - + case PHP_STREAM_BUFFER_LINE: return setvbuf(data->file, NULL, _IOLBF, size); - + case PHP_STREAM_BUFFER_FULL: return setvbuf(data->file, NULL, _IOFBF, size); @@ -605,7 +605,7 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void return -1; } break; - + case PHP_STREAM_OPTION_LOCKING: if (fd == -1) { return -1; @@ -628,7 +628,7 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void { php_stream_mmap_range *range = (php_stream_mmap_range*)ptrparam; int prot, flags; - + switch (value) { case PHP_STREAM_MMAP_SUPPORTED: return fd == -1 ? PHP_STREAM_OPTION_RETURN_ERR : PHP_STREAM_OPTION_RETURN_OK; @@ -793,7 +793,7 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void return ftruncate(fd, new_size) == 0 ? PHP_STREAM_OPTION_RETURN_OK : PHP_STREAM_OPTION_RETURN_ERR; } } - + default: return PHP_STREAM_OPTION_RETURN_NOTIMPL; } @@ -866,7 +866,7 @@ static php_stream *php_plain_files_dir_opener(php_stream_wrapper *wrapper, char if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path TSRMLS_CC)) { return NULL; } - + dir = VCWD_OPENDIR(path); #ifdef PHP_WIN32 @@ -884,7 +884,7 @@ static php_stream *php_plain_files_dir_opener(php_stream_wrapper *wrapper, char if (stream == NULL) closedir(dir); } - + return stream; } /* }}} */ @@ -932,7 +932,7 @@ PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, cha return ret; } } - + fd = open(realpath, open_flags, 0666); if (fd != -1) { @@ -1001,9 +1001,12 @@ static php_stream *php_plain_files_stream_opener(php_stream_wrapper *wrapper, ch static int php_plain_files_url_stater(php_stream_wrapper *wrapper, char *url, int flags, php_stream_statbuf *ssb, php_stream_context *context TSRMLS_DC) { + char *p; - if (strncmp(url, "file://", sizeof("file://") - 1) == 0) { - url += sizeof("file://") - 1; + if ((p = strstr(url, "://")) != NULL) { + if (p < strchr(url, '/')) { + url = p + 3; + } } if (php_check_open_basedir_ex(url, (flags & PHP_STREAM_URL_STAT_QUIET) ? 0 : 1 TSRMLS_CC)) { @@ -1032,7 +1035,9 @@ static int php_plain_files_unlink(php_stream_wrapper *wrapper, char *url, int op int ret; if ((p = strstr(url, "://")) != NULL) { - url = p + 3; + if (p < strchr(url, '/')) { + url = p + 3; + } } if (php_check_open_basedir(url TSRMLS_CC)) { @@ -1074,11 +1079,15 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, char *url_from, c #endif if ((p = strstr(url_from, "://")) != NULL) { - url_from = p + 3; + if (p < strchr(url_from, '/')) { + url_from = p + 3; + } } if ((p = strstr(url_to, "://")) != NULL) { - url_to = p + 3; + if (p < strchr(url_to, '/')) { + url_to = p + 3; + } } if (php_check_open_basedir(url_from TSRMLS_CC) || php_check_open_basedir(url_to TSRMLS_CC)) { @@ -1144,7 +1153,9 @@ static int php_plain_files_mkdir(php_stream_wrapper *wrapper, char *dir, int mod char *p; if ((p = strstr(dir, "://")) != NULL) { - dir = p + 3; + if (p < strchr(dir, '/')) { + dir = p + 3; + } } if (!recursive) { @@ -1169,7 +1180,7 @@ static int php_plain_files_mkdir(php_stream_wrapper *wrapper, char *dir, int mod } if (p && dir_len == 1) { - /* buf == "DEFAULT_SLASH" */ + /* buf == "DEFAULT_SLASH" */ } else { /* find a top level directory we need to create */ @@ -1273,7 +1284,9 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, char *url, int #endif if ((p = strstr(url, "://")) != NULL) { - url = p + 3; + if (p < strchr(url, '/')) { + url = p + 3; + } } if (php_check_open_basedir(url TSRMLS_CC)) { @@ -1409,7 +1422,7 @@ not_relative_path: return php_stream_fopen_rel(filename, mode, opened_path, options); } - + #ifdef PHP_WIN32 if (IS_SLASH(filename[0])) { size_t cwd_len; @@ -1417,17 +1430,17 @@ not_relative_path: cwd = virtual_getcwd_ex(&cwd_len TSRMLS_CC); /* getcwd() will return always return [DRIVE_LETTER]:/) on windows. */ *(cwd+3) = '\0'; - + if (snprintf(trypath, MAXPATHLEN, "%s%s", cwd, filename) >= MAXPATHLEN) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s/%s path was truncated to %d", cwd, filename, MAXPATHLEN); } - + free(cwd); - + if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(trypath TSRMLS_CC)) { return NULL; } - + return php_stream_fopen_rel(trypath, mode, opened_path, options); } #endif @@ -1479,7 +1492,7 @@ not_relative_path: if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir_ex(trypath, 0 TSRMLS_CC)) { goto stream_skip; } - + stream = php_stream_fopen_rel(trypath, mode, opened_path, options); if (stream) { efree(pathbuf); diff --git a/main/streams/streams.c b/main/streams/streams.c index e9c2e0732..40b18e9f5 100755..100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -470,11 +470,6 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov while (zend_list_delete(stream->rsrc_id) == SUCCESS) {} } - /* Remove stream from any context link list */ - if (context && context->links) { - php_stream_context_del_link(context, stream); - } - if (close_options & PHP_STREAM_FREE_CALL_DTOR) { if (release_cast && stream->fclose_stdiocast == PHP_STREAM_FCLOSE_FOPENCOOKIE) { /* calling fclose on an fopencookied stream will ultimately @@ -1060,9 +1055,17 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re if (has_delim) { /* search for delimiter, but skip buffered_len (the number of bytes * buffered before this loop iteration), as they have already been - * searched for the delimiter */ + * searched for the delimiter. + * The left part of the delimiter may still remain in the buffer, + * so subtract up to <delim_len - 1> from buffered_len, which is + * the ammount of data we skip on this search as an optimization + */ found_delim = _php_stream_search_delim( - stream, maxlen, buffered_len, delim, delim_len TSRMLS_CC); + stream, maxlen, + buffered_len >= (delim_len - 1) + ? buffered_len - (delim_len - 1) + : 0, + delim, delim_len TSRMLS_CC); if (found_delim) { break; } @@ -2180,10 +2183,6 @@ PHPAPI void php_stream_context_free(php_stream_context *context) php_stream_notification_free(context->notifier); context->notifier = NULL; } - if (context->links) { - zval_ptr_dtor(&context->links); - context->links = NULL; - } efree(context); } @@ -2246,66 +2245,6 @@ PHPAPI int php_stream_context_set_option(php_stream_context *context, } return zend_hash_update(Z_ARRVAL_PP(wrapperhash), (char*)optionname, strlen(optionname)+1, (void**)&copied_val, sizeof(zval *), NULL); } - -PHPAPI int php_stream_context_get_link(php_stream_context *context, - const char *hostent, php_stream **stream) -{ - php_stream **pstream; - - if (!stream || !hostent || !context || !(context->links)) { - return FAILURE; - } - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(context->links), (char*)hostent, strlen(hostent)+1, (void**)&pstream)) { - *stream = *pstream; - return SUCCESS; - } - return FAILURE; -} - -PHPAPI int php_stream_context_set_link(php_stream_context *context, - const char *hostent, php_stream *stream) -{ - if (!context) { - return FAILURE; - } - if (!context->links) { - ALLOC_INIT_ZVAL(context->links); - array_init(context->links); - } - if (!stream) { - /* Delete any entry for <hostent> */ - return zend_hash_del(Z_ARRVAL_P(context->links), (char*)hostent, strlen(hostent)+1); - } - return zend_hash_update(Z_ARRVAL_P(context->links), (char*)hostent, strlen(hostent)+1, (void**)&stream, sizeof(php_stream *), NULL); -} - -PHPAPI int php_stream_context_del_link(php_stream_context *context, - php_stream *stream) -{ - php_stream **pstream; - char *hostent; - int ret = SUCCESS; - - if (!context || !context->links || !stream) { - return FAILURE; - } - - for(zend_hash_internal_pointer_reset(Z_ARRVAL_P(context->links)); - SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(context->links), (void**)&pstream); - zend_hash_move_forward(Z_ARRVAL_P(context->links))) { - if (*pstream == stream) { - if (SUCCESS == zend_hash_get_current_key(Z_ARRVAL_P(context->links), &hostent, NULL, 0)) { - if (FAILURE == zend_hash_del(Z_ARRVAL_P(context->links), (char*)hostent, strlen(hostent)+1)) { - ret = FAILURE; - } - } else { - ret = FAILURE; - } - } - } - - return ret; -} /* }}} */ /* {{{ php_stream_dirent_alphasort |