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
268bcdc1cb
Removes accidentally added files.
2014-09-20 18:27:09 +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
Nikita Popov
98891ee118
Simplify foreach flags
...
* FE_RESET_VARIABLE and FE_RESET_REFERENCE were always set
together.
* In some places the code checked FE_FETCH_BYREF instead of
FE_RESET_REFERENCE and relied on them having the same value.
* Now the FE_RESET_* flags are dropped and everything uses
FE_FETCH_BYREF
2014-09-20 12:56:05 +02:00
Nikita Popov
1027f0d978
Fix leak in foreach with by-ref iteration of ref array
2014-09-20 12:46:05 +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
Xinchen Hui
95836a3504
Avoid strlen usage
2014-09-20 15:27:36 +08:00
Xinchen Hui
7ecc7e6bc2
folder marks
2014-09-20 15:16:09 +08:00
Xinchen Hui
96ccf3ef98
Added missed mod str
2014-09-20 15:12:08 +08:00
Xinchen Hui
3e71f5ff7b
Fixed built on OSX
2014-09-20 13:51:58 +08:00
Johannes Schlüter
972badf764
s,PHP 5,PHP 7,
2014-09-20 03:27:40 +02:00
Johannes Schlüter
ee51c15cf8
Update README.PARAMETER_PARSING_API
2014-09-20 03:05:32 +02:00
Anatol Belski
ea6da30396
make the return value more logic
...
as if clz() were returning 32 on empty size
2014-09-20 02:14:35 +02:00
Anatol Belski
7b4e8c64e0
make use of intrinsics available with VS for bitset lookups
2014-09-20 01:43:06 +02:00
Anatol Belski
2700e248b8
add the missing src file
2014-09-20 01:43:05 +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
Nikita Popov
c7446bbd39
Remove superfluous Z_REFCOUNTED_P check
...
The string is never interned and IS_CONSTANT_EX is always refcounted.
2014-09-19 23:39:06 +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
Nikita Popov
c343ca4efb
Split inheritance into separate file
...
This moves handling of inheritance and interface implementation
from zend_compile.c into a separate zend_inheritance.c file, as
this is not really related to compilation.
2014-09-19 19:54:37 +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
d4c5271c0c
reverted too much
2014-09-19 16:30:06 +02:00
Anatol Belski
d1131d4278
reverted some previous IS_ABSOLUTE_PATH related changes
...
It's fine with strlen usage now, only one call
2014-09-19 16:30:05 +02:00
Anatol Belski
149db936d4
expand IS_ABSOLUTE_PATH on Windows, so then strlen() isn't called twice
2014-09-19 16:30:03 +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
35f8467687
Reverted incorrect chunk
2014-09-19 17:05:03 +04:00
Dmitry Stogov
3bc8a958c5
Fixed useless or duplicated IS_INTERNED() checks
2014-09-19 15:41:01 +04:00
Anatol Belski
3ec7c28084
forgot to replace the strlen call
2014-09-19 13:14:16 +02:00
Anatol Belski
6bbebc60ea
avoid multiple strlen calls for the same buffer
2014-09-19 12:39:17 +02:00
Anatol Belski
d8de53d498
avoid unnecessary strlen calls in loop
2014-09-19 12:36:23 +02:00
Anatol Belski
babcad063f
fix length data types
2014-09-19 12:14:46 +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
c80d9ccf7a
fix printf format
2014-09-19 10:04:12 +02:00
Anatol Belski
79bb2a1474
fix conditions
2014-09-19 09:49:32 +02:00