Ard Biesheuvel
8312836c74
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-20 16:42:12 -07:00
Ard Biesheuvel
7958793342
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-20 16:40:02 -07:00
Ard Biesheuvel
e64da8c20d
Fixed bug #66242 (don't assume char is signed)
...
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
2014-09-20 16:39:48 -07:00
Anatol Belski
b9677d313d
avoid strlen usage in loop
2014-09-20 20:05:27 +02:00
Anatol Belski
132cd8be0d
Merge branch 'pull-request/805'
...
* pull-request/805:
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
2014-09-20 19:46:44 +02:00
Florian MARGAINE
8ad996da17
Reverts some unwanted changes
2014-09-20 18:24:38 +02:00
Anatol Belski
763bfb4f3b
refixed printf fmt, used portable macros
2014-09-20 15:46:19 +02:00
Anatol Belski
1b3569235a
forked bug41655 test for windows
2014-09-20 15:14:31 +02:00
Florian MARGAINE
8eb7e7bf7f
Merge branch 'master' into issue-67910
...
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
Florian MARGAINE
58ed832fc9
Deletes patch leftovers
2014-09-20 10:03:54 +02:00
Florian MARGAINE
cf0303e782
Replaces php5 with php7, without whitespace changes.
2014-09-20 10:01:44 +02:00
Anatol Belski
3abeb2c8e1
reduce the struct size by 8 byte on 64 bit
2014-09-20 01:43:04 +02:00
Nikita Popov
0cd982f15c
Make header C++ compatible
2014-09-19 23:54:58 +02:00
Nikita Popov
31e842472f
Make number printing functions less generic
...
Now that zend_ulong is 64bit on 64bit platforms, it should be
sufficient to always use it, rather than supporting multiple
types.
API changes:
* _zend_print_unsigned_to_buf and _zend_print_signed_to_buf
no longer exist.
* smart_str(ing)_print_long and smart_str(ing)_print_unsigned
no longer exist.
* Instead of all these, zend_print_ulong_to_buf and
zend_print_long_to_buf should be used.
* smart_str_append_generic_ex no longer exists.
* smart_str(ing)_append_off_t(_ex) no longer exists, use
smart_str(ing)_append_long(_ex) instead.
2014-09-19 23:39:07 +02:00
Nikita Popov
ad3e1830ba
Use append_unsigned instead of append_long where appropriate
2014-09-19 23:39:07 +02:00
Nikita Popov
37aaccad7d
Use inline functions for most of smart_str
...
smart_str_free_ex no longer exists, always use smart_str_free instead.
smart_str_alloc no longer requires a newlen variable to be in scope,
instead it returns the new length.
2014-09-19 23:39:07 +02:00
Nikita Popov
070667de8d
Remove SMART_STR_USE_REALLOC
2014-09-19 23:39:07 +02:00
Anatol Belski
f6c02239ca
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix possible array underflow
Conflicts:
ext/standard/image.c
2014-09-19 20:15:56 +02:00
Anatol Belski
6213d9fc91
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix possible array underflow
2014-09-19 20:13:46 +02:00
Anatol Belski
5d9403f56c
fix possible array underflow
...
there are multiple issues with this code
- php_stream_read() returns an unsigned val, so is >= 0
- if it read less than sizeof(a) bytes, the function operates on garbage
- result->channels is an unsigned val, so >= 0
2014-09-19 20:12:24 +02:00
Anatol Belski
2be8fdcfd6
updated the comment to charset_hint
2014-09-19 19:45:38 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Anatol Belski
469c9bdb39
simplify condition
2014-09-19 16:30:01 +02:00
Dmitry Stogov
bccc653185
Avoid double IS_INTERNED() check
2014-09-19 17:32:50 +04:00
Dmitry Stogov
3bc8a958c5
Fixed useless or duplicated IS_INTERNED() checks
2014-09-19 15:41:01 +04:00
Anatol Belski
d8de53d498
avoid unnecessary strlen calls in loop
2014-09-19 12:36:23 +02:00
Anatol Belski
ede6eca2b2
fix signed/unsigned warning and add a note
2014-09-19 12:00:41 +02:00
Anatol Belski
9b7d255cd9
fix condition
2014-09-19 11:42:44 +02:00
Anatol Belski
bf7203e1e0
fix empty string check
2014-09-19 11:23:23 +02:00
Anatol Belski
953386edfd
fix an always true condition and improve the error check
2014-09-19 10:33:01 +02:00
Anatol Belski
bae92295fd
remove useless condition
2014-09-19 10:09:37 +02:00
Anatol Belski
79bb2a1474
fix conditions
2014-09-19 09:49:32 +02:00
Anatol Belski
6fab907920
there can be only one ... of the identical expressions
2014-09-19 09:26:07 +02:00
Anatol Belski
f25f672916
fix condition
2014-09-19 09:09:20 +02:00
Anatol Belski
4d60f23630
fix printf format
2014-09-19 08:44:35 +02:00
Anatol Belski
571537afe0
remove useless check
2014-09-19 08:35:01 +02:00
Anatol Belski
55d5bace0e
more usages for ZEND_SECURE_ZERO()
2014-09-19 01:59:55 +02:00
Anatol Belski
c45f4f5461
generalized the case with secure memory zeroing
2014-09-19 01:46:14 +02:00
Anatol Belski
adf753159b
remove useless condition 0 > unsigned
2014-09-19 00:06:40 +02:00
Anatol Belski
4722d85c1e
zero sensitive data more secure way
2014-09-19 00:06:38 +02:00
Anatol Belski
bb89ac8408
zero sensitive data more secure way
2014-09-19 00:06:37 +02:00
Anatol Belski
732c49b433
fix sprintf format
2014-09-19 00:06:35 +02:00
Anatol Belski
2b77a57d88
zero sensitive data more secure way
2014-09-19 00:06:34 +02:00
Anatol Belski
3fa5064173
remove useless check
2014-09-19 00:06:32 +02:00
Anatol Belski
6beb91c202
avoid repeated strlen usage
2014-09-19 00:06:30 +02:00
Nikita Popov
8a9dd4a1d7
Fix GMP serialization
...
Also fix same issue in PDO.
2014-09-18 23:03:27 +02:00
Anatol Belski
c18902d902
reduce struct size by 8 byte on 64 bit
2014-09-17 09:17:34 +02:00
Anatol Belski
42fca62326
improve empty string check
2014-09-17 09:16:59 +02:00
Anatol Belski
2ace2d1b8a
reduce struct size by 8 byte on 64 bit
2014-09-17 09:16:00 +02:00
Anatol Belski
efc12d468c
reduce the struct size by 8 byte on 64 bit
2014-09-17 09:10:26 +02:00
Anatol Belski
19f8217113
reduce struct size by 8 byte on 64 bit
2014-09-17 09:03:47 +02:00
Anatol Belski
d41ac22a54
avoid strlen() usage in the loop
2014-09-17 08:59:19 +02:00
Anatol Belski
d594809f27
fix printf fmt
2014-09-17 00:56:42 +02:00
Anatol Belski
dda7a01480
fix signed/unsigned mismatch
2014-09-17 00:56:40 +02:00
Anatol Belski
f2e728616c
fix signed/unsigned mismatch warnings
2014-09-17 00:56:38 +02:00
Dmitry Stogov
551ee4165b
Use runtime-cache to avoid hash lookups in BIND_GLOBAL instruction
2014-09-17 00:52:45 +04:00
Anatol Belski
7ba43ea052
fix signed/unsigned mismatch
2014-09-16 22:15:27 +02:00
Anatol Belski
8c4ab0d02e
fix signed/unsigned mismatch
2014-09-16 21:17:27 +02:00
Anatol Belski
fc6f7bfcf3
fix signed/unsigned mismatch
2014-09-16 21:17:25 +02:00
Anatol Belski
5777aa51d9
fix signed/unsigned mismatch
2014-09-16 21:17:24 +02:00
Anatol Belski
95132bee40
redo the fix casting to size_t
2014-09-16 21:17:21 +02:00
Anatol Belski
49a6b485a0
redo the fix casting to size_t where applicable
2014-09-16 21:17:19 +02:00
Anatol Belski
db24742f01
fixed type
2014-09-16 21:17:18 +02:00
Anatol Belski
fba6e5a8cb
fix signed/unsigned mismatch warnings
2014-09-16 21:17:16 +02:00
Anatol Belski
8240255e37
fixed signed/unsigned mismatch warning
2014-09-16 21:17:15 +02:00
Dmitry Stogov
f469dc7429
Improve opcache.fast_shutdown
2014-09-16 15:28:46 +04:00
Matteo Beccati
2508ce7aef
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed freetype test on multiple environments
2014-09-16 10:23:03 +02:00
Matteo Beccati
24ed330a22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed freetype test on multiple environments
2014-09-16 10:22:49 +02:00
Matteo Beccati
b8470e19e4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed freetype test on multiple environments
2014-09-16 10:22:34 +02:00
Matteo Beccati
00525b824a
Fixed freetype test on multiple environments
...
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)
This reverts commit 592df89027
.
2014-09-16 10:19:29 +02:00
Nikita Popov
079409bbc2
Switch (un)mangle property name to size_t and zend_string
...
Also use the _ex variants where possible.
2014-09-16 00:31:27 +02:00
Anatol Belski
8b2f15551d
fix signed/unsigned mismatch warnings
2014-09-15 19:46:33 +02:00
Anatol Belski
066d39020b
fix types
2014-09-15 19:46:32 +02:00
Anatol Belski
e591c78d09
revamp serialization to work with size_t for Serializable
2014-09-15 19:46:28 +02:00
Anatol Belski
172ca172d1
correct fix to the natcmp_ex
...
Till now the actualy length diff between the strings was under
circumstances returned. Whereby for a compare function only return
values of (1, 0, -1) make sense. Thus the old behavior isn't
present anymore, natcmp_ex now behaves as a standard compare function.
2014-09-15 12:58:46 +02:00
Anatol Belski
4c496a7f5b
fix signature
2014-09-15 11:30:25 +02:00
Anatol Belski
e056d52acf
fix type
2014-09-15 11:30:23 +02:00
Anatol Belski
140d99b467
fix condition
2014-09-15 11:30:22 +02:00
Anatol Belski
d65ead6471
fix type
2014-09-15 10:43:39 +02:00
Anatol Belski
32c46f44a8
avoid strlen usage in the loop
2014-09-15 00:39:55 +02:00
Anatol Belski
635a23128b
better way to check for empty string
2014-09-14 22:07:38 +02:00
Anatol Belski
a7482fd2bf
make xml_utf8_ encode/decode work with size_t
2014-09-14 21:38:46 +02:00
Anatol Belski
ad9dc75150
avoid strlen() usage in loop
2014-09-14 17:00:06 +02:00
Anatol Belski
29f8b21cd7
fix int overflow preserving the old behavior
2014-09-14 16:39:25 +02:00
Nikita Popov
ebc6da5628
zend_get_property_info takes a zend_string* now
2014-09-14 16:18:08 +02:00
Anatol Belski
734d0b6bfd
use nice way to achieve the property name length
2014-09-14 15:09:54 +02:00
Anatol Belski
454548e440
make it safer for an array underrun
2014-09-14 15:03:52 +02:00
Anatol Belski
b6b376efe5
avoid repeated strlen() usage
2014-09-14 12:59:31 +02:00
Anatol Belski
f1ba5389cd
reduce struct size by 8 bytes on 64 bit
2014-09-14 12:32:38 +02:00
Anatol Belski
0b40abf41d
avoid repeated strlen() usage
2014-09-14 12:30:01 +02:00
Anatol Belski
cbf530c7c0
fix possible pointer truncation
2014-09-14 12:18:52 +02:00
Anatol Belski
8d075b6e4d
better way to zero away sensitive data
...
memset could be optimized away by the compiler
2014-09-14 11:48:51 +02:00
Anatol Belski
041302a8f7
reduce struct size by 8 byte on 64 bit
2014-09-14 11:36:11 +02:00
Anatol Belski
a9c188fbc6
reduce struct size by 8 byte on 64 bit
2014-09-14 11:26:17 +02:00
Anatol Belski
101adecbcd
reduce struct sizes by 8 bytes each on 64 bit
2014-09-14 11:13:17 +02:00
Anatol Belski
34e39783b1
remove useless casts and checks
2014-09-14 11:00:22 +02:00
Anatol Belski
77137b56b8
align 4 byte to the start of the word
2014-09-14 10:27:00 +02:00
Anatol Belski
ea4ab02446
fix conditions
...
substraction from an unsigned
2014-09-14 10:24:10 +02:00
Anatol Belski
65100a6474
reduce the struct size by 8 byte on 64 bit
2014-09-14 09:40:56 +02:00
Anatol Belski
27d0cfb8a7
reduce the struct size by 8 byte on 64 bit
2014-09-14 09:25:09 +02:00
Anatol Belski
273763dd63
reduce the struct size by 8 byte on 64 bit
2014-09-14 09:22:02 +02:00
Anatol Belski
cac71ecc93
reduce the struct size by 8 byte on 64 bit
2014-09-14 01:22:55 +02:00
Anatol Belski
35a2937e6b
reduce the struct size by 8 byte on 64 bit
2014-09-14 01:12:12 +02:00
Anatol Belski
b056859d17
reduce the struct size by 8 byte on 64 bit
2014-09-14 00:59:46 +02:00
Anatol Belski
79f51bd1a0
use the generator to produce the header
2014-09-14 00:43:58 +02:00
Anatol Belski
da10603ec9
update the html table generator
2014-09-14 00:42:48 +02:00
Anatol Belski
26cf7df133
removed the emalloc result check, out of memory will bailout
2014-09-14 00:00:52 +02:00
Anatol Belski
7d194a0e0b
replaced the check with assert as it's kinda unusual case
2014-09-13 23:57:53 +02:00
Anatol Belski
87a5aae166
removed extra 1 byte member, padding will be done anyway by the compiler
2014-09-13 23:55:30 +02:00
Anatol Belski
49e78dd022
reduce struct size by 8 byte on 64 bit
2014-09-13 23:34:08 +02:00
Anatol Belski
760c51a644
avoid usage of strlen() in the loop
2014-09-13 23:21:53 +02:00
Anatol Belski
a32e493d84
reduce struct size by 8 byte on 64 bit
2014-09-13 23:21:52 +02:00
Anatol Belski
2c66a8c53e
better align reduce the struct size by 8 byte on 64 bit
2014-09-13 23:21:51 +02:00
Anatol Belski
58177c27d6
reduce the struct size (under circumstances) on 64 bit
2014-09-13 23:21:49 +02:00
Anatol Belski
a7690fea7a
check if the winver was indeed fetched
2014-09-13 23:21:48 +02:00
Anatol Belski
bce562b75e
check emalloc() result
2014-09-13 23:21:47 +02:00
Anatol Belski
e00d48490b
better way to check for an empty string
2014-09-13 23:21:46 +02:00
Anatol Belski
f357628fc9
reduce the union size from 24 to 16 bytes on 64 bit
2014-09-13 23:21:44 +02:00
Anatol Belski
be9408f71a
fix condition
...
comparsion of two unsigned
2014-09-13 23:21:43 +02:00
Anatol Belski
47fb7a46ac
reduced struct sizes by 8 byte each on 64 bit
2014-09-13 23:21:39 +02:00
Anatol Belski
d578e351a9
fix condition
...
substraction of two unsigned
2014-09-13 23:21:38 +02:00
Anatol Belski
5092c5490a
reduce struct sizes by 8 byte on 64 bit
2014-09-13 23:21:37 +02:00
Anatol Belski
1f9893d0ef
avoid strlen() usage in the loop
2014-09-13 23:21:36 +02:00
Anatol Belski
98aeef6fac
reduced the struct size by 8 byte on 64 bit
2014-09-13 12:49:10 +02:00
Anatol Belski
f8d75839aa
reduce the struct size by 8 byte on 64 bit
2014-09-12 23:27:55 +02:00
Anatol Belski
e251ecb6e9
fix possible null ptr deref
2014-09-12 22:31:02 +02:00
Anatol Belski
7ac5a36a2f
fix possible nullptr derefrence
2014-09-12 22:18:06 +02:00
Anatol Belski
5257ac4925
fix test which fails if prevous run cleanup failed
2014-09-12 21:35:24 +02:00
Anatol Belski
95a50f7322
fix type
2014-09-12 21:35:23 +02:00
Anatol Belski
03bf8c256b
fix type
2014-09-12 21:35:22 +02:00
Anatol Belski
e68788745a
fix type
2014-09-12 21:35:21 +02:00
Anatol Belski
7ea780dd6e
fix type
2014-09-12 21:35:19 +02:00
Anatol Belski
4db2181d4e
make this test a bit more tolerant when checking sleep time
2014-09-12 14:39:19 +02:00
Anatol Belski
99fb5d0ea8
remove extra semicolon
2014-09-12 14:39:18 +02:00
Anatol Belski
0292c34b05
Merge branch 'PHP-5.6'
...
* PHP-5.6:
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
5.6.2 now
Conflicts:
configure.in
main/php_version.h
2014-09-11 23:33:12 +02:00
Anatol Belski
13280a9e36
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
2014-09-11 23:31:16 +02:00
Anatol Belski
69ea7f9509
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
2014-09-11 23:30:01 +02:00
Nikita Popov
fca85d92cc
Fix ext/dba ini handling
...
Doing this change blindly based on gcov output
2014-09-11 16:06:31 +02:00
Nikita Popov
e2d4d700cf
Fix yy_limit computation after encoding switch
...
The three assignments above this line are still broken - they assume
that byte offsets in one encoding directly map to byte offsets in
another encoding.
I'm fixing the length here because it is the one causing out-of-bounds
reads and is easy to fix. For the others we'd have to actually compute
new offsets.
2014-09-11 14:52:59 +02:00
Nikita Popov
f017843df3
Remove self-contradictory zend multibyte assertion
...
Code that explicitly exists to handle an incompatible internal
encoding should not assert that the internal encoding is compatible.
2014-09-11 14:52:59 +02:00
Dmitry Stogov
82096dc151
Removed ZEND_QM_ASSIGN_VAR and ZEND_JMP_SET_VAR opcodes (in PHPNG they did exacly the same as ZEND_QM_ASSIGN and ZEND_JMP_SET)
2014-09-11 12:29:54 +04:00
Dmitry Stogov
1981dd9c73
Revert "Removing ext/ereg and dependencies"
...
This reverts commit 86de7963fe
.
2014-09-11 11:06:57 +04:00
Tjerk Meesters
86de7963fe
Removing ext/ereg and dependencies
...
Affected extensions:
- opcache (use pcre)
- mbstring (removed ereg functions overloading)
- pgsql (use pcre)
- reflection (test cases using 'ereg')
SAPI:
- apache (header only)
- apache_hooks (header only)
2014-09-11 10:22:44 +08:00
Anatol Belski
e699f654f0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix precision when fetching float through mysqlnd
2014-09-10 19:32:25 +02:00
Anatol Belski
0b89bb83ba
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix precision when fetching float through mysqlnd
2014-09-10 19:31:59 +02:00
Anatol Belski
dff820cea3
fix precision when fetching float through mysqlnd
...
fixes failing ext/mysqli/tests/010.phpt
2014-09-10 19:29:11 +02:00
Anatol Belski
466a4c97b2
replace zend_hash_find with zend_hash_str_find which fixes leaking the key
2014-09-10 13:22:23 +02:00
Anatol Belski
e3ded277a5
second big shot on porting ext/oci8
...
still a lot to do, but most raw things done
2014-09-10 12:41:43 +02:00
Anatol Belski
686213a242
first shot on fixing ext/oci8
2014-09-10 12:41:42 +02:00
Anatol Belski
2e085df5c0
basic datatype fixes for ext/oci8
2014-09-10 12:41:41 +02:00
Matteo Beccati
205b6b8a13
Merge branch 'PHP-5.6'
...
* PHP-5.6:
FR #67990 - Added nowait argument to sem_acquire
2014-09-10 07:32:36 +02:00
Matteo Beccati
0b648a424f
FR #67990 - Added nowait argument to sem_acquire
2014-09-10 07:31:25 +02:00
Daniel Lowrey
13695a5ead
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Bug #41631 : Fix regression from first attempt (6569db8
)
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 10:25:36 -06:00
Daniel Lowrey
edb2799333
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #41631 : Fix regression from first attempt (6569db8
)
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 10:24:40 -06:00
Daniel Lowrey
bf2f80b223
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #41631 : Fix regression from first attempt (6569db8
)
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 09:27:20 -06:00
Daniel Lowrey
372844918a
Bug #41631 : Fix regression from first attempt ( 6569db8
)
2014-09-09 09:01:42 -06:00
Daniel Lowrey
f86b2193a4
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 07:37:57 -06:00
Dmitry Stogov
a9d985263a
We don't need to check for xlat entry twice
2014-09-09 00:40:14 +04:00
Dmitry Stogov
c59300ac86
Fixed GC problem (arrays may be recorded as possible root of garbage cycle. we have to clear this info before deleting array)
2014-09-09 00:12:36 +04:00
Adam Harvey
d91717f458
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
5.5.18 now
2014-09-08 19:31:58 +00:00
Adam Harvey
0cbfdc9df5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
5.5.18 now
Conflicts:
configure.in
main/php_version.h
2014-09-08 19:28:15 +00:00
Adam Harvey
bc44eb6172
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
...
SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
2014-09-08 19:25:14 +00:00
Anatol Belski
5661a1ba0b
fix null pointer deref
2014-09-07 20:26:01 +02:00
Anatol Belski
e254ba32d5
fixed the tests, related to the basename behaviour, bug #66395
2014-09-07 20:11:49 +02:00
Nikita Popov
f4f9b54983
Revert "Move safe_address into zend_multiply.h"
...
This reverts commit 43b02e169c
.
I'm getting symbol resolution issues for zend_error_noreturn in the
opcache.so, so reverting this for now.
2014-09-06 22:12:37 +02:00
Nikita Popov
43b02e169c
Move safe_address into zend_multiply.h
...
This allows reuse in zend_arena_calloc.
Also renamed the function to zend_safe_address as it's no longer
private to the allocator.
2014-09-06 14:03:59 +02:00
Nikita Popov
9ab8605f8b
Release memory for PDO Stmt ctor args
2014-09-06 12:52:51 +02:00
Nikita Popov
17cb2443a7
Fix ext/xml warnings
2014-09-06 12:26:41 +02:00
Nikita Popov
e06f5f0df8
Drop some unsafe-looking casting code from ext/socket
...
ZVAL_COPY before convert_to_string is probably not right.
2014-09-05 11:35:41 +02:00
Nikita Popov
c48a126ba4
Fix readline warnings
2014-09-05 11:20:06 +02:00
Nikita Popov
c720677162
Fix SOAP warnings
2014-09-05 11:20:06 +02:00
Xinchen Hui
8002e2c06a
Fixed discards qualifiers from pointer target type
2014-09-05 09:31:05 +08:00
Xinchen Hui
59f10e4ca0
Merge branch 'master' of https://git.php.net/repository/php-src
2014-09-05 09:22:23 +08:00
Nikita Popov
e015bb0381
Fix invalid zend_string free in soap
...
By making get_http_headers() return the zend_string* directly.
2014-09-04 22:29:30 +02:00
Nikita Popov
0c5ac39796
Fix smart_str_append()
...
Would segfault if src->s == NULL.
2014-09-04 21:55:27 +02:00
Nikita Popov
00805ffb92
Merge branch 'PHP-5.6'
...
Conflicts:
ext/soap/php_http.c
2014-09-04 21:23:11 +02:00
Nikita Popov
03797a73b2
Split GMP tests testing multiple functions
...
Also drop dummy test
2014-09-04 21:18:37 +02:00
Nikita Popov
9586b15229
Give proper names to GMP test files
2014-09-04 21:10:41 +02:00
Nikita Popov
15c139b99a
Throw warnings when using zero modulus in gmp_powm
...
Also fixes a leak in this case.
2014-09-04 20:55:09 +02:00
Tjerk Meesters
6f6541dc84
Merge branch 'pr/804'
...
* pr/804:
Adds phpversion test to prevent #67959
2014-09-05 02:17:42 +08:00
Florian MARGAINE
e338e26ab7
Adds phpversion test to prevent #67959
2014-09-04 20:13:43 +02:00
Nikita Popov
f10d194c8c
Add GMP tests for some uncovered branches
2014-09-04 20:03:29 +02:00
Tjerk Meesters
6951f8adb0
Merge branch 'pr/803'
...
* pr/803:
Fixes zpp parameter from int to size_t
2014-09-05 02:02:20 +08:00
Florian MARGAINE
c24c7ff224
Fixes zpp parameter from int to size_t
2014-09-04 19:59:39 +02:00
Xinchen Hui
bb92801338
it's should be zend_ulong
2014-09-04 16:26:53 +08:00
Xinchen Hui
39c3207896
Revert previous commit by mistake
2014-09-04 11:59:58 +08:00
Xinchen Hui
e90ec235dc
Use PHP_GINIT to suppress incompatible pointer type
2014-09-04 11:56:13 +08:00
Tjerk Meesters
fa08ff9245
Fixed #67955 : SoapClient prepends 0-byte to cookie names
2014-09-04 06:58:04 +08:00
Nikita Popov
d85ab21ac4
Fix DOM warnings
2014-09-03 21:35:53 +02:00
Nikita Popov
2b133e9149
Separate php_mb_reset() from php_mblen()
...
Instead of fighting against warnings ...
2014-09-03 20:37:04 +02:00
Nikita Popov
dd38c9e101
Fix ftp_login()
2014-09-03 16:52:56 +02:00
Dmitry Stogov
5c897aa7da
Preallocate hash tables of required size
2014-09-03 18:21:36 +04:00
Nikita Popov
6cceb54c09
Fix a number of format issues
2014-09-03 15:57:28 +02:00
Philip Hofstetter
9befa8c5f7
fix bug #67955
...
this fixes a regression from 6c2a806820
.
smart_str_appendl is expecting the length as the length of the string,
but key_length is the byte length of the key, including the 0
terminator.
As such, the cookie name appeneded to the header would now also include
the 0 terminator of the key name which then would be sent to the server.
2014-09-03 14:35:40 +02:00
Matteo Beccati
d1b0066df7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed test with freetype >= 2.4.12
2014-09-03 09:45:17 +02:00
Matteo Beccati
627704b38e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test with freetype >= 2.4.12
2014-09-03 09:45:09 +02:00
Matteo Beccati
72c9b0e12b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test with freetype >= 2.4.12
2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027
Fixed test with freetype >= 2.4.12
2014-09-03 09:43:29 +02:00
Nikita Popov
2d364747ca
Merge branch 'PHP-5.6'
...
Conflicts:
ext/gmp/gmp.c
2014-09-02 19:07:54 +02:00
Nikita Popov
834daa455b
Fixed bug #50175
...
0x and 0b prefix is now only handled if either no base is given
or if the base is 16 (0x) or 2 (0b). Always handling it is incorrect
because 0x and 0b are perfectly valid numbers in other bases.
2014-09-02 19:04:55 +02:00
Nikita Popov
7533243f0c
Fix C89 build and small cleanup
2014-09-02 18:52:13 +02:00
Nikita Popov
5138f3ba22
Skip 64bit test on 32bit
...
Also minor type improvements
2014-09-02 18:42:39 +02:00
Anatol Belski
08b732f26b
fix datatypes for gmp to be compatible with GMP/MPIR on different platforms
2014-09-02 18:19:51 +02:00
Anatol Belski
e7386aa1fd
add a test with gmp and PHP_INT_MAX
2014-09-02 18:16:19 +02:00
Anatol Belski
20e15f55e8
one semicolon too much
2014-09-02 16:40:41 +02:00
Anatol Belski
fee39d0868
fix type
2014-09-02 15:56:13 +02:00
Nikita Popov
e3da88b898
mpz functions don't work on zend_ulongs...
...
If we really want to support zend_ulong > ulong in GMP the right
approach would be to only handle < LONG_MAX in ui shortcut functions
and use mpz_import in convert_to_gmp for number > LONG_MAX.
2014-09-02 14:37:15 +02:00
Nikita Popov
8e7cd7a0f9
Merge branch 'PHP-5.6'
...
Conflicts:
ext/gmp/gmp.c
2014-09-02 14:28:07 +02:00
Leigh
47d630e7f0
Implement gmp_import() and gmp_export()
2014-09-02 14:19:18 +02:00
Dmitry Stogov
e51677b2e6
fixed reference counting
2014-09-02 11:24:52 +04:00
Dmitry Stogov
1670772dc6
Avoid string duplication
2014-09-02 09:52:23 +04:00
Tjerk Meesters
297a9b1f75
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Make DOMNode::textContent writeable
Updated UPGRADING
Updated NEWS
Conflicts:
ext/dom/attr.c
ext/dom/characterdata.c
ext/dom/document.c
ext/dom/node.c
2014-09-02 06:54:52 +08:00
Tjerk Meesters
f54451cf39
Make DOMNode::textContent writeable
2014-09-02 06:34:18 +08:00
Anatol Belski
481bf25b6a
restore the length var and fix the com_dotnet ini
2014-09-01 20:34:33 +02:00
Dmitry Stogov
88d7ca44f6
Refactored INI subsystem to use zend_string* instead of char*
2014-09-01 20:57:33 +04:00
Derick Rethans
b9f3247267
Merge branch 'PHP-5.6'
2014-09-01 16:40:57 +01:00
Derick Rethans
f89b7ec389
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-01 16:40:54 +01:00
Derick Rethans
21446cd7b6
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-01 16:40:50 +01:00
Derick Rethans
e665a07ab9
- Updated to version 2014.7 (2014g)
2014-09-01 16:40:49 +01:00
Tjerk Meesters
5d5a7b1f7f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated UPGRADING for #38409
Updated NEWS for #38409
Added test case
Making ini parser typed - Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file() - Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE - Added zend_ini_copy_typed_value() function for zval initialisation - Updated RETURN_TOKEN() to observe scanner_mode
Conflicts:
Zend/zend_ini_parser.y
Zend/zend_ini_scanner.c
2014-09-01 22:43:17 +08:00
Tjerk Meesters
1bf996b324
Added test case
2014-09-01 22:04:25 +08:00
Tjerk Meesters
5270ee1aef
Making ini parser typed
...
- Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file()
- Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE
- Added zend_ini_copy_typed_value() function for zval initialisation
- Updated RETURN_TOKEN() to observe scanner_mode
2014-09-01 22:04:06 +08:00
Anatol Belski
f4ed876db1
fix acosh for vs2012 and earlier
2014-09-01 15:34:42 +02:00
Anatol Belski
3aa5583cab
fix asinh() on win64 for big negative values
2014-09-01 15:34:40 +02:00
Anatol Belski
a3f82ae0ee
fix expected warning in test
2014-08-31 14:02:31 +02:00
Anatol Belski
b89d7ae5ba
fix dir separators in test
2014-08-31 14:02:30 +02:00
Anatol Belski
312181bc13
fix iptcembed()
2014-08-31 14:02:28 +02:00
Anatol Belski
f4ebeead5d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
2014-08-30 04:05:42 +02:00
Anatol Belski
c301467f9b
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
2014-08-30 04:04:42 +02:00
Johannes Schlüter
ca042bb18c
Use global symbol table for completion after $ in readline.
2014-08-30 00:02:31 +02:00
Nikita Popov
f1c2017851
Don't depend on exact parse error messages in assert tests
2014-08-29 22:07:25 +02:00
Christopher Jones
e39cc57bbd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Remove 550+ compile warnings on OS X
2014-08-29 08:48:56 -07:00
Christopher Jones
6fe0bdda9c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove 550+ compile warnings on OS X
2014-08-29 08:48:43 -07:00
Christopher Jones
9063188fad
Remove 550+ compile warnings on OS X
...
The warnings had the signature:
php-src/ext/mysqlnd/mysqlnd_debug.h:127:25: note: expanded from macro 'DBG_ENTER_EX2'
if (dbg_skip_trace); /* shut compiler's mouth */\
^
php-src/ext/mysqlnd/mysqlnd.c:114:2: note: put the semicolon on a separate line to silence this warning
2014-08-29 08:48:10 -07:00
Anatol Belski
a9c5dab1d0
revert the lstat part
2014-08-29 17:21:02 +02:00
Anatol Belski
f9b051241a
fix stat vs zend_stat
2014-08-29 13:43:40 +02:00
Anatol Belski
13ccda7249
fix implicit st_rdev element handling when negative value was passed
2014-08-29 13:30:53 +02:00
Anatol Belski
451856420c
data type fixes
2014-08-29 12:53:37 +02:00
Anatol Belski
e206409a8c
exclude log2 usage which requires C99 support
2014-08-29 10:55:55 +02:00
Anatol Belski
c14b3d5d82
fixed path in test
2014-08-29 08:41:29 +02:00
Xinchen Hui
b2d2b965b2
resource type is int
2014-08-29 11:28:21 +08:00
Andrea Faulds
389d285973
Special-case aliases, add warning comments to implementations
2014-08-29 00:10:52 +02:00
Anatol Belski
5fc0006d35
skip this if we can't check the uid
2014-08-28 22:22:38 +02:00
Anatol Belski
898e1570a2
fixed trim() and strtok() to work with big strings
2014-08-28 21:59:00 +02:00
Anatol Belski
8e05b9104b
fixed strip_tags() and hebrev() to work with big strings
2014-08-28 19:35:37 +02:00
Dmitry Stogov
c8ff3421a0
Duplicate array only if neccessary
2014-08-28 20:51:22 +04:00
Anatol Belski
7faac0267f
Merge branch 'master' of git.php.net:php-src
...
# By Popa Adrian Marius
# Via Popa Adrian Marius
* 'master' of git.php.net:php-src:
rename misleading define
2014-08-28 17:39:03 +02:00
Anatol Belski
f4e04b9fb1
fix phar copy-on-write
2014-08-28 17:35:54 +02:00
Popa Adrian Marius
e41754b7d8
rename misleading define
2014-08-28 18:20:28 +03:00
Anatol Belski
9f1b68eda5
fix incompatible pointer
2014-08-28 17:03:41 +02:00