Ferenc Kovacs
326ab8b147
5.6.0alpha2
2014-02-12 09:45:18 +01:00
Ferenc Kovacs
99bd2fd9c4
Merge branch 'PHP-5.6' into PHP-5.6.0
...
* PHP-5.6: (97 commits)
update the alpha2 release date
Fixed ZTS and added fix to NEWS.
Implemented feature #45528 : Allow the DateTimeZone constructor to accept timezones per offset too.
Rename timelib_get_zone to timelib_parse_zone and export.
fix regex to detect valgrind version New PCRE version got stricter
fix regex to detect valgrind version New PCRE version got stricter
Fixed memory leak in pow operator
5.5.9 now released
Added information in NEWS and UPGRADING
add T_POW (**) operator
add NEWS block for 5.6.0alpha3
updated libs_version.txt
updated libs_version.txt
update libs_version.txt
more tests for ICU >= 52.1 compat
fix tests for ICU >= 52.1
Fix year
adapt test to curl 7.35.0 upgrade
move the NEWS entry into the right section
Fixed SNI failure from missing Z_STRVAL_PP
...
2014-02-12 06:43:05 +01:00
Ferenc Kovacs
06bbfe1e2a
update the alpha2 release date
2014-02-12 06:39:10 +01:00
Derick Rethans
45772c7784
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-02-11 11:31:57 +00:00
Derick Rethans
75f59e148c
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-11 11:31:06 +00:00
Derick Rethans
39e721cf50
Fixed ZTS and added fix to NEWS.
2014-02-11 11:27:01 +00:00
Derick Rethans
9fa6bcd8cb
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-09 15:57:43 -05:00
Derick Rethans
d676396435
Implemented feature #45528 : Allow the DateTimeZone constructor to accept timezones per offset too.
2014-02-09 15:47:48 -05:00
Derick Rethans
e196dce45a
Rename timelib_get_zone to timelib_parse_zone and export.
2014-02-09 15:47:48 -05:00
Nuno Lopes
f46200bcc0
fix regex to detect valgrind version
...
New PCRE version got stricter
2014-02-08 07:06:44 -05:00
Nuno Lopes
62404e767a
fix regex to detect valgrind version
...
New PCRE version got stricter
2014-02-08 06:54:27 -05:00
Bob Weinand
363ff60475
Fixed memory leak in pow operator
2014-02-06 21:31:40 +01:00
Julien Pauli
2c34d81e7d
5.5.9 now released
2014-02-06 15:16:16 +01:00
Bob Weinand
7a022da23b
Added information in NEWS and UPGRADING
2014-02-06 14:45:22 +01:00
datibbaw
aff56f3c45
add T_POW (**) operator
...
Fixed recognition of the operator
Added opcode, still doing multiply instead of pow()
opcode now always returns int(42)
The right answer, but always a float
Yanked code from pow() implementation.
Should not handle negative long as exponent ourselves
Added test cases from pow()
Moved precedence higher than '~'
Added GMP operator overloading
Added ZEND_ASSIGN_POW (**=) operator.
Added pow() as a language construct.
Adjusted test cases for changed precedence.
Reduced pow() to shell function around ZEND_API pow_function()
Reduced test case to only contain edge cases
Added overloading test case
Moved unary minus above T_POW
Revert "Added pow() as a language construct."
Bad bad bad idea.
This reverts commit f60b98cf7a8371233d800a6faa286ddba4432d02.
Reverted unary minus behaviour due to previous revert.
Convert arrays to int(0)
Exponent with array as a base becomes int(0)
Rebase against master
Fixed tokenizer test case
2014-02-06 14:41:21 +01:00
Ferenc Kovacs
df76fd8997
add NEWS block for 5.6.0alpha3
2014-02-06 13:48:57 +01:00
Anatol Belski
b33060af82
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libs_version.txt
update libs_version.txt
2014-02-06 09:17:54 +01:00
Anatol Belski
8605702a7a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update libs_version.txt
Conflicts:
win32/build/libs_version.txt
2014-02-06 09:17:29 +01:00
Anatol Belski
10a806ba8f
updated libs_version.txt
2014-02-06 09:15:28 +01:00
Anatol Belski
6267c40ac5
updated libs_version.txt
2014-02-06 09:14:30 +01:00
Anatol Belski
e41059c633
update libs_version.txt
2014-02-06 09:13:05 +01:00
Ferenc Kovacs
1f148f7ad9
Revert "5.6.0alpha1"
...
This reverts commit 8648f76bac .
2014-02-06 03:55:53 +01:00
Anatol Belski
65f9380a3f
more tests for ICU >= 52.1 compat
2014-02-05 20:13:48 +01:00
Anatol Belski
e8f16c1792
fix tests for ICU >= 52.1
2014-02-05 19:25:14 +01:00
Hannes Magnusson
ae310e078d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix year
2014-02-05 10:17:49 -08:00
Hannes Magnusson
b855367551
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix year
2014-02-05 10:15:50 -08:00
Hannes Magnusson
1e0fdf0256
Fix year
2014-02-05 10:15:11 -08:00
Anatol Belski
5180425ca9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
adapt test to curl 7.35.0 upgrade
2014-02-05 15:17:30 +01:00
Anatol Belski
fd87b38c47
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
adapt test to curl 7.35.0 upgrade
2014-02-05 15:16:57 +01:00
Anatol Belski
71ebc0a7f3
adapt test to curl 7.35.0 upgrade
...
which is a security one and should be performed as in
http://curl.haxx.se/docs/adv_20140129.html
2014-02-05 15:15:34 +01:00
Anatol Belski
3c1ba1f263
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
move the NEWS entry into the right section
2014-02-05 10:52:00 +01:00
Anatol Belski
918f626d97
move the NEWS entry into the right section
2014-02-05 10:51:08 +01:00
Daniel Lowrey
99fa59054d
Fixed SNI failure from missing Z_STRVAL_PP
2014-02-04 19:11:56 -07:00
Anatol Belski
78815f9034
updated NEWS
2014-02-04 10:39:18 +01:00
Anatol Belski
b052ae9292
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
2014-02-04 10:38:46 +01:00
Anatol Belski
465d5db693
updated NEWS
2014-02-04 10:38:17 +01:00
Anatol Belski
f2d42e1624
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
pcre tests go with 8.34 upgrade
2014-02-04 10:34:51 +01:00
Anatol Belski
ab32d36ec6
pcre tests go with 8.34 upgrade
2014-02-04 10:34:11 +01:00
Anatol Belski
353e2643ab
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
pcre upgraded to 8.34
2014-02-04 10:31:52 +01:00
Anatol Belski
23cb7bd506
pcre upgraded to 8.34
2014-02-04 10:31:07 +01:00
Ferenc Kovacs
5d3a2fde24
mention the openssl SPKAC functions commited to master before branching out 5.6. see https://github.com/php/php-src/pull/267
2014-02-03 04:20:16 +01:00
krakjoe
148d7cc103
windows
2014-02-02 15:14:25 +00:00
krakjoe
407d761d09
clean symbols
2014-02-02 15:10:17 +00:00
krakjoe
e8519bc207
another patch from upstream
2014-02-02 14:58:39 +00:00
krakjoe
6a6bec44ad
woops
2014-02-02 14:50:32 +00:00
krakjoe
9e84124e2d
better use of tmpnam/mkstemp
2014-02-02 14:42:31 +00:00
krakjoe
4a96a75c7d
update version
2014-02-02 14:04:47 +00:00
krakjoe
a58c74f1c7
remove use of zend directly, avoid leaks/bugs in modules etc
2014-02-02 13:43:43 +00:00
krakjoe
a4a120d66a
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
2014-02-02 13:42:01 +00:00
Daniel Lowrey
05c309f2d8
Remove #if PHP_VERSION_ID version checks
2014-02-01 08:01:13 -07:00
Daniel Lowrey
58293fb533
Use master-agnostic zend_is_true checks
2014-01-31 14:18:31 -07:00
Dmitry Panin
cb7af767ec
Make html_table_gen consistent with html_table.h
...
In commit 6dabd7de04 the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.
2014-01-30 02:07:08 -08:00
Christopher Jones
9da5118af8
Fix merge
2014-02-10 17:04:38 -08:00
Christopher Jones
2cbd857283
Add Oracle PL/SQL BOOLEAN type support to oci_bind_by_name()
2014-02-10 15:00:42 -08:00
Dmitry Panin
179e45920c
Make html_table_gen consistent with html_table.h
...
In commit 6dabd7de04 the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.
2014-01-30 02:04:38 -08:00
Stanislav Malyshev
1207461d14
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
tests still failing, so xfail for now until fixed
tests still failing, so xfail for now until fixed
2014-01-29 23:48:34 -08:00
Stanislav Malyshev
8071de3dfd
tests still failing, so xfail for now until fixed
2014-01-29 23:48:33 -08:00
Stanislav Malyshev
e79b54c4b5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
tests still failing, so xfail for now until fixed
2014-01-29 23:48:19 -08:00
Stanislav Malyshev
c24f11450f
tests still failing, so xfail for now until fixed
2014-01-29 23:48:19 -08:00
Stanislav Malyshev
770aeeb40c
tests still failing, so xfail for now until fixed
2014-01-29 23:48:07 -08:00
Yasuo Ohgaki
53e3023566
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug data->fd not set to -1 for open_basedir failure.
2014-01-30 14:16:47 +09:00
Yasuo Ohgaki
b1c0614ecc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug data->fd not set to -1 for open_basedir failure.
2014-01-30 14:16:05 +09:00
Yasuo Ohgaki
f5e097d1ed
Fixed bug data->fd not set to -1 for open_basedir failure.
2014-01-30 14:15:29 +09:00
Daniel Lowrey
43432c12f1
Fixed build breakage from b4b4d9697f
2014-01-29 17:57:59 -07:00
Andrey Hristov
253a66c8d5
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-01-29 15:28:47 +02:00
Andrey Hristov
7807d7d0ce
Add new INI for rollbacking connections put back into the pconn pool
...
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
2014-01-29 15:27:43 +02:00
Remi Collet
f06f4c9254
zip extension version 1.12.4
2014-01-29 14:00:50 +01:00
Remi Collet
0fad6dbef3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
2014-01-29 09:57:04 +01:00
Remi Collet
da84f3af75
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
...
php_ini_scanned_path, from --with-config-file-scan-dir option or
from PHP_INI_SCAN_DIR environment variable allow a single path.
In some case it could be useful to allow multiple.
In the proposed patch, multiple paths are allow, using syntax inspired
from Unix MANPATH (: separated list, empty string for builtin value).
For example, this allow to use:
PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d php
PHP_INI_SCAN_DIR=:/myproject/php.d php
PHP_INI_SCAN_DIR=/myproject/php.d: php
Real use case: in SCL for dependent collections where each collection
provides a separate tree for extensions, libraries and ini files.
2014-01-29 09:53:22 +01:00
Yasuo Ohgaki
a6ac64bdbb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed zend.multibyte tests partially
2014-01-29 15:53:57 +09:00
Yasuo Ohgaki
3182660c04
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed zend.multibyte tests partially
2014-01-29 15:51:47 +09:00
Yasuo Ohgaki
d941ac5b4f
Fixed zend.multibyte tests partially
2014-01-29 15:41:30 +09:00
Daniel Lowrey
7a90254231
Update NEWS/UPGRADING
2014-01-28 10:27:00 -07:00
Daniel Lowrey
b4b4d9697f
Verify peers by default in client socket operations
2014-01-28 10:05:56 -07:00
Andrey Hristov
79ab514f0c
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-01-28 15:56:17 +02:00
Andrey Hristov
c1141d43e9
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-28 15:38:14 +02:00
Andrey Hristov
6b77c3aaa1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:33:16 +02:00
Andrey Hristov
79cbcd9ded
add text for the new constants
2014-01-28 15:32:59 +02:00
Andrey Hristov
a87125c1e8
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:24:45 +02:00
Andrey Hristov
eafe070f86
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2014-01-28 15:23:54 +02:00
Andrey Hristov
d3faae03ec
add new consts
2014-01-28 15:23:41 +02:00
Bob Weinand
18c2d45006
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-28 13:34:33 +01:00
Bob Weinand
e8bf18bd9f
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 13:33:44 +01:00
Bob Weinand
e9b4bca5a0
Fixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters definition.
2014-01-28 13:31:52 +01:00
Anatol Belski
07f3bac6ca
fix *.dsp files related to bug #50333
2014-01-28 13:09:29 +01:00
Daniel Lowrey
fc36908c88
Update NEWS/UPGRADING
2014-01-27 14:58:04 -07:00
Daniel Lowrey
68883318aa
Prevent invalid SAN peer verification on null byte prefix attack
2014-01-27 14:51:22 -07:00
Yasuo Ohgaki
a63c095033
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove obsolete description
Conflicts:
php.ini-development
php.ini-production
2014-01-27 18:57:45 +09:00
Yasuo Ohgaki
de99fd7301
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove obsolete description
2014-01-27 18:55:50 +09:00
Yasuo Ohgaki
4dee63ca1c
Remove obsolete description
2014-01-27 18:41:31 +09:00
Stanislav Malyshev
223a62d69e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix English and improve by Stas. Thanks :)
Update source docs
Revert "Update source docs"
Update source docs
Conflicts:
README.EXTENSIONS
2014-01-26 17:21:14 -08:00
Stanislav Malyshev
fed80ee605
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix English and improve by Stas. Thanks :)
Update source docs
Revert "Update source docs"
Update source docs
2014-01-26 17:20:21 -08:00
Yasuo Ohgaki
d65ddb633d
Fix English and improve by Stas. Thanks :)
2014-01-26 17:20:13 -08:00
Yasuo Ohgaki
f496aac1f6
Update source docs
2014-01-26 17:20:12 -08:00
Yasuo Ohgaki
76c098395d
Revert "Update source docs"
...
This reverts commit 10d06cd4ff3038d2f02a18936793969e7aee0bda.
2014-01-26 17:20:12 -08:00
Yasuo Ohgaki
60bcf84dda
Update source docs
2014-01-26 17:20:12 -08:00
Stanislav Malyshev
561317898c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
drop precision since trigonometric functions are non-portable
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:51:38 -08:00
Stanislav Malyshev
498d94d137
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
drop precision since trigonometric functions are non-portable
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:51:27 -08:00
Stanislav Malyshev
d5560faaa3
drop precision since trigonometric functions are non-portable
...
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
2014-01-26 15:51:17 -08:00
Stanislav Malyshev
f49965b487
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:51:17 -08:00
Stanislav Malyshev
2fac5e5669
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
drop precision since trigonometric functions are non-portable
2014-01-26 15:15:50 -08:00
Stanislav Malyshev
1dcaa109a1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
drop precision since trigonometric functions are non-portable
2014-01-26 15:15:38 -08:00
Stanislav Malyshev
35cb180d9e
drop precision since trigonometric functions are non-portable
...
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
2014-01-26 15:14:16 -08:00
Stanislav Malyshev
de62be2682
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:12:19 -08:00
Stanislav Malyshev
dfe6628440
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:12:00 -08:00
Stanislav Malyshev
cd0bf6fc3a
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:11:15 -08:00
Stanislav Malyshev
c2bb54a246
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-01-26 14:31:32 -08:00
Stanislav Malyshev
3f19697c0c
fix test
2014-01-26 14:31:20 -08:00
Stanislav Malyshev
e52c332b38
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-01-26 14:26:01 -08:00
Stanislav Malyshev
54c1e28a39
fix test
2014-01-26 14:25:49 -08:00
Stanislav Malyshev
d78c40d25d
fix test - new flag ZEND_ACC_HAS_TYPE_HINTS
2014-01-26 12:17:09 -08:00
Derick Rethans
2e65908643
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-26 14:02:44 +01:00
Derick Rethans
7399386a20
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-26 14:02:37 +01:00
Derick Rethans
251b914afa
Merge branch '45543-timezone-set' into PHP-5.4
2014-01-26 14:02:19 +01:00
Derick Rethans
22dba2f5f3
Fixed bug #45543 : DateTime::setTimezone can not set timezones without ID.
2014-01-26 14:01:58 +01:00
Stanislav Malyshev
6d6850b3b8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test bug62479.phpt
2014-01-25 23:27:21 -08:00
Stanislav Malyshev
ce1e1bb5d8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test bug62479.phpt
2014-01-25 23:26:29 -08:00
Stanislav Malyshev
4e308abf28
fix test bug62479.phpt
2014-01-25 23:25:39 -08:00
Stanislav Malyshev
ea0769f00e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Implement ldap_modify_batch.
2014-01-25 22:04:39 -08:00
Stanislav Malyshev
6fca805b3b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Implement ldap_modify_batch.
Conflicts:
ext/ldap/ldap.c
2014-01-25 22:04:28 -08:00
Stanislav Malyshev
0742de587a
Merge branch 'pull-request/571' into PHP-5.4
...
* pull-request/571:
Implement ldap_modify_batch.
2014-01-25 21:59:57 -08:00
Derick Rethans
0f79cc6eae
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-25 16:16:34 +01:00
Derick Rethans
93ede745bc
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/date/lib/parse_date.c
2014-01-25 16:16:23 +01:00
Derick Rethans
fb16bff2ba
Merge branch '44780-fallback' into PHP-5.4
2014-01-25 16:15:50 +01:00
Derick Rethans
e6ab180394
Fixed bug #44780 : some time zone offsets not recognized by timezone_name_from_abbr.
2014-01-25 16:14:51 +01:00
Ferenc Kovacs
fba2756631
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix the primary qa email address and update the list of available people being able to add moderators to our lists
Revert "Fix #62479 : Some chars not parsed in passwords"
Fix #62479 : Some chars not parsed in passwords
2014-01-24 16:12:33 +01:00
Ferenc Kovacs
0ed477b408
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix the primary qa email address and update the list of available people being able to add moderators to our lists
Revert "Fix #62479 : Some chars not parsed in passwords"
Fix #62479 : Some chars not parsed in passwords
2014-01-24 16:11:56 +01:00
Ferenc Kovacs
69af357182
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix the primary qa email address and update the list of available people being able to add moderators to our lists
Revert "Fix #62479 : Some chars not parsed in passwords"
Fix #62479 : Some chars not parsed in passwords
2014-01-24 16:07:29 +01:00
Ferenc Kovacs
4b48b29988
fix the primary qa email address and update the list of available people being able to add moderators to our lists
2014-01-24 16:06:58 +01:00
Andrey Hristov
350b5dddac
WS
2014-01-24 12:31:19 +02:00
Andrey Hristov
cd2cc7b8f9
Reduce code duplication a bit
2014-01-24 11:52:35 +02:00
Andrey Hristov
c1b2f1aa13
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-01-24 11:39:42 +02:00
Andrey Hristov
0c90c207a7
Backport refactoring from php-src
2014-01-24 11:39:24 +02:00
Xinchen Hui
aba775fd34
Fixed warning "No new line at end of file"
2014-01-24 10:50:41 +08:00
Will Fitch
a9b40a20fc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update gitignore and Makefile for additional entries
2014-01-23 21:35:24 -05:00
Will Fitch
c0acb9d5f6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update gitignore and Makefile for additional entries
2014-01-23 21:34:57 -05:00
Will Fitch
c4c10a222e
Update gitignore and Makefile for additional entries
2014-01-23 21:28:45 -05:00
Anatol Belski
698b04270e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
refixed that test for 5.5+
5.5.10 next
2014-01-22 23:30:52 +01:00
Anatol Belski
c0fcd3d6b0
refixed that test for 5.5+
2014-01-22 23:30:14 +01:00
Ondřej Hošek
c0e3429904
Implement ldap_modify_batch.
2014-01-22 18:54:11 +01:00
Julien Pauli
706d67787a
5.5.10 next
2014-01-22 18:28:09 +01:00
Anatol Belski
f8e9f84a97
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-01-22 15:40:58 +01:00
Anatol Belski
0436b85d9f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2014-01-22 15:40:19 +01:00
Anatol Belski
0eff7176de
fixed test
2014-01-22 15:39:49 +01:00
Anatol Belski
ca27c86110
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix zts
2014-01-22 12:05:06 +01:00
Anatol Belski
6d1d8ec330
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix zts
2014-01-22 12:04:25 +01:00
Anatol Belski
34792280bc
fix zts
2014-01-22 12:03:54 +01:00
Anatol Belski
4247f624cb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed missing usleep() prototype in pgsql
2014-01-22 11:53:56 +01:00
Anatol Belski
e67ef24227
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed missing usleep() prototype in pgsql
2014-01-22 11:53:32 +01:00
Anatol Belski
7bcf01f39a
fixed missing usleep() prototype in pgsql
2014-01-22 11:52:52 +01:00
Yasuo Ohgaki
3cc6c6c587
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed previous commit may delete unwanted cookies.
Re-fixed bug #66469
2014-01-22 19:23:17 +09:00
Yasuo Ohgaki
fa224b1c58
Fixed previous commit may delete unwanted cookies.
2014-01-22 19:23:01 +09:00
Yasuo Ohgaki
58f94345a7
Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.
2014-01-22 19:21:25 +09:00
Yasuo Ohgaki
26a2bed185
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Re-fixed bug #66469
2014-01-22 13:47:55 +09:00
Yasuo Ohgaki
383423a1ee
Re-fixed bug #66469
2014-01-22 13:46:59 +09:00
Yasuo Ohgaki
a27e51fd4e
Re-fixed bug #66469
2014-01-22 13:40:58 +09:00
Stanislav Malyshev
34ad83857b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix CVE ref for bug #66060
fix CVE ref for bug #66060
fix buglet in makedist
5.4.26 next
fix news
2014-01-21 13:28:32 -08:00
Stanislav Malyshev
eb6d1fcd3c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix CVE ref for bug #66060
5.4.26 next
fix news
Conflicts:
configure.in
main/php_version.h
2014-01-21 13:28:03 -08:00
Stanislav Malyshev
093ff4b624
fix CVE ref for bug #66060
2014-01-21 13:27:18 -08:00
Stanislav Malyshev
1bc16fbfcd
fix CVE ref for bug #66060
2014-01-21 13:26:56 -08:00
Stanislav Malyshev
512f9bfe8c
fix buglet in makedist
2014-01-21 13:25:23 -08:00
Stanislav Malyshev
ac6bd1e346
5.4.26 next
2014-01-21 12:13:42 -08:00
Stanislav Malyshev
2de24f182c
fix news
2014-01-21 12:11:59 -08:00
Anatol Belski
6e3fae4390
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed post deactivate signature in ext\libxml
2014-01-21 17:14:56 +01:00
Anatol Belski
c6f2581c39
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed post deactivate signature in ext\libxml
2014-01-21 17:14:32 +01:00
Anatol Belski
fb721cefe7
fixed post deactivate signature in ext\libxml
2014-01-21 17:08:59 +01:00
Johannes Schlüter
4d43e2efdb
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-21 16:38:32 +01:00
Johannes Schlüter
09eb3cf381
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-21 16:37:02 +01:00
Johannes Schlüter
5c964fb332
fix NEWS formatting
2014-01-21 16:35:51 +01:00
Johannes Schlüter
2311ba7d3f
Fix bug #66283 (Segmentation fault after memory_limit)
...
There are situations where mysqlnd dupliates zvals while freeing result
sets. If the memory_limit is reached during this operation the engine
will bailout. This patch makes sure that a later attempt (during
RSHIUTDOWN) won't cause a double free, instead we rely on the engine to
free emalloc()ed memory after bailout.
2014-01-21 16:28:30 +01:00
David Soria Parra
e9ae3cb964
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Change automaticaly to automatically
2014-01-21 16:20:08 +01:00
Carson McDonald
69581cdbbb
Change automaticaly to automatically
2014-01-21 16:19:53 +01:00
Ferenc Kovacs
5817111b63
starting a new NEWS section for alpha2
2014-01-21 11:20:40 +01:00
Ferenc Kovacs
8648f76bac
5.6.0alpha1
2014-01-21 02:30:07 +01:00
Ferenc Kovacs
425dbe55ef
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix these tests so they properly clean up after themselves.
2014-01-21 02:28:49 +01:00
Ferenc Kovacs
c4142f6f58
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix these tests so they properly clean up after themselves.
2014-01-21 02:28:32 +01:00
Will Fitch
a3837d88aa
Updating NEWS with PDO change
2014-01-20 12:19:42 -05:00
Will Fitch
6e7d132b7a
Updating NEWS with 66509 change
2014-01-20 12:18:20 -05:00
Ferenc Kovacs
2bd68bf039
fix these tests so they properly clean up after themselves.
2014-01-20 18:04:35 +01:00
Remi Collet
0290b10272
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Skip those test which fails on ARM architecture
dos2unix
2014-01-20 14:44:32 +01:00
Remi Collet
a93b87f988
Skip those test which fails on ARM architecture
...
Add minimal tests for all arch.
2014-01-20 14:42:28 +01:00
Remi Collet
140d2ef4f0
dos2unix
2014-01-20 14:39:05 +01:00
Xinchen Hui
dc5f36ffe1
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-20 21:25:26 +08:00
Xinchen Hui
c99f164b02
release 7.0.3
2014-01-20 21:23:23 +08:00
Anatol Belski
8dd44fee08
fixed glob compilation with vc12
2014-01-20 10:11:31 +01:00
Anatol Belski
379f4c0ceb
support for Visual C+ 2013
2014-01-20 10:04:20 +01:00
Remi Collet
0401226d93
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
2014-01-20 09:39:29 +01:00
Remi Collet
e3192473b5
Skip readline tests which fail with libedit
...
Add specific libedit test (output slightly differs)
2014-01-20 09:38:34 +01:00
Remi Collet
91513097ca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
2014-01-20 08:40:39 +01:00
Remi Collet
31d67bd353
Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
...
Checking all libedit functions, this check is done in each functions (add_history,
read_history, write_history, ...) but is missing in clear_history.
Test coverage: readline_clear_history_001.phpt
2014-01-20 08:38:53 +01:00
Will Fitch
b2606f669a
Update NEWS for bug fix #62479
2014-01-19 13:12:06 -05:00
Will Fitch
8aa93b7f2c
Revert "Fix #62479 : Some chars not parsed in passwords"
...
This reverts commit e6bb90c66a .
2014-01-19 13:02:20 -05:00
Yasuo Ohgaki
fb7e25d2e0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:32:35 +09:00
Yasuo Ohgaki
4e55c6bffb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:31:50 +09:00
Yasuo Ohgaki
e769c96a11
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:29:45 +09:00
Anatol Belski
12c1cfbf8f
fix C89 compat
2014-01-19 02:05:10 +01:00
Will Fitch
fb2091b1d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #62479 : Some chars not parsed in passwords
2014-01-18 19:41:45 -05:00
Will Fitch
98907a96f9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #62479 : Some chars not parsed in passwords
2014-01-18 19:40:54 -05:00
Will Fitch
da83b513b2
Fix #62479 : Some chars not parsed in passwords
...
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
2014-01-18 19:27:40 -05:00
Will Fitch
e6bb90c66a
Fix #62479 : Some chars not parsed in passwords
...
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
2014-01-18 19:27:00 -05:00
Will Fitch
a540c57331
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66509 : copy() arginfo incorrect since 5.4
2014-01-18 11:56:22 -05:00
Will Fitch
767e6d2e08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66509 : copy() arginfo incorrect since 5.4
Conflicts:
NEWS
2014-01-18 11:39:32 -05:00
Will Fitch
5b906ce6eb
Fix bug #66509 : copy() arginfo incorrect since 5.4
...
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
2014-01-18 11:25:53 -05:00
Nikita Popov
31a2ac470c
Fix argument unpacking across stack pages
...
If multiple unpacks were used (or mixed with normal arguments)
parts of the arguments could land on different stack pages. If
this occurs the arguments will now be copied to a new stack page.
The code used to do this is copied verbatim from the PHP 5.4 branch
and only modified to reduce the amount of inlined code.
2014-01-18 14:41:33 +01:00
Johannes Schlüter
8ff4d61f08
Merge branch 'phpdbg' into PHP-5.6
2014-01-18 13:52:27 +01:00
krakjoe
c205a6f3de
zts fix
2014-01-17 21:20:19 +00:00
krakjoe
18f31d474e
...
2014-01-17 21:15:03 +00:00
krakjoe
54fa2883f0
remove goto from zend_try/zend_end_try/zend_catch blocks
2014-01-17 21:08:35 +00:00
Adam Harvey
43a8f4f814
Add a couple of missing items to UPGRADING.
...
Usual grumble about please ensuring UPGRADING gets updated goes here. :)
2014-01-17 20:28:49 +08:00
Michael Wallner
03386d1786
Clarify always_populate_raw_post_data situation in 5.6
2014-01-17 12:18:16 +01:00
Anatol Belski
b58dbefba0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added appropriate exception handling flag to ext\intl
Update NEWS
2014-01-17 11:08:02 +01:00
Anatol Belski
7f0aff52cf
added appropriate exception handling flag to ext\intl
...
According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.
2014-01-17 11:03:40 +01:00
Antony Dovgal
98e6c8ca2d
fix indentation
2014-01-17 12:49:21 +04:00
Gernot Vormayr
dff0d51243
Add some basic and apparmor tests to fpm
2014-01-17 12:49:07 +04:00
Gernot Vormayr
e3d3283405
Add --force-stderr to fpm
2014-01-17 12:49:00 +04:00
Gernot Vormayr
f6d137a716
Add apparmor change hat functionality to fpm
2014-01-17 12:48:33 +04:00
Yasuo Ohgaki
b070f1080b
Update NEWS
2014-01-17 12:34:23 +09:00
Anatol Belski
8b703e9ee0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
forked the test for bug #66481
2014-01-17 03:32:06 +01:00
Anatol Belski
14e371e7d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
forked the test for bug #66481
2014-01-17 03:31:38 +01:00
Anatol Belski
a218a8b917
forked the test for bug #66481
2014-01-17 03:30:42 +01:00
krakjoe
837bd24dea
fix #50
2014-01-16 20:10:30 +00:00
Xinchen Hui
bfcdd67865
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-16 14:42:04 +08:00
Xinchen Hui
9799816e0c
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-16 14:41:52 +08:00
Xinchen Hui
b777248ded
Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null)
2014-01-16 14:41:12 +08:00
Xinchen Hui
271053ad47
Revert "Bug #66481 Segfaults on session_name()"
...
This reverts commit 5662ffb295 .
2014-01-16 14:38:35 +08:00
Xinchen Hui
57cf8eaccd
Revert "Update NEWS"
...
This reverts commit 8f5de8ddcf .
2014-01-16 14:38:22 +08:00
Yasuo Ohgaki
ffcff225fd
Update NEWS
2014-01-16 11:41:30 +09:00
Yasuo Ohgaki
8f5de8ddcf
Update NEWS
2014-01-16 11:40:33 +09:00
Yasuo Ohgaki
518327f7e3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #66481 Segfaults on session_name()
2014-01-16 11:35:11 +09:00
Yasuo Ohgaki
744f38c2d6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #66481 Segfaults on session_name()
2014-01-16 11:34:31 +09:00
Conor McDermottroe
5662ffb295
Bug #66481 Segfaults on session_name()
...
If the previous value of session.name was NULL then any call to
session_name($string) would result in a segmentation fault.
This changes the behaviour to set the value of session.name to
"PHPSESSID" if a blank value is given in php.ini or via -d on the
command line. There is already protection against setting it to NULL via
session_name() or ini_set().
2014-01-16 11:33:10 +09:00
Dmitry Stogov
299d893f0a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Log information about cached scripts and keys
2014-01-15 12:15:25 +04:00
Dmitry Stogov
7359dd6df3
Log information about cached scripts and keys
2014-01-15 12:12:22 +04:00
Dmitry Stogov
77bc5b8bae
We don't know PHP_5_6_X_API_NO yet
2014-01-15 11:09:38 +04:00
Yasuo Ohgaki
28be6aea9c
Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up
2014-01-15 14:37:24 +09:00
Yasuo Ohgaki
c58329fccc
Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.
2014-01-15 14:27:33 +09:00
Yasuo Ohgaki
d0924c2500
Fixed pg_version() crash with older postgresql
2014-01-15 13:32:15 +09:00
Yasuo Ohgaki
167eaedcbd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
2014-01-15 11:07:10 +09:00
Yasuo Ohgaki
f52c251f60
Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
2014-01-15 11:06:06 +09:00
Nikita Popov
a5ee337156
Fixed arguments unpacking segfault with opcache
2014-01-14 22:34:08 +08:00
Yasuo Ohgaki
58dff7cee5
Made pg_version() return full connection info.
2014-01-14 10:10:48 +09:00
krakjoe
231a1c401b
issues raised in #46 , don't quit on CTRL+C if not executing
2014-01-13 20:16:50 +00:00
Dmitry Stogov
029d019dac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed ZTS build
2014-01-13 23:10:35 +04:00
Dmitry Stogov
9c32d30020
Fixed ZTS build
2014-01-13 23:09:59 +04:00
Anatol Belski
9b2dc009b2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
forked test for win32
2014-01-13 17:12:53 +01:00
Anatol Belski
8092de3ca3
forked test for win32
2014-01-13 17:12:14 +01:00
Dmitry Stogov
7864fcaec9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
Conflicts:
NEWS
2014-01-13 18:06:49 +04:00
Dmitry Stogov
ce2f024e9f
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
2014-01-13 18:05:21 +04:00
Dmitry Stogov
9b74dc4a07
Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
2014-01-13 16:16:23 +04:00
Dmitry Stogov
ca550248f1
Fixed bug #66471 (Keep backward compatibility)
2014-01-13 15:34:25 +04:00
krakjoe
c645e5043e
patch version
2014-01-13 08:19:37 +00:00
krakjoe
1ba3ff157e
fix #46 ignore EOF
2014-01-13 08:14:04 +00:00
krakjoe
9add0e9f5c
Revert "fix #46 ignore EOF"
...
This reverts commit 333264fdb7 .
2014-01-13 08:12:49 +00:00
cyanogenmod
333264fdb7
fix #46 ignore EOF
2014-01-13 08:11:09 +00:00
Dmitry Stogov
d09d64c15c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
Conflicts:
NEWS
2014-01-13 12:07:50 +04:00
Dmitry Stogov
fcd75690fe
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
2014-01-13 12:06:19 +04:00
krakjoe
7d51e47eda
work on #46 (handle quit local consoles gracefully)
2014-01-12 16:48:10 +00:00
Bob Weinand
69edad213a
Fixed build (making zend_is_by_ref_func_arg_fetch function static)
2014-01-12 01:59:22 +01:00
Nikita Popov
2c47dfbaeb
Implement argument unpacking
...
RFC: https://wiki.php.net/rfc/argument_unpacking
2014-01-11 12:42:08 +01:00
Nikita Popov
c7bb283338
Minor cleanup in zend_do_pass_param()
2014-01-11 12:40:16 +01:00
Johannes Schlüter
45d46d7edd
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-10 16:02:46 +01:00
Johannes Schlüter
98e06a10d3
fix encoding
2014-01-10 15:57:40 +01:00
Julien Pauli
277895717c
5.5.9-dev now
2014-01-10 10:01:30 +01:00
Anatol Belski
ec89e6bfe2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed EOL in the test
2014-01-09 15:28:47 +01:00
Anatol Belski
4f115c0b7d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed EOL in the test
2014-01-09 15:28:09 +01:00
Anatol Belski
b8774519e2
fixed EOL in the test
2014-01-09 15:27:26 +01:00
Anatol Belski
4fe9a5d611
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added testcase from bug #65371
2014-01-09 15:24:55 +01:00
Anatol Belski
418602adfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added testcase from bug #65371
2014-01-09 15:24:31 +01:00
Anatol Belski
e927dbd1f6
added testcase from bug #65371
2014-01-09 15:23:49 +01:00
Dmitry Stogov
f16a4bc203
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:49:54 +04:00
Dmitry Stogov
b5fbde9c5b
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:48:08 +04:00
Anatol Belski
61e1f79585
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
one more extension for the basename test
2014-01-05 19:21:49 +01:00
Anatol Belski
748e707bf9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
one more extension for the basename test
2014-01-05 19:21:27 +01:00
Anatol Belski
1c586d4070
one more extension for the basename test
2014-01-05 19:19:54 +01:00
Anatol Belski
e5dd5d0ad4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improved the fix for bug #66395
updated NEWS
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
2014-01-05 19:13:15 +01:00
Anatol Belski
3bde9cfd8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
improved the fix for bug #66395
2014-01-05 19:12:52 +01:00
Anatol Belski
3f7f72adb2
improved the fix for bug #66395
...
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
2014-01-05 19:05:04 +01:00
Anatol Belski
4e7c9ea896
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
...
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
2014-01-04 01:41:27 +01:00
Anatol Belski
aaec199050
updated NEWS
2014-01-04 01:41:02 +01:00
Anatol Belski
ae1cc83f98
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
...
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
2014-01-04 01:41:01 +01:00
Nikita Popov
72a16851f4
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-04 01:29:15 +01:00
Nikita Popov
d992a972c0
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-04 01:24:54 +01:00
Nikita Popov
7e8e21df0c
Fix bug #66286 : Incorrect object comparison with inheritance
...
std_compare_objects immidiately returned 0 if the property tables
of both objects contain NULL at some index. Thus it would report
objects as equal even though properties following after that
differ.
2014-01-04 01:22:14 +01:00
Anatol Belski
169d66e0c6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
2014-01-03 22:44:46 +01:00
Anatol Belski
8a5ac85fa6
updated NEWS
2014-01-03 22:42:38 +01:00
Anatol Belski
f0100261e1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:38:47 +01:00
Anatol Belski
d3a053d9f4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:32:39 +01:00
Anatol Belski
46f60fae22
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:25:58 +01:00
Xinchen Hui
4e2ae5f5ca
Here need to be str_efree
...
found by ext/standard/tests/general_functions/phpinfo2.php fails
2014-01-03 11:36:50 +08:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
b5f245db37
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-03 11:08:06 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
e7b62fe5a6
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-03 11:06:12 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Derick Rethans
68c9f5d84c
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-02 12:52:20 +00:00
Derick Rethans
405f6417f1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-02 12:52:08 +00:00
Derick Rethans
110b7dcfb8
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-02 12:47:44 +00:00
Derick Rethans
5137cb5f0c
Fixed (some of) add/sub.
...
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
2014-01-02 12:45:48 +00:00
Derick Rethans
dee77f237c
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2014-01-02 10:57:46 +00:00
Felipe Pena
9eb7997852
- BFN
2014-01-01 22:33:12 -02:00
krakjoe
8a7e2f8dd2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix #66375 bad logic in sapi header callback routine
2014-01-01 13:01:06 +00:00
krakjoe
e9195018dc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix #66375 bad logic in sapi header callback routine
2014-01-01 13:00:29 +00:00
krakjoe
3c3ff43432
fix #66375 bad logic in sapi header callback routine
2014-01-01 12:58:18 +00:00
Felipe Pena
37897e258d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:56:49 -02:00
Felipe Pena
49cdde7326
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2014-01-01 09:56:31 -02:00
Felipe Pena
5967fb194f
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:55:14 -02:00
Nikita Popov
5408f1e5a6
Throw warning when converting invalid string to GMP
2013-12-30 14:38:09 +01:00
Michael Wallner
feb4caad09
update php.ini-*
2013-12-30 14:28:43 +01:00
Michael Wallner
4797f7ad16
Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
2013-12-30 14:28:43 +01:00
Michael Wallner
729f85fad7
add 'never'
2013-12-30 14:28:43 +01:00
Michael Wallner
7762de4022
fix type
2013-12-30 14:28:43 +01:00
Michael Wallner
cea59a74a7
fix type; add tests for -1
2013-12-30 14:28:42 +01:00
Michael Wallner
4153c23efa
s/BOOLEAN/ENTRY/
2013-12-30 14:28:42 +01:00
Michael Wallner
3641507fc1
re-introduce always_populate_raw_post_data
2013-12-30 14:28:42 +01:00
Nikita Popov
71a36fb6ae
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 13:58:29 +01:00
Nikita Popov
c7ee97eea0
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-30 13:54:58 +01:00
Nikita Popov
3b6afb1bd6
Fix leak caused by fix to bug #65667
...
ftp->stream is now closed in the ftp resource dtor.
2013-12-30 13:53:12 +01:00
Remi Collet
33ef788abd
missing file from libzip 0.11.2
2013-12-30 10:00:02 +01:00
Remi Collet
3a492cf686
fix compat for PHP ABI changes
2013-12-30 08:47:16 +01:00
Remi Collet
41cdb132c8
NEWS
2013-12-30 07:45:09 +01:00
Remi Collet
0a950a0500
Sync with pecl/zip 1.12.4dev
...
- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
with new methods:
ZipArchive::setExternalAttributesName
ZipArchive::setExternalAttributesIndex
ZipArchive::getExternalAttributesName
ZipArchive::getExternalAttributesIndex
2013-12-30 07:35:30 +01:00
Xinchen Hui
5a756afcf1
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 11:07:37 +08:00
Xinchen Hui
ed5be4f7ad
Fix test fail
2013-12-30 11:07:25 +08:00
Xinchen Hui
31d4d11432
Fix one more test in dos style eol
2013-12-30 10:58:40 +08:00
Xinchen Hui
f204df9a7f
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 10:58:23 +08:00
Xinchen Hui
6699b1f8ea
Fix dos style eol in phpts
2013-12-30 10:58:01 +08:00
Xinchen Hui
a88543a106
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
2013-12-30 10:51:47 +08:00
Xinchen Hui
a8548d9765
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 10:51:36 +08:00
Xinchen Hui
04c8ce259f
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
...
Use git blame -w to ingore the space changes
2013-12-30 10:50:46 +08:00
Remi Collet
809eb77689
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
minor fix on previous
2013-12-28 14:29:27 +01:00
Remi Collet
464c219ed4
minor fix on previous
2013-12-28 14:29:14 +01:00
Remi Collet
46809869a3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
2013-12-28 14:26:06 +01:00
Remi Collet
8f4a5373bb
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
...
Initial fix was PHP stuff
This one is libgd fix.
- filter invalid crop size
- dont try to copy on invalid position
- fix crop size when out of src image
- fix possible NULL deref
- fix possible integer overfloow
2013-12-28 14:22:13 +01:00
krakjoe
2712d7e224
update version
2013-12-27 18:10:58 +00:00
krakjoe
c8dedaf2dc
update version output
2013-12-27 18:03:11 +00:00
Xinchen Hui
a8cd9b417c
Fixed bug #66358 (fpm starts segfault)
2013-12-27 20:45:43 +08:00
Xinchen Hui
6908dc3e97
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/php_version.h
2013-12-27 14:11:35 +08:00
Xinchen Hui
aba76f09fa
Revert accidented committed php_version.h
2013-12-27 14:10:55 +08:00
Xinchen Hui
04a52443e7
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/php_version.h
2013-12-27 14:06:35 +08:00
Xinchen Hui
2938329ce1
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
...
And also fixed the bug: arguments are altered after some calls
2013-12-27 14:04:59 +08:00
Dmitry Stogov
03a37de9b3
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).
2013-12-26 14:47:13 +04:00
Dmitry Stogov
0ff0e82f26
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed ZEND_MM_MEM_TYPE=mmap_zero
Conflicts:
NEWS
2013-12-26 11:52:39 +04:00
Dmitry Stogov
6414fe283e
Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26 11:51:32 +04:00
Anatol Belski
1e411ebdf5
fix c89 compat
2013-12-25 23:43:20 +01:00
Anatol Belski
9f9179cc62
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:30:59 +01:00
Anatol Belski
5b0620831c
brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:29:42 +01:00
Joe Watkins
1d3a53a18d
upstream merge
2013-12-25 18:50:25 +00:00
Xinchen Hui
43cfa7f12a
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2013-12-25 15:36:55 +08:00
Xinchen Hui
d316040857
Fix test
2013-12-25 15:34:39 +08:00
Stanislav Malyshev
c6df27db0f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.25 next
2013-12-24 22:23:42 -08:00
Stanislav Malyshev
a2503c6af3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.25 next
Conflicts:
configure.in
main/php_version.h
2013-12-24 22:23:24 -08:00
Stanislav Malyshev
8e5048f9fb
5.4.25 next
2013-12-24 22:22:04 -08:00
Anatol Belski
00c7b973bb
fixed incompatible pointer in phpdbg on win64
2013-12-24 21:08:33 +01:00
Bob Weinand
ddf733fa69
Fixed #18
...
Errors not displaying in some configurations
2013-12-24 13:19:18 +01:00
Bob Weinand
2b98abd9a8
Merge branch 'master' of sapi/phpdbg into PHP-5.6
...
merge is necessary,
2013-12-24 13:18:18 +01:00
Bob Weinand
8064d8dfd6
Fixed #18
...
Errors not displaying in some configurations
2013-12-24 13:11:57 +01:00
Joe Watkins
e538c1ad3f
update credits headers
2013-12-24 09:03:22 +00:00
Joe Watkins
7b17d6c4bf
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
...
* 'PHP-5.6' of https://git.php.net/repository/php-src :
Fixed credits in phpdbg.* files
Added breaking upon fatal-ish error
credits file for phpdbg
Fixed credits in phpdbg.* files
reformat
credits file
2013-12-24 09:02:52 +00:00
Bob Weinand
ca882858f4
Fixed credits in phpdbg.* files
2013-12-24 00:34:23 +01:00
Bob Weinand
ebfe304d6a
Merge branch 'master' of sapi/phpdbg into PHP-5.6
2013-12-24 00:33:25 +01:00
Bob Weinand
0577ccad28
Added breaking upon fatal-ish error
2013-12-24 00:30:37 +01:00
Joe Watkins
617aefbcda
credits file for phpdbg
2013-12-24 00:16:47 +01:00
Bob Weinand
6f63609251
Fixed credits in phpdbg.* files
2013-12-23 23:55:07 +01:00
Joe Watkins
265fdd9139
credits file for phpdbg
2013-12-23 22:36:30 +00:00
Stanislav Malyshev
571ac34393
restore NEWS to the state of 6c5e93fe17
2013-12-23 14:10:08 -08:00
krakjoe
7b215b36bc
reformat
2013-12-23 21:54:45 +00:00
krakjoe
2d82e994b6
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-12-23 21:52:32 +00:00
krakjoe
d82e7ee7f8
credits file
2013-12-23 21:52:22 +00:00
Dmitry Stogov
a00e7f22d2
Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
2013-12-23 16:53:34 +04:00
Dmitry Stogov
fff72bc93b
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
removed outdated IsDebuggerPresent declaration
2013-12-23 16:05:59 +04:00
Dmitry Stogov
ccb29a6e41
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:04:10 +04:00
Anatol Belski
19039984e2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:10 +01:00
Anatol Belski
3f7a145b5a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:00:49 +01:00
Anatol Belski
f156e684ac
removed outdated IsDebuggerPresent declaration
...
This piece of code seems to retain compatibility with some windows
versions before 2000. Today it's not relevant anymore and only
produces a warning C4273 because of the conflicting prototype. In
VC9 the declaration is present in winbase.h:4142, but available
is it already in winxp. Here's the doc link
http://msdn.microsoft.com/en-us/library/windows/desktop/ms680345(v=vs.85).aspx
2013-12-23 11:53:47 +01:00
Dmitry Stogov
8650d2dda6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:10:42 +04:00
Dmitry Stogov
f7b6db7555
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:09:45 +04:00
Dmitry Stogov
f5c200fce9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
opcodes
2013-12-23 12:50:42 +04:00
Dmitry Stogov
0dcaf0f445
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
2013-12-23 12:46:30 +04:00
krakjoe
ee55edf5e4
fix news
2013-12-22 13:30:41 +00:00
krakjoe
704866d6fd
opcodes
2013-12-22 13:20:41 +00:00
krakjoe
d455377fad
opcodes
2013-12-22 13:20:17 +00:00
krakjoe
df9f2ad2e9
Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
2013-12-22 13:17:21 +00:00
krakjoe
2a1b60569f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
stop warnings from unused opcode map
- BFN
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Included new .c file in build too
Fixed little typo in zend_vm_gen.php
Moved to new file, killing a lot of warnings
2013-12-22 13:11:20 +00:00
krakjoe
247ec0d81f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
stop warnings from unused opcode map
- BFN
2013-12-22 13:07:41 +00:00
krakjoe
b1df00a7c9
stop warnings from unused opcode map
2013-12-22 13:00:51 +00:00
Felipe Pena
c14388d63f
- BFN
2013-12-22 09:43:53 -02:00
Felipe Pena
9f1075bb29
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:43:10 -02:00
Felipe Pena
8e36d36ee6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:42:58 -02:00
Felipe Pena
a056113586
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:42:45 -02:00
Bob Weinand
0525dce3c8
Merge branch 'master' of sapi/phpdbg into PHP-5.6
2013-12-22 01:04:31 +01:00
Bob Weinand
129fb22b37
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_vm_opcodes.c
2013-12-22 00:55:46 +01:00
Bob Weinand
7e3af096b3
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_opcodes.c
2013-12-22 00:54:59 +01:00
Bob Weinand
97bf254385
Included new .c file in build too
2013-12-22 00:52:05 +01:00
Bob Weinand
2874eba714
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_vm_opcodes.h
2013-12-21 23:54:38 +01:00
Bob Weinand
00cc4dccb8
Fixed little typo in zend_vm_gen.php
2013-12-21 23:52:48 +01:00
Bob Weinand
0dd2765687
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_opcodes.h
2013-12-21 23:49:28 +01:00
Bob Weinand
61199be02f
Moved to new file, killing a lot of warnings
2013-12-21 23:45:34 +01:00
Bob Weinand
20318c4960
Added breaking upon fatal-ish error
2013-12-21 22:42:11 +01:00
Bob Weinand
b14f31872b
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-21 21:32:42 +01:00
Bob Weinand
560f90e511
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_gen.php
Zend/zend_vm_opcodes.h
2013-12-21 21:31:48 +01:00
Bob Weinand
7894e397d8
Fixed build...
2013-12-21 21:29:08 +01:00
Bob Weinand
9b4b5fa737
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-21 19:31:27 +01:00
Bob Weinand
b52c300eca
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-21 19:27:58 +01:00
Bob Weinand
50d50c2f04
Added an opcode to opcode name map
...
That way extensions etc. don't have to maintain their own lists anymore.
Also as phpdbg is included and needs such a map, it'd be counterproductive to need to change two things on every new opcode.
2013-12-21 19:22:47 +01:00
Christopher Jones
794df91c35
Align 'configure --help' columns
2013-12-20 10:02:46 -08:00
Bob Weinand
6c5e93fe17
Added NEWS and UPGRADING info for phpdbg
2013-12-20 14:56:03 +01:00
Bob Weinand
4ae4b7bf47
Merge branch 'PHP-5.6' of http://git.php.net/repository/php-src into PHP-5.6
2013-12-20 14:29:35 +01:00
Bob Weinand
cee72c13d7
Merge branch 'master' of sapi/phpdbg into PHP-5.6
...
Including phpdbg.
2013-12-20 14:27:51 +01:00
krakjoe
ef3e0119b8
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-12-20 13:20:40 +00:00
krakjoe
37eac64e36
update readme
2013-12-20 13:20:17 +00:00
Bob Weinand
f06ac6a531
Bumped version number to 0.3.0
2013-12-20 14:03:51 +01:00
Bob Weinand
937cc7c80a
Recreated test.php
2013-12-20 13:56:21 +01:00
krakjoe
d5c685adba
tidy up readme
2013-12-20 12:52:18 +00:00
krakjoe
329e16a250
tidy up repository for merging
2013-12-20 12:51:24 +00:00
Boris Lytochkin
5ce843abcb
Merge branch '5.6' into PHP-5.6
...
* 5.6:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
2013-12-20 01:02:08 +04:00
Boris Lytochkin
e195faa18f
Merge branch '5.5' into PHP-5.5
...
* 5.5:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
2013-12-20 01:01:41 +04:00
Boris Lytochkin
a6fa52028f
Merge branch '5.4' into PHP-5.4
...
* 5.4:
keep 'em sorted
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 01:00:46 +04:00
Boris Lytochkin
a7c50ccc67
keep 'em sorted
2013-12-20 00:51:59 +04:00
Boris Lytochkin
285c0bcec0
Merge branch '5.5' into 5.6
...
* 5.5:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:39:15 +04:00
Boris Lytochkin
324eb07440
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
2013-12-20 00:37:29 +04:00
Boris Lytochkin
b65bd30e89
Merge branch '5.4' into 5.5
...
* 5.4:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:26:34 +04:00
Boris Lytochkin
bb51d0e4c0
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:25:16 +04:00
Derick Rethans
d4f4b66d43
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-19 19:01:00 +00:00
Derick Rethans
7a402ca51e
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-19 18:58:45 +00:00
Derick Rethans
e881334e49
- Updated to version 2013.9 (2013i)
2013-12-19 18:58:44 +00:00
Remi Collet
0fe9a9019b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
2013-12-19 10:56:16 +01:00
Remi Collet
eda1cec694
NEWS
2013-12-19 10:56:07 +01:00
Remi Collet
f6ffecbd2d
save a few memory
2013-12-19 10:55:26 +01:00
Remi Collet
99b91f98b1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:54:06 +01:00
Remi Collet
32d1d5fb59
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:53:50 +01:00
Remi Collet
20eb8e4d11
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:53:38 +01:00
Michael Wallner
17470df2a5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS handling section of README.GIT-RULES
2013-12-19 10:08:27 +01:00
Michael Wallner
391fe528b7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS handling section of README.GIT-RULES
2013-12-19 10:08:06 +01:00
Michael Wallner
3624a9ca7a
Update NEWS handling section of README.GIT-RULES
...
See http://marc.info/?t=138124004400005&r=1&w=2
2013-12-19 10:07:46 +01:00
krakjoe
08393ad2ac
disregard leading slash
2013-12-18 17:00:26 +00:00
krakjoe
944ebb36c8
version in userland
2013-12-18 16:33:21 +00:00
Dmitry Stogov
436ca2d019
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
Conflicts:
NEWS
2013-12-18 19:21:21 +04:00
Bob Weinand
d850deca94
Merge pull request #44 from Hywan/option_zend_version
...
Add Zend version and copyright (oops, I merged the last PR too early)
2013-12-18 07:20:11 -08:00
Dmitry Stogov
16e95d9137
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
2013-12-18 19:19:53 +04:00
Ivan Enderlin
1bc35a70d5
Add Zend version and copyright.
2013-12-18 16:15:24 +01:00
Bob Weinand
117d5e38e3
Merge pull request #43 from Hywan/option_version
...
Add the `-V` option to print the version number
2013-12-18 07:11:37 -08:00
Ivan Enderlin
abf68be7a4
Add the -V option to print the version number.
2013-12-18 16:05:11 +01:00
krakjoe
fc5f533c6f
...
2013-12-18 12:03:07 +00:00
Joe Watkins
5ccd5739f4
Merge pull request #40 from Hywan/fix_typo
...
In english, no horizontal space before “!”
2013-12-18 03:37:05 -08:00
Ivan Enderlin
e5263aa3f0
In english, no horizontal space before “!”.
2013-12-18 11:53:30 +01:00
krakjoe
7e0d1938f9
fix warnings/50700 stuff
2013-12-18 10:31:14 +00:00
krakjoe
5cc9a35f1b
...
2013-12-18 10:18:22 +00:00
krakjoe
6ac3a4ab41
50700 change
2013-12-18 10:17:43 +00:00
krakjoe
8b0e1c6191
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-12-18 10:12:28 +00:00
krakjoe
db9bbf1147
fix build
2013-12-18 10:12:17 +00:00
Bob Weinand
3043bd285c
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-12-18 11:08:32 +01:00
krakjoe
ef89fe37ca
fix build error zts
2013-12-18 10:06:42 +00:00
Bob Weinand
94d5334bca
Added myself as author where I was not author yet
2013-12-18 11:02:50 +01:00
krakjoe
64dabffd08
fix crash on clean in nts
2013-12-18 07:57:27 +00:00
Anatol Belski
beed28844b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed possibly uninitialized value usage
2013-12-17 08:45:30 +01:00
Anatol Belski
5e5ecaea6e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed possibly uninitialized value usage
2013-12-17 08:45:07 +01:00
Anatol Belski
2303d0ea22
fixed possibly uninitialized value usage
2013-12-17 08:44:22 +01:00
Xinchen Hui
b331a219be
Use memcmp here is better
2013-12-17 15:37:10 +08:00
Xinchen Hui
eeb37c40e6
Save one char compare
2013-12-17 15:09:52 +08:00
Xinchen Hui
143ae34f29
Fixed test failed after rev 57c1335f
2013-12-17 15:05:31 +08:00
Stanislav Malyshev
de4a2c3cbd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:37:29 -08:00
Stanislav Malyshev
57408f9c85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:36:33 -08:00
Stanislav Malyshev
cbcf6e1880
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:34:24 -08:00
David Soria Parra
85a10166e1
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-16 10:27:51 -08:00
Dmitry Stogov
a67c615799
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fix tests expecting specific resource IDs
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
Updated release process
2013-12-16 13:13:29 +04:00
Dmitry Stogov
43f11165b8
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Fix tests expecting specific resource IDs
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
Test pushing
Updated release process
2013-12-16 13:13:18 +04:00
Xinchen Hui
5eb8d9d700
Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6
2013-12-15 16:55:29 +08:00
Xinchen Hui
7cf6f012b1
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
2013-12-15 16:55:11 +08:00
Xinchen Hui
10964b7854
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-15 16:51:32 +08:00
Eric Stenson
330168a247
Fix tests expecting specific resource IDs
...
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself. As a
result, these tests become false positives.
On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently. This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines. Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-15 16:51:21 +08:00
Anatol Belski
904721189f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
2013-12-14 20:47:37 +01:00
Anatol Belski
509a67d28f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
2013-12-14 20:46:43 +01:00
Anatol Belski
68a73ce3c4
fixed parameter order for zend_throw_exception_ex call
2013-12-14 20:43:02 +01:00
DQNEO
1b3e2c299d
Fix doc (svn -> git)
2013-12-13 23:20:37 +02:00
Xinchen Hui
41eaac3491
Test pushing
2013-12-13 21:32:14 +08:00
Julien Pauli
d67fbaa74d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated release process
2013-12-13 13:27:45 +01:00
Julien Pauli
47a0722b9f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Updated release process
2013-12-13 13:27:19 +01:00
Julien Pauli
cbc98df99e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Updated release process
2013-12-13 13:26:16 +01:00
Julien Pauli
3eb2b1ac40
Updated release process
2013-12-13 13:16:54 +01:00
Dmitry Stogov
af66b20781
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Use zend_error_noreturn here
OCI8 build change: Fix source variable definition for C89 compatibility
Add Tests for #65784 in 5.5
Disallowed JMP into a finally block.
Update NEWS for 5.5.7 release
Fixed bug #65784 (Segfault with finally).
2013-12-13 11:17:50 +04:00
Dmitry Stogov
e6dbf0eeff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Use zend_error_noreturn here
Add Tests for #65784 in 5.5
Disallowed JMP into a finally block.
Update NEWS for 5.5.7 release
2013-12-13 11:16:17 +04:00
Xinchen Hui
6f95a07c41
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-13 11:37:43 +08:00
Xinchen Hui
ef73f85079
Use zend_error_noreturn here
2013-12-13 10:56:35 +08:00
Christopher Jones
bc748ba38c
OCI8 build change: Fix source variable definition for C89 compatibility
2013-12-12 15:22:55 -08:00
Xinchen Hui
c9d00a23ae
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
2013-12-13 01:48:17 +08:00
Xinchen Hui
ab12ccd16a
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
2013-12-13 01:46:28 +08:00
Xinchen Hui
dde552f2ee
Add Tests for #65784 in 5.5
2013-12-13 01:45:45 +08:00
Xinchen Hui
54213b462d
Disallowed JMP into a finally block.
2013-12-13 01:44:54 +08:00
Julien Pauli
3248b3c4d8
Update NEWS for 5.5.7 release
2013-12-12 17:16:13 +01:00
Xinchen Hui
794a888a48
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:16:08 +08:00
Dmitry Stogov
711d8c2c7b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix test
2013-12-12 16:46:49 +04:00
Dmitry Stogov
3bddcc13b5
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
fix test
2013-12-12 16:46:37 +04:00
Michael Wallner
1dfbe99ce4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2013-12-12 12:09:54 +01:00
Michael Wallner
8ee6fe9856
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2013-12-12 12:09:34 +01:00
Michael Wallner
c59f3184a3
fix test
2013-12-12 12:08:50 +01:00
Dmitry Stogov
47f41385e1
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 14:00:03 +04:00
Dmitry Stogov
463dbc3490
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 13:59:51 +04:00
Dmitry Stogov
9850d57fd9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed tests
Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:55:23 +04:00
Anatol Belski
39a2dcdeac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:21 +01:00
Dmitry Stogov
0344e6a429
Fixed tests
2013-12-12 13:35:37 +04:00
Anatol Belski
da62fd5ed8
Fixed bug #65486 mysqli_poll() is broken on Win x64
...
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.
Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
2013-12-12 10:17:01 +01:00
Dmitry Stogov
1886292ec9
Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:02:50 +04:00
Anatol Belski
6f739318fd
fix dir separator in cve-2013-6420 test
2013-12-11 13:31:29 +01:00
Stanislav Malyshev
8650bbc8dc
5.3.29-dev
2013-12-10 11:32:11 -08:00
Stanislav Malyshev
c1224573c7
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:03:49 -08:00
Bob Weinand
baceff6ad4
Tiny whitespace fix in makefile (aligning with other "Installing" messages)
2013-12-09 19:58:19 +01:00
Bob Weinand
2fa3479df5
Added conditional opline num support
2013-12-09 13:25:00 +01:00
Felipe Pena
bba73628e6
- Fix compiler warning
2013-12-09 09:46:33 -02:00
Bob Weinand
97604918ba
Fixed segfault (removed superfluous NUL-byte insertion)
2013-12-09 12:23:44 +01:00
krakjoe
af979393fc
resolve all warnings
2013-12-09 10:15:16 +00:00
krakjoe
058b59bb58
update cl
2013-12-09 09:49:50 +00:00
krakjoe
cbaf610ee4
fix test
2013-12-09 09:43:26 +00:00
krakjoe
64194ef652
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-12-09 09:35:54 +00:00
krakjoe
12d071fa7c
remove zend extension
2013-12-09 09:33:32 +00:00
Bob Weinand
b35f6ee723
Pssst, compiler!
2013-12-08 22:11:50 +01:00
Bob Weinand
71ae30f1b8
WS
2013-12-08 21:58:01 +01:00
Bob Weinand
e3bf7ad5b5
Renumbered frames in backtrace for internal functions
2013-12-08 21:43:19 +01:00
Felipe Pena
cd3b070d7e
- Added variadic support to prototype dumping
2013-12-08 18:04:39 -02:00
Felipe Pena
b655a0bc7e
- Fix argname printing order
2013-12-08 17:52:14 -02:00
Felipe Pena
50e8a47c90
- Added argument name to backtrace dump
2013-12-08 17:37:35 -02:00
Felipe Pena
508772840e
- CS
2013-12-08 16:48:20 -02:00
Felipe Pena
1fc10b5706
- Splitting prototype dumping code
2013-12-08 16:47:53 -02:00
Felipe Pena
e5a2d2efbd
- Change phpdbg_dump_backtrace prototype
2013-12-08 16:33:19 -02:00
Felipe Pena
3ec948bca3
- Fixed build
2013-12-08 16:30:52 -02:00
Felipe Pena
bae424dbb7
- Moved frame related code to phpdbg_frame.c
2013-12-08 16:29:15 -02:00
Felipe Pena
c987e46b6f
- CS + ws
2013-12-08 16:07:49 -02:00
Adam Harvey
d40a5a2797
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Switch to using freetype-config for freetype detection.
2013-12-07 19:41:44 -08:00
Bob Weinand
324291ebf2
Added one more test for constant scalar expressions
2013-12-11 19:17:07 +01:00
Anatol Belski
f0cf312d8c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added missing prototype
2013-12-11 14:16:07 +01:00
Anatol Belski
edf601a41f
added missing prototype
2013-12-11 14:15:40 +01:00
Anatol Belski
e9efc16660
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in cve-2013-6420 test
2013-12-11 13:33:37 +01:00
Anatol Belski
b6bcae5c10
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix dir separator in cve-2013-6420 test
2013-12-11 13:33:16 +01:00
Anatol Belski
ff89066b3d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix dir separator in cve-2013-6420 test
2013-12-11 13:32:49 +01:00
Ard Biesheuvel
d6ecc4105a
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-11 08:51:10 +01:00
Ard Biesheuvel
bec62af141
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-11 08:50:53 +01:00
Ard Biesheuvel
8f1fee61e2
Zend: fix overflow handling bug in non-x86 fast_add_function()
...
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
2013-12-11 08:50:20 +01:00
Stanislav Malyshev
293984ac33
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:36:06 -08:00
Stanislav Malyshev
41cd533298
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:35:26 -08:00
Stanislav Malyshev
b1b23abc86
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 11:34:45 -08:00
Stanislav Malyshev
71daf3229b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Conflicts:
configure.in
main/php_version.h
2013-12-10 11:34:35 -08:00
Remi Collet
45d8802441
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:10:20 +01:00
Remi Collet
bc8f7761f3
NEWS
2013-12-10 16:10:02 +01:00
Remi Collet
9f4d1ee51c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:09:41 +01:00
Remi Collet
3e963f8eb4
Fixed Bug #66218 zend_register_functions breaks reflection
...
Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection.
Ex: additional_functions from api_module_entry.
Ex: in CLI, dl, cli_set_process_title and cli_get_process_title
Note:
- also affects functions overrided in extension
(should be be reported in extension, where overrided, not in original extension)
- also allow extension to call zend_register_functions for various list
(instead of having a single bug list)
2013-12-10 16:07:16 +01:00
Dmitry Stogov
fe93347ba0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
Conflicts:
NEWS
2013-12-10 17:58:22 +04:00
Dmitry Stogov
552e8b2b4c
Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
2013-12-10 17:57:05 +04:00
Dmitry Stogov
73f13f439b
Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
2013-12-10 17:04:17 +04:00
Dmitry Stogov
1e161a9c0f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107 ). The changes are going to be kept in PHP-5.6.
2013-12-10 16:08:46 +04:00
Dmitry Stogov
a46f644b3a
Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107 ). The changes are going to be kept in PHP-5.6.
2013-12-10 16:02:59 +04:00
Dmitry Stogov
4c3492b050
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Zend: fix overflow handling bug in non-x86 fast_add_function()
2013-12-10 15:16:30 +04:00
Dmitry Stogov
49d7e98025
Fixed memory leaks introdused by:
...
commit 611da37617
Author: Igor Wiedler <igor@wiedler.ch >
Date: Sat Nov 9 13:48:23 2013 -0500
2013-12-10 15:13:53 +04:00
Ard Biesheuvel
60d2e70c06
Zend: fix overflow handling bug in non-x86 fast_add_function()
...
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
2013-12-10 12:12:14 +01:00
Dmitry Stogov
5a87b7ff39
Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class).
2013-12-10 14:19:17 +04:00
Dmitry Stogov
5ad1117419
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Arguments passed to user function have to be properly allocated on heap
2013-12-10 13:03:09 +04:00
Dmitry Stogov
a6516653b7
Arguments passed to user function have to be properly allocated on heap
2013-12-10 13:00:45 +04:00
Ard Biesheuvel
f33265d572
cli: don't cast away const in select() timeout argument
...
The timeout argument to select() is modified to reflect the time
remaining when the function returns on a non-timeout condition.
Passing a pointer to const data and casting away the const-ness is
asking for trouble, but for some reason, this trouble manifests
itself only on non-x86 architectures [whose implementation of select()
in glibc is different from the one supplied for x86]
Fix this by passing a stack copy of the timeout argument to select()
2013-12-09 16:54:42 +01:00
Stanislav Malyshev
cfd5ea4301
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Replace invalid code with a proper #error
2013-12-08 15:53:41 -08:00
Stanislav Malyshev
744f35d2ab
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Replace invalid code with a proper #error
2013-12-08 15:52:56 -08:00
Lior Kaplan
c062c18d42
Replace invalid code with a proper #error
...
This code creates a nasty error as mentioned in bugs #31131 , #37062
Patch taken from Debian's PHP package: 044-strtod_arm_fix
2013-12-08 15:49:22 -08:00
Adam Harvey
d7a45a67be
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Switch to using freetype-config for freetype detection.
2013-12-07 19:41:23 -08:00
Adam Harvey
a0955f351c
Switch to using freetype-config for freetype detection.
...
This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.
The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.
Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
2013-12-07 19:39:40 -08:00
Bob Weinand
9cd9356523
Added mapping...
2013-12-07 20:28:23 +01:00
Felipe Pena
4715988c70
Merge branch 'opline_num_support' of github.com:krakjoe/phpdbg into opline_num_support
2013-12-07 16:20:37 -02:00
Felipe Pena
d2ded767c6
- CS
2013-12-07 16:18:44 -02:00
Bob Weinand
2555fbfc4e
Renumbered phpdbg.h correctly
2013-12-07 16:03:01 +01:00
Bob Weinand
422f80e87d
Merge branch 'master' of https://github.com/krakjoe/phpdbg into opline_num_support
...
Conflicts:
phpdbg.c
phpdbg_bp.c
2013-12-07 15:42:17 +01:00
Bob Weinand
50db4919ce
Adapted opline_num breakpoints to master branch
2013-12-07 15:35:35 +01:00
Felipe Pena
793f1d7c4a
- Fix compiler warning + ws
2013-12-07 12:31:10 -02:00
Felipe Pena
6e85e711de
- Fix compiler warning
2013-12-07 12:17:29 -02:00
Phil Sturgeon
39cb92da16
Update README.md
2013-12-06 17:04:49 -05:00
Phil Sturgeon
6085597984
Added libedit reference to README
2013-12-06 16:57:52 -05:00
Phil Sturgeon
9cd5d75f4c
Provide commands for getting started
2013-12-06 16:44:24 -05:00
krakjoe
8939d0da49
make simple
2013-12-06 21:04:20 +00:00
krakjoe
faf1013681
more tests
...
add phpdbg_exec userland function
2013-12-06 20:56:16 +00:00
krakjoe
ad2ea99c3e
fix registered commands during init, add test
2013-12-06 20:18:44 +00:00
Ferenc Kovacs
9feb87b017
Merge branch 'igorw-use-function' into PHP-5.6
2013-12-06 11:06:41 +01:00
Michael Wallner
1135f3a042
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
BFN
2013-12-06 10:39:10 +01:00
Michael Wallner
51f01a43a7
BFN
2013-12-06 10:39:02 +01:00
Michael Wallner
9ea2489f5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
2013-12-06 10:33:47 +01:00
Michael Wallner
a48d82d238
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
2013-12-06 10:33:10 +01:00
Michael Wallner
b5f5bff965
Fixed bug #61645 (fopen and O_NONBLOCK)
...
if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check
2013-12-06 10:29:24 +01:00
Michael Wallner
098d2a5d0f
fix possibly uninitialized value
2013-12-06 10:27:33 +01:00
Ferenc Kovacs
562fa252ad
Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function
2013-12-06 05:39:49 +01:00
krakjoe
4562eb0bc8
doh, I'm tired
2013-12-05 23:41:20 +00:00
krakjoe
9dcdca8cc6
travis build status image
2013-12-05 23:28:42 +00:00
krakjoe
3750cea9e1
use current build of php
2013-12-05 23:12:02 +00:00
krakjoe
78a0a2ad76
travis
2013-12-05 22:59:34 +00:00
krakjoe
ee5393ebf9
...
2013-12-05 22:56:20 +00:00
krakjoe
c4c9119a35
remove code directory
2013-12-05 22:53:03 +00:00
krakjoe
6817683027
cleanup
2013-12-05 22:50:26 +00:00
krakjoe
3108b28dc1
add format tests
2013-12-05 22:43:14 +00:00
krakjoe
35bf233550
...
2013-12-05 15:46:40 +00:00
krakjoe
e4e764c1e6
...
2013-12-05 12:29:17 +00:00
krakjoe
39d74a2edc
printing test
2013-12-05 12:27:47 +00:00
krakjoe
6fc2ed61c4
add moar
2013-12-05 12:23:49 +00:00
krakjoe
ef33b77897
change default options for tests
2013-12-05 12:06:35 +00:00
krakjoe
8c499c072d
organize
2013-12-05 11:43:27 +00:00
krakjoe
9df1bc1b9c
add test-phpdbg makefile rule
2013-12-05 11:39:55 +00:00
krakjoe
33e88e0dad
update cl
2013-12-05 11:24:56 +00:00
krakjoe
752aac61f3
...
2013-12-05 11:20:40 +00:00
krakjoe
f4f17d6e32
fix crash on startup errors
2013-12-05 11:20:16 +00:00
krakjoe
56da409801
update cl
2013-12-05 08:18:20 +00:00
krakjoe
11b3a5ec05
tests
2013-12-05 02:42:04 +00:00
krakjoe
3341e219c9
don't use emalloc there
2013-12-04 23:26:14 +00:00
Sara Golemon
f0248bdce5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use 'user@example.com ' rather than 'user@company.com ' in tests
2013-12-04 07:50:45 -08:00
Sara Golemon
32a4cc8353
Use 'user@example.com' rather than 'user@company.com' in tests
...
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
2013-12-04 07:49:16 -08:00
krakjoe
1fb67f1eda
fix #36 add more info to conditional breakpoint output
2013-12-04 14:20:13 +00:00
Andrey Hristov
97909ef4ef
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-04 12:39:11 +02:00
Andrey Hristov
ceb1b7e20f
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-04 12:07:18 +02:00
Andrey Hristov
86aad97979
Fix loss of precision
2013-12-04 12:06:59 +02:00
Sara Golemon
df755deb45
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix php_module_startup() when loading more than one additional module
2013-12-03 18:21:12 -08:00
Sara Golemon
00a7b1ff7f
Fix php_module_startup() when loading more than one additional module
...
Dereferencing addition_modules within php_module_startup would
point to a vector entirely on the stack (which is of course, wrong).
Use a specialized helper to keep BC with the current php_module_startup()
calling semantics.
Fixes 63159
Thanks to @a-j-k
2013-12-03 18:20:19 -08:00
Adam Harvey
44697c115b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:52:35 -08:00
Adam Harvey
6f52f566f3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:51:03 -08:00
Adam Harvey
d1314893fd
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
...
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.
Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
2013-12-03 14:46:15 -08:00
Bob Weinand
3ffb4aaf9b
Fixed file opline num resolving
2013-12-03 16:10:57 +01:00
krakjoe
4a35c1d460
update cl
2013-12-03 12:27:22 +00:00
krakjoe
acf76ae619
fix loading of zend_extensions from command line arguments
2013-12-03 12:26:19 +00:00
Bob Weinand
76f889569f
Nearly finished opline num support patch
2013-12-03 12:31:25 +01:00
krakjoe
8fa376a028
break at image
2013-12-03 00:56:40 +00:00
krakjoe
54724e29cc
update image
2013-12-03 00:56:16 +00:00
krakjoe
4d6d0d8f05
improve print conditional breaks
2013-12-03 00:43:05 +00:00
krakjoe
8f835060df
export both types of conditional breakpoint properly
2013-12-03 00:35:20 +00:00
krakjoe
fd9026b948
extended conditional breakpoints
2013-12-03 00:15:33 +00:00
Bob Weinand
0a72ee087d
Added deleting and printing
2013-12-02 21:56:25 +01:00
Nikita Popov
00c74ccf69
Support gmp_remroot() on GMP 4.1
2013-12-02 20:11:06 +01:00
Bob Weinand
2d230254de
Added note about const scalar exprs in UPGRADING file
2013-12-02 18:39:01 +01:00
Michael Wallner
f254476f99
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
BFN
Fix bug #65196
2013-12-02 17:02:13 +01:00
Michael Wallner
ffbb56685f
BFN
2013-12-02 17:02:01 +01:00
Michael Wallner
9c0a70c1de
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65196
2013-12-02 17:01:25 +01:00
Michael Wallner
22fa3fbc5f
Fix bug #65196
...
Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.
2013-12-02 17:00:13 +01:00
krakjoe
0e7118f666
update docs etc
2013-12-02 14:56:15 +00:00
krakjoe
6e7c1ed0c8
added ability to override sapi name
2013-12-02 14:45:41 +00:00
krakjoe
9b4e855d72
cs
2013-12-02 13:43:21 +00:00
krakjoe
fed41baf28
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-12-02 13:25:20 +00:00
krakjoe
e05b4977c5
added set break [id] <on|off>
2013-12-02 13:19:13 +00:00
Michael Wallner
733259c211
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
BFN
fix bug #49634x
2013-12-02 12:15:27 +01:00
Michael Wallner
6eae927413
BFN
2013-12-02 12:14:26 +01:00
Michael Wallner
e4b310d2a9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #49634x
2013-12-02 12:10:59 +01:00
Michael Wallner
6408a1a59e
fix bug #49634x
2013-12-02 12:10:00 +01:00
Dmitry Stogov
0f39089384
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed tests
2013-12-02 12:05:29 +04:00
Dmitry Stogov
2f5ab04c5f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests
2013-12-02 12:04:07 +04:00
Dmitry Stogov
edbefd1d5c
Fixed tests
2013-12-02 11:53:35 +04:00
Dmitry Stogov
9447181d0c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed ability to build non-specialized GOTO VM
2013-12-02 11:03:17 +04:00
Dmitry Stogov
7efcbecda9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed ability to build non-specialized GOTO VM
Conflicts:
Zend/zend_vm_gen.php
2013-12-02 11:02:40 +04:00
Dmitry Stogov
9ed605892d
Fixed ability to build non-specialized GOTO VM
2013-12-02 10:59:32 +04:00
Bob Weinand
518519b8ed
Separated opline address improvements from this branch
2013-12-01 19:05:30 +01:00
Felipe Pena
e6970ade6d
- Fix compiler warning
2013-12-01 15:03:39 -02:00
Felipe Pena
4dda2980ff
- CS
2013-12-01 15:00:28 -02:00
Felipe Pena
9ca817eb0f
- Fixed compiler warning
2013-12-01 14:57:11 -02:00
Bob Weinand
25f2d4eca1
Several fixes and cleanups on opline num support
2013-12-01 15:58:59 +01:00
krakjoe
f6efce9f13
ws
2013-12-01 13:17:54 +00:00
krakjoe
01ed1f436c
...
2013-12-01 13:12:51 +00:00
krakjoe
800ec7836b
init.d for redhat and derivatives
2013-12-01 12:48:43 +00:00
Nikita Popov
b3546e64bd
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-01 13:45:22 +01:00
Nikita Popov
02dca18b90
Fix bug #65764
...
I'm not exactly sure whether this is the right way to fix it. The
question is whether Generator::throw() on a newborn generator (i.e.
a generator that is not yet at yield expression) should first advance to
the first yield and throw the exception there or whether it should
instead throw the exception in the caller's context.
The old behavior was to throw it at the start of the function (i.e.
the very first opcode), which causes issues like the one in #65764 .
Effectively it's impossible to properly handle the exceptions in this
case.
For now I choose the variant where the generator advances to the
first yield before throwing, as that's consistent with how all other
methods on the Generator object currently behave. This does not
necessarily match the behavior in other languages, e.g. Python would throw
the exception in the caller's context. But then our send() method already
has this kind of deviation, so it stays internally consistent at least.
2013-12-01 13:37:56 +01:00
krakjoe
723b721fb9
update version
2013-12-01 10:23:37 +00:00
krakjoe
083cce9162
tag correct version
2013-12-01 10:22:41 +00:00
krakjoe
d76e24b2db
fix windows build
2013-12-01 08:55:37 +00:00
krakjoe
2c216ec648
update version
2013-12-01 08:40:31 +00:00
krakjoe
7e528a36b6
tag v2.0
2013-12-01 08:38:33 +00:00
krakjoe
cbc774723a
add info memory
2013-12-01 08:34:17 +00:00
krakjoe
8a826dc07b
cs/ws
2013-11-30 17:29:33 +00:00
krakjoe
835446e632
support all colors and underline in java ui
2013-11-30 17:19:01 +00:00
krakjoe
df0091c445
phpdbg_rlog for logging while in remote mode (only)
2013-11-30 14:34:16 +00:00
Felipe Pena
af60886962
- BFN
2013-11-30 12:05:51 -02:00
Felipe Pena
dbc477374c
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2013-11-30 11:44:08 -02:00
Felipe Pena
841dddb3c2
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2013-11-30 11:43:51 -02:00
Felipe Pena
a2f478cd94
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
2013-11-30 11:40:42 -02:00
Felipe Pena
78f69a2b4f
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
2013-11-30 11:39:57 -02:00
Nikita Popov
e2a8d7dc17
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-30 13:40:17 +01:00
Nikita Popov
b4f00be6c4
Cleanup generator closing code a bit
...
All code dealing with unfinished execution cleanup is now in a separate
function (previously most of it was run even when execution was properly
finished.
Furthermore some code dealing with unclean shutdowns has been removed,
which is no longer necessary, because we no longer try to clean up in
this case.
2013-11-30 13:38:21 +01:00
Nikita Popov
9589cae8cb
Fixed bug #66041 : list() fails to unpack yielded ArrayAccess object
...
Yield return values now use IS_VAR rather than IS_TMP_VAR. This
fixes the issue with list() and should also be faster as it avoids
doing a zval copy.
2013-11-30 13:08:31 +01:00
krakjoe
4fa2f01c4e
add systray and logo
2013-11-30 07:27:11 +00:00
krakjoe
16edd155cb
...
2013-11-30 00:44:34 +00:00
krakjoe
b03f1fdb3e
update jar
2013-11-30 00:29:31 +00:00
krakjoe
8963bbe26a
...
2013-11-30 00:29:16 +00:00
krakjoe
b6de073b00
...
2013-11-30 00:25:05 +00:00
krakjoe
af3d792c78
improvements to jui, use nonblocking i/o in stdout thread
2013-11-30 00:16:24 +00:00
ArunSK
2e6d830590
Fixed unused value compiler warning
2013-11-29 23:58:41 +01:00
Nikita Popov
66b0d17f04
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-29 23:31:13 +01:00
nikita2206
5f09944662
Fixed bug #65768 : DateTimeImmutable::diff does not work
...
This commit also prevents user classes from directly implementing
DateTimeInterface, because ext/date relies on classes implementing
it to support certain internal structures.
2013-11-29 23:31:07 +01:00
krakjoe
53eb91d05e
update image
2013-11-29 22:09:26 +00:00
krakjoe
c94ae50063
updates for java app ... delicious ...
2013-11-29 22:03:08 +00:00
krakjoe
8c28d94a4e
update images
2013-11-29 20:19:08 +00:00
krakjoe
195c518dd1
...
2013-11-29 20:03:50 +00:00
krakjoe
31c4861f67
correction
2013-11-29 19:57:10 +00:00
krakjoe
4b6c8adea0
remote tutorial
2013-11-29 19:54:55 +00:00
krakjoe
de84aba976
improve -l, add -a
2013-11-29 19:42:41 +00:00
krakjoe
41f93d4c15
allow setting both ports from command line:
2013-11-29 18:55:15 +00:00
krakjoe
c56a25b50a
update java ui
2013-11-29 14:50:44 +00:00
krakjoe
76bb4bbe00
update image
2013-11-29 13:22:40 +00:00
krakjoe
22fd520fb5
update ui
...
echo checkbox
move input to bottom like a normal console
2013-11-29 13:20:26 +00:00
Bob Weinand
2e7c695c05
I give up
2013-11-29 11:38:28 +01:00
krakjoe
e1af08c4e7
...
2013-11-29 10:22:20 +00:00
krakjoe
9b498765ab
...
2013-11-29 10:22:02 +00:00
krakjoe
2885406590
update image with colours :)
2013-11-29 09:46:20 +00:00
krakjoe
921c73aeda
fix layout
2013-11-29 09:44:25 +00:00
krakjoe
167f6e0c25
...
2013-11-29 09:38:07 +00:00
krakjoe
3495e78274
...
2013-11-29 09:38:00 +00:00
krakjoe
216e3668d6
...
2013-11-29 09:35:33 +00:00
krakjoe
bd49a0f144
...
2013-11-29 09:19:08 +00:00
krakjoe
5f0a0f12e1
...
2013-11-29 09:16:07 +00:00
krakjoe
883f34f487
add ANSI colour support to output pane
2013-11-29 08:57:29 +00:00
Dmitry Stogov
2cb0e1e4c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added validation of class names in the autoload process
Conflicts:
NEWS
2013-11-29 12:55:11 +04:00
Dmitry Stogov
967abd6153
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added validation of class names in the autoload process
2013-11-29 12:54:22 +04:00
Dmitry Stogov
2d31eadbbf
Added validation of class names in the autoload process
2013-11-29 12:53:02 +04:00
krakjoe
f822764129
always unset unclean_shutdown
2013-11-29 02:42:34 +00:00
krakjoe
734fe5508a
update java example
2013-11-29 01:48:21 +00:00
Nikita Popov
f54f308f71
Clean up GMP arginfos
...
Removed duplicate arginfos, specified number of required args
everywhere and removed weird pass-by-ref arguments.
2013-11-29 00:05:28 +01:00
Nikita Popov
6d38090c8d
Add gmp_root() and gmp_rootrem() functions
2013-11-29 00:01:59 +01:00
Nikita Popov
1c8cbe4b4e
Use class handlers for GMP serialization
...
A bit faster and less boilerplate
2013-11-29 00:01:59 +01:00
Nikita Popov
8860758a74
Remove duplicate / commented code in GMP
2013-11-29 00:01:59 +01:00
krakjoe
8a63a99d2e
tidy
2013-11-28 22:58:39 +00:00
krakjoe
f342ca88fa
java example stuff
2013-11-28 22:55:07 +00:00
krakjoe
371ccf8ab9
remove windows support for remote console, never gonna happen
2013-11-28 22:06:27 +00:00
Bob Weinand
24585722b1
Small bug fix on error
2013-11-28 22:03:59 +01:00
Dmitry Stogov
36bd7296c8
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
Marking those two as XFAIL for now.
Fixed a few DST changeover issues.
Move add/sub to timelib.
Fix backwards transition diffs.
Split up tests into their different categories.
Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
Fixed forward transitions in diffs.
Always reset those parameters.
Fixed "Forward Transition" construction of DateTime objects.
2013-11-29 01:00:14 +04:00
Dmitry Stogov
6c2a806820
Avoid interned hash key duplication and hash key length recaclulation
2013-11-29 00:57:49 +04:00
Bob Weinand
d7f6e88493
First semi-working version of oplines
2013-11-28 21:36:45 +01:00
krakjoe
55f210c83b
windows ...
2013-11-28 18:22:30 +00:00
krakjoe
c464b011de
windows fixes
2013-11-28 17:30:27 +00:00
krakjoe
022c621f96
windows fixes
2013-11-28 17:21:34 +00:00
krakjoe
26e1d57e8c
add set colors command to assist remote console
2013-11-28 17:02:38 +00:00
krakjoe
b2af85a445
more on remote mode
...
some logging info to stderr
only quit on sigint in remote mode
2013-11-28 16:41:21 +00:00
Derick Rethans
c3ac86c569
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-28 16:33:17 +00:00
Derick Rethans
b0d24d3d20
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-28 16:33:08 +00:00
Derick Rethans
d22cc5c816
Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
2013-11-28 16:32:11 +00:00
krakjoe
daeb5e2963
resolve #30 #31
2013-11-28 15:51:11 +00:00
krakjoe
68776e376d
work on remote mode
2013-11-28 14:54:06 +00:00
Derick Rethans
cf88fc857e
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2013-11-28 14:46:21 +00:00
Derick Rethans
3bf71b42b1
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-28 14:45:26 +00:00
Dmitry Stogov
5d25762646
Removed unused "pHashFunction" argument in _zend_hash_init() and family (must be 99% source compatible)
2013-11-28 18:40:46 +04:00
Derick Rethans
88067b6e60
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/date/php_date.c
2013-11-28 14:30:08 +00:00
Derick Rethans
c1eb219aad
Merge branch 'date-time-dst-rfc' into PHP-5.4
...
This is a partial resolve of some DST issues, plenty of things to do, but as
this *does* fix a few issues it's worth merging it already.
2013-11-28 14:26:01 +00:00
Derick Rethans
aab0b2ce3b
Marking those two as XFAIL for now.
2013-11-28 14:24:39 +00:00
Dmitry Stogov
5d6b20f66b
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Updated NEWS for Constant Scalar Exprs RFC
Moved arrays again to "static_scalar:" & little cleanup
Renaming
Constant expressions refactoring
Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
Added a few more operators
Whitespace fix
converted several switches to ifs and made more opcache friendly
Fatal error about self referencing constants fixed
Fixed mem leaks, added tests and ternary operator
Working commit for constant scalar expressions (with constants). Tests will follow.
2013-11-28 17:04:54 +04:00
Dmitry Stogov
b63b81815f
Some rare deprecated cases replaced by ZEND_ASSERT() (some extensions might need to be fixed)
2013-11-28 17:02:01 +04:00
Dmitry Stogov
aa427a10d4
Removed duplicated hash function implementation (100% source compatible)
2013-11-28 17:01:10 +04:00
Bob Weinand
0652edfed3
Updated NEWS for Constant Scalar Exprs RFC
2013-11-28 13:46:51 +01:00
Bob Weinand
d36cf90291
Merge branch 'const_scalar_exprs' into PHP-5.6
...
Conflicts:
Zend/zend_extensions.h
2013-11-28 13:41:42 +01:00
Derick Rethans
582f6e529e
Fixed a few DST changeover issues.
2013-11-28 12:02:36 +00:00
Derick Rethans
5d0c526199
Move add/sub to timelib.
2013-11-28 12:02:36 +00:00
Derick Rethans
324e6a5f82
Fix backwards transition diffs.
2013-11-28 12:02:36 +00:00
Derick Rethans
aa26ace21f
Split up tests into their different categories.
2013-11-28 12:02:35 +00:00
Derick Rethans
7a0df7be34
Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
2013-11-28 12:02:35 +00:00
Derick Rethans
6e8b2c91c4
Fixed forward transitions in diffs.
2013-11-28 12:02:35 +00:00
Derick Rethans
261c6b31ca
Always reset those parameters.
2013-11-28 12:02:35 +00:00
Derick Rethans
44a9e6b484
Fixed "Forward Transition" construction of DateTime objects.
...
This fixes the issue in
https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions
There is a period during transition to DST where a time (such as 02:30) does
not exist. PHP already calculated the correct timestamp for this, but failed to
"rounded forward" to the existing correct hour value.
2013-11-28 12:02:35 +00:00
krakjoe
f80a09ede7
add option in help for remote console
2013-11-28 09:36:42 +00:00
krakjoe
8d1594d01e
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-28 09:31:39 +00:00
krakjoe
6bb080a7e1
made server persist, support disconnect and reconnect
2013-11-28 09:31:06 +00:00
Dmitry Stogov
9d060e8d48
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
2013-11-28 11:46:28 +04:00
Dmitry Stogov
57c1335fec
Don't check argument types for internal functions without type hinting
2013-11-28 11:44:14 +04:00
Felipe Pena
7c972480ad
- Fixed compiler warnings + CS
2013-11-27 20:59:02 -02:00
Derick Rethans
d3a12317cf
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-27 22:01:09 +00:00
Derick Rethans
4587ef569a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-27 22:01:03 +00:00
Derick Rethans
fb0c2cf224
Merge branch 'bug53879' into PHP-5.4
2013-11-27 22:00:53 +00:00
Derick Rethans
23ab2575e1
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
2013-11-27 21:59:46 +00:00
krakjoe
50da1ffdb6
example java app for testingz
2013-11-27 19:31:55 +00:00
krakjoe
b43377dd4a
java example
2013-11-27 19:23:34 +00:00
krakjoe
db12998998
fix remote mode when readline is enabled
2013-11-27 17:32:15 +00:00
Dmitry Stogov
fcb98cbce8
Fixed tests
2013-11-27 21:04:00 +04:00
krakjoe
87b556e3a1
simple tcp interface for phpdbg
2013-11-27 16:49:51 +00:00
Dmitry Stogov
43e3933fa3
Removed deprecated AI_SET_PTR()s
2013-11-27 20:30:35 +04:00
krakjoe
2299584963
fix find breakpoint function
2013-11-27 13:32:38 +00:00
krakjoe
0fad595a1f
housework
2013-11-27 13:28:53 +00:00
krakjoe
c8145da0b2
reset hit counters implicitly on run
2013-11-27 13:15:52 +00:00
krakjoe
0deced5a7a
more improvements to breakpoint api
...
separate printing logic, always return base
add hit count to breakpoints, displayed on hit
2013-11-27 13:01:57 +00:00
krakjoe
4216cb2840
make conditional breakpoint structure consistent with others
2013-11-27 12:15:37 +00:00
Dmitry Stogov
504c60dc44
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 14:58:54 +04:00
Dmitry Stogov
65803c8fac
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 14:58:35 +04:00
Dmitry Stogov
5e8bb519f0
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 14:58:23 +04:00
Dmitry Stogov
a908afeaa5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65969 (Chain assignment with T_LIST failure)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-11-27 14:56:18 +04:00
Dmitry Stogov
92b76680e9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65969 (Chain assignment with T_LIST failure)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-11-27 14:39:40 +04:00
Dmitry Stogov
16d59aa171
Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 14:26:34 +04:00
Remi Collet
56909e7d9d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:15:58 +01:00
Remi Collet
0dfdb1a491
NEWS
2013-11-27 11:15:34 +01:00
Remi Collet
28d215d0a8
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:15:08 +01:00
Remi Collet
12fe4e90be
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:13:16 +01:00
krakjoe
37b3a21cf4
improve api
2013-11-27 09:55:16 +00:00
Julien Pauli
1daa1ab4d1
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-27 10:32:05 +01:00
Julien Pauli
e9c6a1cfd2
5.5.8-dev now
2013-11-27 09:34:40 +01:00
Stanislav Malyshev
22ad8e1b1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.24-dev now
merge fix
add test
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-27 00:18:54 -08:00
Stanislav Malyshev
5cd8ff9885
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.24-dev now
Conflicts:
configure.in
main/php_version.h
2013-11-27 00:14:42 -08:00
Stanislav Malyshev
63f3ff7b5f
5.4.24-dev now
2013-11-27 00:13:45 -08:00
krakjoe
3df8e29b0d
many improvements in breakpoints
...
make file breakpoints faster
make exports happen in correct order
make deletes simpler, set flags correctly
fix info vars when no scope is set
2013-11-26 22:20:52 +00:00
Andrey Hristov
0fc90b100d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-11-26 20:10:30 +02:00
Dmitry Stogov
834eaae52d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:59:02 +04:00
Dmitry Stogov
de65817136
Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:57:32 +04:00
Dmitry Stogov
2381b817aa
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed a wrong test
2013-11-26 21:44:54 +04:00
Dmitry Stogov
19f0e188f2
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Fixed a wrong test
2013-11-26 21:44:32 +04:00
Dmitry Stogov
ee3c7b70c3
Added an optimization of class constants and constant calls to some internal functions
2013-11-26 21:38:40 +04:00
Dmitry Stogov
f000624864
Added an optimization of class constants and constant calls to some internal functions
2013-11-26 21:37:31 +04:00
Andrey Hristov
9a6b72a05a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-26 19:15:43 +02:00
Andrey Hristov
5a3886f15c
merge fix
2013-11-26 19:15:30 +02:00
Andrey Hristov
0aadab0e2e
add test
2013-11-26 19:15:12 +02:00
Andrey Hristov
40dc242904
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
2013-11-26 19:02:45 +02:00
Andrey Hristov
74ba88e186
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-26 19:01:49 +02:00
Dmitry Stogov
e7132597a6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:01:01 +04:00
Dmitry Stogov
d79dd9cc1c
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:00:00 +04:00
Julien Pauli
aa33da6a51
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed a wrong test
2013-11-26 17:43:45 +01:00
Julien Pauli
ff20a9019d
Fixed a wrong test
2013-11-26 17:43:31 +01:00
krakjoe
f8e7685975
fix #28
2013-11-26 16:02:39 +00:00
krakjoe
969e659c4a
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-26 16:00:28 +00:00
krakjoe
6d95449e0a
fix #27
2013-11-26 15:58:27 +00:00
Dmitry Stogov
27524b52b5
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 19:55:49 +04:00
Dmitry Stogov
52630e3ced
Revert NEWS
2013-11-26 17:48:59 +04:00
Dmitry Stogov
0999d85049
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)
Conflicts:
NEWS
2013-11-26 17:48:11 +04:00
Dmitry Stogov
d85ac7fb3f
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 17:47:02 +04:00
Bob Weinand
6ba73338dd
Enormous whitespace fix
2013-11-26 11:02:58 +01:00
Bob Weinand
9663ef0c1c
ZEND_STRS - 1 => PHPDBG_STRL
2013-11-26 09:26:13 +01:00
Bob Weinand
485966252a
Export conditional breaks
2013-11-26 09:21:04 +01:00
Dmitry Stogov
8fdc973afa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added test
2013-11-26 12:14:12 +04:00
Dmitry Stogov
f28ac55b6d
Added test
2013-11-26 12:13:42 +04:00
krakjoe
bc7df607ab
fix windows build
...
build shared on windows
2013-11-26 07:53:08 +00:00
Dmitry Stogov
621f83e35c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
bring the news
Conflicts:
NEWS
2013-11-26 11:36:23 +04:00
Dmitry Stogov
a8c7e50f4d
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
2013-11-26 11:34:41 +04:00
krakjoe
2942caff29
ws
2013-11-26 07:11:34 +00:00
krakjoe
feaec0ec73
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-25 23:03:52 +00:00
krakjoe
87a29a96aa
nope
2013-11-25 23:02:54 +00:00
Bob Weinand
b5b5bba492
Merge branch 'master' of https://github.com/krakjoe/phpdbg
...
Conflicts:
phpdbg.c
2013-11-25 23:47:21 +01:00
Bob Weinand
02ae3f8de1
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-25 23:45:55 +01:00
Bob Weinand
4e6a8eeffa
Breakpoints are now persistent over cleans
2013-11-25 23:38:43 +01:00
krakjoe
017beb002b
remove comment
2013-11-25 22:20:26 +00:00
krakjoe
01181d194f
use tsrm_shutdown
2013-11-25 22:19:21 +00:00
Felipe Pena
bd87039a91
- Rename command to "set break"
2013-11-25 19:46:06 -02:00
Felipe Pena
d50e2546c7
- Added command "set breakpoint <on|off>"
2013-11-25 19:39:17 -02:00
Bob Weinand
2be5a1e3da
Enable backwards reading in list command
2013-11-25 20:33:52 +01:00
Andrey Hristov
29ee38bf0d
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-11-25 21:33:04 +02:00
Andrey Hristov
1b0e6067d5
bring the news
2013-11-25 21:31:51 +02:00
krakjoe
6932eb76e3
correction in help
2013-11-25 18:39:27 +00:00
krakjoe
754fe82216
export opcode breakpoints
2013-11-25 18:27:58 +00:00
krakjoe
ba37fd24bc
export method breakpoints
2013-11-25 18:16:31 +00:00
krakjoe
3e14ff7cee
symbol breakpoint export
2013-11-25 18:03:38 +00:00
krakjoe
7ac64cdf46
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-25 17:58:43 +00:00
krakjoe
19b1f7b5f9
...
2013-11-25 17:58:36 +00:00
Bob Weinand
be8adbb231
Fix segfault in source command
2013-11-25 18:58:03 +01:00
krakjoe
781bd90de3
swap PROMPT for phpdbg_get_prompt in help
2013-11-25 17:43:49 +00:00
krakjoe
a947c890a0
add source export functionality, only files working, buggy source
2013-11-25 17:41:09 +00:00
krakjoe
3d6a4cbc63
consistent ordering
2013-11-25 16:43:23 +00:00
krakjoe
5295833b75
...
2013-11-25 16:41:33 +00:00
krakjoe
be6fbb07bb
update changelog
2013-11-25 16:39:53 +00:00
krakjoe
feabdfcf3f
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-25 16:39:24 +00:00
krakjoe
3078834098
add source command
2013-11-25 16:39:14 +00:00
Bob Weinand
eac26190aa
Support also multiple directories in additional ini scan dir
2013-11-25 17:15:51 +01:00
Bob Weinand
4aab420c5f
.phpdbginit also possible in ini dirs
2013-11-25 13:19:01 +01:00
krakjoe
36c09510fb
...
2013-11-25 10:25:42 +00:00
krakjoe
905911b0b6
...
2013-11-25 10:24:19 +00:00
krakjoe
6eabb69064
add session image
2013-11-25 10:20:00 +00:00
krakjoe
0f8c4630f2
consistent in ___ for info/print
2013-11-25 10:17:57 +00:00
Dmitry Stogov
b3c2c2bcb1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed compatibility with old PHP versions
Fixed bug #65915 (Inconsistent results with require return value)
Conflicts:
NEWS
2013-11-25 14:11:45 +04:00
Dmitry Stogov
b7b6c35eea
Fixed compatibility with old PHP versions
2013-11-25 14:09:57 +04:00
Dmitry Stogov
27dc82d0ec
Fixed bug #65915 (Inconsistent results with require return value)
2013-11-25 14:07:24 +04:00
Bob Weinand
2318883446
a prompt with an % == nice segfault
2013-11-24 22:45:50 +01:00
Bob Weinand
f81a621f6f
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-24 22:37:16 +01:00
Bob Weinand
cc51537e5e
Do not mix long and int
2013-11-24 22:36:39 +01:00
krakjoe
fbfb216966
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-24 21:34:38 +00:00
krakjoe
99f32e845e
change # for J/L
2013-11-24 21:34:25 +00:00
Bob Weinand
ce05e41c14
Fixed backtrace class<->method order
2013-11-24 22:30:48 +01:00
krakjoe
c41ef19c3b
compiler warning
2013-11-24 21:07:53 +00:00
krakjoe
be2f097b63
remove annoying blinking
2013-11-24 21:04:52 +00:00
krakjoe
e0c4922635
blink/underline
2013-11-24 20:59:22 +00:00
krakjoe
4d735404cf
add black
2013-11-24 20:52:39 +00:00
krakjoe
e8a7a46faf
spelling correction
2013-11-24 20:30:28 +00:00
krakjoe
873ce08d6b
add element help for set color command
2013-11-24 20:20:23 +00:00
krakjoe
beea71bd25
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-24 20:16:55 +00:00
krakjoe
5596b2e716
example colour output
2013-11-24 20:16:46 +00:00
Felipe Pena
ae7d408acc
- Update changelog
2013-11-24 18:15:27 -02:00
Felipe Pena
d21e7f5aa0
- CS
2013-11-24 18:14:33 -02:00
Felipe Pena
70cf09bf5b
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-24 18:12:06 -02:00
Felipe Pena
63e53c8ca8
- Added yellow color
2013-11-24 18:11:54 -02:00
Felipe Pena
ef7841fb09
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-24 18:01:26 -02:00
Felipe Pena
7371142ca6
- Fix memory leak on exit
2013-11-24 18:01:14 -02:00
krakjoe
de61c0c28a
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-24 20:01:10 +00:00
krakjoe
d2e634c1bc
userland api for prompt/color commands
2013-11-24 20:00:56 +00:00
krakjoe
e62450725c
use lowercase alias
2013-11-24 19:47:28 +00:00
Felipe Pena
fb88d79cfb
- Use macro here
2013-11-24 17:41:00 -02:00
krakjoe
c122a3921c
correction
2013-11-24 19:35:26 +00:00
krakjoe
ddcfa42f15
get good control over colors and prompt
2013-11-24 19:34:18 +00:00
krakjoe
c85f247eac
make api function and format structure for color management
2013-11-24 17:50:22 +00:00
Felipe Pena
bb134a4059
- Missing return
2013-11-24 15:11:15 -02:00
Felipe Pena
5b89e181aa
- Added more colors
2013-11-24 15:09:41 -02:00
Felipe Pena
8589c0af91
- Initial work on setting color to prompt
2013-11-24 15:00:30 -02:00
Felipe Pena
bfccc292a6
- Fix checking
2013-11-24 13:51:29 -02:00
Felipe Pena
19a923de46
- Keep the color
2013-11-24 13:49:30 -02:00
krakjoe
c72c2687da
...
2013-11-24 15:26:02 +00:00
krakjoe
e99fd22866
move oplog command to set commands
...
add help for set commands
move set down in the list of prompt commands
2013-11-24 15:24:12 +00:00
Felipe Pena
c7ef093095
- CS
2013-11-24 12:57:53 -02:00
Felipe Pena
900bc9104c
- Oppss, forgot to add new files
2013-11-24 12:56:59 -02:00
Felipe Pena
795e12b85e
- Added "set prompt" command
2013-11-24 12:54:14 -02:00
Felipe Pena
97f733e60d
- Moved information about breakpoints to "info break"
2013-11-24 11:36:29 -02:00
Bob Weinand
e10bfd3b79
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-24 13:27:38 +01:00
Bob Weinand
2800af6e47
Pssst, compiler!
2013-11-24 13:27:22 +01:00
krakjoe
4eb63d996d
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-24 12:18:00 +00:00
krakjoe
682164ae99
fix windows build warning
2013-11-24 12:17:51 +00:00
Bob Weinand
fcdae5867f
Added opcode break deleting
2013-11-24 13:14:53 +01:00
krakjoe
d9c94663c1
update changelog
2013-11-24 12:09:03 +00:00
krakjoe
3d168401ea
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-24 12:07:06 +00:00
krakjoe
72ffef13a1
help for delete breakpoint
...
remove redundant decl
2013-11-24 12:06:45 +00:00
Bob Weinand
81eaf1fe08
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-24 13:03:31 +01:00
Bob Weinand
e8aab62d4d
Prevent segfault when no execution context set with "b <num>"
2013-11-24 13:03:00 +01:00
Felipe Pena
dfbde3de5e
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-24 10:02:37 -02:00
Felipe Pena
94cc258715
- Fixed format string according to data type
2013-11-24 10:02:23 -02:00
Felipe Pena
f4db0669d0
- Passing strlen to phpdbg_set_breakpoint_symbol
2013-11-24 10:00:12 -02:00
Bob Weinand
7c51efd473
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-24 12:58:19 +01:00
Bob Weinand
2b5c929153
Add breakpoint deleting
2013-11-24 12:58:08 +01:00
Felipe Pena
46c899ba30
- Moved conditional bp checking
2013-11-24 09:45:05 -02:00
Felipe Pena
90ff693d62
- Added print information about opcode breakpoint
2013-11-24 09:43:05 -02:00
Felipe Pena
089bf5e112
- Missing cleaning for opcode bp
2013-11-24 09:25:08 -02:00
Felipe Pena
89d5a3f8b4
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-24 08:17:22 -02:00
Felipe Pena
0edbf74d4e
- Update
2013-11-24 08:17:07 -02:00
krakjoe
abef3fccc2
typo
...
set last command/param more carefully
2013-11-24 07:37:54 +00:00
krakjoe
6e8eeea3bc
add memory usage info to print
2013-11-24 07:28:54 +00:00
krakjoe
b80baeb25e
add help for break op command
2013-11-24 07:01:50 +00:00
Felipe Pena
c1e140d087
- Fix data type
2013-11-23 23:49:48 -02:00
Felipe Pena
f4f6c8f517
- Added gcc attribute to check formatting parameters
2013-11-23 21:58:32 -02:00
Felipe Pena
46f5da1dc1
- Moved breakpoint checking to phpdbg_bp.c file
2013-11-23 21:46:24 -02:00
Felipe Pena
9d9182dfef
- Typo
2013-11-23 21:18:21 -02:00
Felipe Pena
70d4ac8ef3
- Moved catch cmd to "break op" cmd
2013-11-23 21:14:16 -02:00
Felipe Pena
6fbffc68ac
- Update changelog
2013-11-23 20:07:50 -02:00
Felipe Pena
a86d52d81d
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-23 20:03:31 -02:00
Felipe Pena
f5c07f61e1
- Added catch command
2013-11-23 20:03:17 -02:00
Bob Weinand
a5fb0ae10e
Shut up, compiler!
2013-11-23 20:50:25 +01:00
Felipe Pena
603df4a48f
Merge pull request #24 from PeeHaa/patch-1
...
FIX ALL THE TYPOS!
2013-11-23 10:55:09 -08:00
Pieter Hordijk
233c06d129
FIX ALL THE TYPOS!
2013-11-23 19:54:11 +01:00
krakjoe
9712387fc9
update version after release
2013-11-23 18:41:10 +00:00
krakjoe
e7fa292493
change version for release
2013-11-23 18:40:28 +00:00
krakjoe
cafafb0e01
API decls
2013-11-23 18:12:51 +00:00
krakjoe
1c6e54ecdf
support shared build on unix
2013-11-23 17:56:16 +00:00
Felipe Pena
61b484524a
Merge pull request #23 from bwoebi/info_literal_fix
...
Info literal fix
2013-11-23 09:40:59 -08:00
Bob Weinand
003fbd096e
Merge branch 'master' of https://github.com/krakjoe/phpdbg into frames
2013-11-23 18:36:39 +01:00
Bob Weinand
eb67cb6914
Fixed info literal
2013-11-23 18:36:33 +01:00
Felipe Pena
22b2478f83
Merge pull request #22 from heuripedes/master
...
fix whitespace in phpdbg.c
2013-11-23 09:33:42 -08:00
Higor Eurípedes
ba0b2ad466
fix whitespace in phpdbg.c
2013-11-23 14:30:10 -03:00
krakjoe
b76b543cae
fix sigint when executing
2013-11-23 17:09:52 +00:00
krakjoe
351a0ac761
fix sigint
2013-11-23 17:01:18 +00:00
krakjoe
97424c4bb9
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-23 16:59:47 +00:00
Felipe Pena
f62098ee27
- Exit debugger when hitting ctrl-c in no execution
2013-11-23 15:01:14 -02:00
krakjoe
f7ae1126f8
quit on CTRL+C when interactive
2013-11-23 16:59:31 +00:00
Felipe Pena
cf227df957
- Fix comment again and checking
2013-11-23 14:51:19 -02:00
Felipe Pena
e289dc464a
- err, revert
2013-11-23 14:46:38 -02:00
Felipe Pena
c8448d7e06
- Fix typo
2013-11-23 14:45:03 -02:00
Felipe Pena
b1dab16735
- Include fixed issues
2013-11-23 14:11:59 -02:00
Felipe Pena
b3f295c40d
- Missing register command
2013-11-23 14:07:04 -02:00
Felipe Pena
32d666b1c1
- Change version
2013-11-23 14:05:30 -02:00
Felipe Pena
a8338c1c7c
- Update changelog
2013-11-23 14:04:14 -02:00
Felipe Pena
fc8b7cb369
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-23 13:35:42 -02:00
Felipe Pena
3a72677e83
- Fix compiler warning
2013-11-23 13:35:30 -02:00
Felipe Pena
b0f7344919
- Fixed typo
2013-11-23 13:34:36 -02:00
krakjoe
7cd0ed51ed
fix ignore php.ini and override path
2013-11-23 15:11:09 +00:00
krakjoe
eafaa65a08
fix infruritating segfault
2013-11-23 14:25:45 +00:00
krakjoe
62cf2bea55
shut up valgrind
2013-11-23 13:42:08 +00:00
krakjoe
86faf2e1b6
fix memory error
2013-11-23 13:35:54 +00:00
krakjoe
42b372431b
hardcode log_errors setting
2013-11-23 13:11:47 +00:00
krakjoe
1ce2cdbfc8
-...
2013-11-23 13:05:36 +00:00
krakjoe
fc5af4620c
do not destroy opcodes on resetting same context
2013-11-23 13:04:27 +00:00
Felipe Pena
968421c145
- Removed unused var
2013-11-22 21:30:26 -02:00
Felipe Pena
4a6f7373a3
- Added support to set breakpoint in the current place
2013-11-22 21:05:25 -02:00
Felipe Pena
7a6ed70552
- Reset frame num here
2013-11-22 20:15:04 -02:00
krakjoe
94ecb5a75f
fix windows build
2013-11-22 20:42:57 +00:00
krakjoe
6bf06ac0ba
argv example in phpdbginit
2013-11-22 20:11:06 +00:00
krakjoe
88a95efdfa
compress help menu
2013-11-22 19:50:13 +00:00
krakjoe
e662fd9eb0
merge frame/trace commands from bwoebi
...
tidy up
add help for frame command
fix help made incorrect by additions
2013-11-22 19:06:31 +00:00
Bob Weinand
0917c754f9
Shut up, compiler!
2013-11-22 19:24:27 +01:00
Bob Weinand
202c1cee39
Fixed segfault + ZTS
2013-11-22 19:16:25 +01:00
Bob Weinand
c46a413697
Merge branch 'master' of https://github.com/krakjoe/phpdbg into frames
...
Conflicts:
phpdbg.h
phpdbg_prompt.c
2013-11-22 18:32:00 +01:00
Bob Weinand
5b51fb40e9
Added frames and beautified backtrace
2013-11-22 18:27:55 +01:00
krakjoe
022eb18d1d
...
2013-11-22 16:15:24 +00:00
krakjoe
e0c4f87a89
another tut
2013-11-22 13:49:35 +00:00
krakjoe
4fd2edbeb4
initializing tut
2013-11-22 12:38:40 +00:00
krakjoe
f1042cb028
...
2013-11-22 10:40:24 +00:00
krakjoe
c51e7e26e9
add readline completion tip to phpdbginit
2013-11-22 10:39:21 +00:00
krakjoe
46a67d15fe
better info literal
2013-11-22 09:56:17 +00:00
krakjoe
a6bd3807c4
better handling of sigint
...
info literals command
2013-11-22 09:09:54 +00:00
Felipe Pena
ae505ca339
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-21 21:24:21 -02:00
Felipe Pena
601b75731a
- WS
2013-11-21 21:19:55 -02:00
Felipe Pena
3db99f7d20
Merge pull request #14 from aurora/master
...
Fixed typo in Makefile.frag
2013-11-21 13:23:15 -08:00
Felipe Pena
62a104170c
- Fixed compiler warning
2013-11-21 19:20:10 -02:00
Harald Lapp
bea935f56e
Fixed typo in Makefile.frag
2013-11-21 22:15:47 +01:00
krakjoe
8350ca4621
...
2013-11-21 20:56:28 +00:00
Anatol Belski
696d286911
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
And here is the real fix for #66124
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:29:35 +01:00
Anatol Belski
ad5a63e8bc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2013-11-21 21:29:02 +01:00
Anatol Belski
345032946c
fixed test
2013-11-21 21:24:47 +01:00
krakjoe
cdd72cfda7
housekeeping, moving stuff to appropriate units
2013-11-21 19:47:31 +00:00
Andrey Hristov
763f4aef8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:29:37 +02:00
Andrey Hristov
ce09822269
And here is the real fix for #66124
2013-11-21 21:29:21 +02:00
Andrey Hristov
c2b2afacc0
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:15:22 +02:00
Andrey Hristov
4a1c9be857
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:14:42 +02:00
krakjoe
8743afbaa4
move opcode stuff to opcode.c
2013-11-21 16:45:12 +00:00
krakjoe
a13583d1df
use constant numbers
2013-11-21 16:41:41 +00:00
krakjoe
a3bcdba660
ws
2013-11-21 16:30:27 +00:00
krakjoe
916164c808
more on disassembler
2013-11-21 16:10:48 +00:00
krakjoe
0488640f4c
better output for disassembler
2013-11-21 13:52:20 +00:00
krakjoe
c8d408ffac
left justify oplines
2013-11-21 13:38:32 +00:00
krakjoe
fdde4aa80a
var and temp var numbers
2013-11-21 13:35:39 +00:00
krakjoe
ed8f64cc80
some work on opline output, incomplete
2013-11-21 11:16:14 +00:00
krakjoe
f68fee5054
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-21 09:12:17 +00:00
krakjoe
2001acc372
spelling correcting
2013-11-21 09:12:03 +00:00
Felipe Pena
d9b6f06aa0
- Removed unused var
2013-11-20 22:06:44 -02:00
krakjoe
e36b718004
fix broken subs
2013-11-20 22:23:34 +00:00
krakjoe
1c046c02b8
tidy
2013-11-20 22:03:36 +00:00
krakjoe
5ec586ce94
restore sanity to commands/handlers/the universe
2013-11-20 21:47:44 +00:00
krakjoe
75e2e7ddf5
stop break on condition from bugging out
2013-11-20 20:29:14 +00:00
Felipe Pena
3c36fb99f2
- Drop unneeded code
2013-11-20 17:28:27 -02:00
Felipe Pena
daf2b3e9ae
- Update Changelog
2013-11-20 17:26:51 -02:00
Felipe Pena
c3f43f0a6e
- Added support to break when signaling ctrl+c
2013-11-20 17:16:07 -02:00
Felipe Pena
9ba9abfa2a
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-20 16:52:42 -02:00
Felipe Pena
ed16d3b608
- Initial code for signal handling
2013-11-20 16:52:34 -02:00
krakjoe
a0c824955c
clean build on windows
2013-11-20 18:07:45 +00:00
krakjoe
17baeaa932
fix
2013-11-20 17:48:54 +00:00
krakjoe
a81cc6c552
remove unused mshutdown
2013-11-20 17:43:42 +00:00
krakjoe
004249cec9
fix bug, allow init access to vm uninterrupted
2013-11-20 17:09:06 +00:00
krakjoe
fdddde0d03
step through eval option
2013-11-20 17:01:37 +00:00
krakjoe
6d0991bad6
...
2013-11-20 16:52:14 +00:00
krakjoe
311c22277d
fix stepping into code from command line
2013-11-20 16:50:12 +00:00
krakjoe
3e8235e988
...
2013-11-20 16:41:14 +00:00
krakjoe
63c0db3a1d
fix eval
2013-11-20 16:32:30 +00:00
krakjoe
a0e3cb08e6
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
2013-11-20 16:26:21 +00:00
krakjoe
1a1e83a5d9
export more Zend API
2013-11-20 16:24:22 +00:00
krakjoe
12d969558d
-r option
2013-11-20 16:19:37 +00:00
krakjoe
53cddbca33
fix Makefile.frag on multicore builds ... possibly
2013-11-20 15:27:35 +00:00
krakjoe
96ae27eee0
update .phpdbginit with more info/example
2013-11-20 15:10:00 +00:00
krakjoe
734bc68375
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-20 14:59:41 +00:00
krakjoe
c3444a294e
add help for -q
2013-11-20 14:59:28 +00:00
Felipe Pena
0ce0c45191
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-20 12:55:22 -02:00
Felipe Pena
7384570bb2
- Fix extra byte allocation
2013-11-20 12:55:07 -02:00
krakjoe
54d6a99d83
fix strange chars on method breakpoint
2013-11-20 14:47:52 +00:00
krakjoe
d5af8a0e48
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-20 14:40:21 +00:00
krakjoe
1ab45b4cce
fix broken sub command error
2013-11-20 14:40:08 +00:00
Felipe Pena
e3b3dfd7be
- Update README
2013-11-20 12:36:48 -02:00
Felipe Pena
54f3dfa6fa
- Added option to hide banner
2013-11-20 12:35:25 -02:00
krakjoe
640bf973ce
correct help for register command
2013-11-20 14:30:56 +00:00
krakjoe
e717662730
fix eval for new input handling
2013-11-20 14:25:15 +00:00
krakjoe
4f5c7a963c
...
2013-11-20 14:21:17 +00:00
krakjoe
7a81ed4b74
fix #13 output buffering not working during execution
2013-11-20 14:19:15 +00:00
krakjoe
f92de15a1c
align
2013-11-20 13:56:31 +00:00
krakjoe
baff6e1d65
tidy alias menu
2013-11-20 13:51:47 +00:00
krakjoe
d5388bac79
fix shell command to use new input
2013-11-20 13:43:58 +00:00
Felipe Pena
de3b594156
- Fix conflict
2013-11-20 11:31:00 -02:00
Felipe Pena
febeeea4ba
- Fix conflict
2013-11-20 11:29:58 -02:00
Felipe Pena
a0b75a24e5
- Passing input ptr to handlers
2013-11-20 11:28:41 -02:00
krakjoe
13e98cd2c7
don't allocate that, static inline this
2013-11-20 13:09:36 +00:00
krakjoe
c10796e7e9
zend expects this to be clean memory
2013-11-20 13:00:28 +00:00
krakjoe
38679621bb
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-20 12:51:57 +00:00
krakjoe
cad9fb826b
registered functions able to accept any number of arguments
2013-11-20 12:49:47 +00:00
Felipe Pena
4ad50af9ac
- CS
2013-11-20 10:10:27 -02:00
Felipe Pena
31e35c2671
- CS
2013-11-20 09:16:02 -02:00
Felipe Pena
e7d0032bea
- CS
2013-11-20 09:11:23 -02:00
krakjoe
80386a329b
improve R
2013-11-20 10:49:39 +00:00
krakjoe
dd71744d48
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-20 10:06:29 +00:00
krakjoe
6417e472b4
use new input handling everywhere
2013-11-20 10:04:05 +00:00
Anatol Belski
c694d1df7b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
permanently deactivate that place, not on runtime only
2013-11-20 10:12:06 +01:00
Anatol Belski
18b2b2a0bc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
permanently deactivate that place, not on runtime only
2013-11-20 10:11:39 +01:00
Anatol Belski
b902a25cc3
permanently deactivate that place, not on runtime only
...
besides the two "if" checks, this fixes static analyze which is sometimes
broken because of this
2013-11-20 10:09:11 +01:00
Felipe Pena
3e6f942d1a
- Missing function prototype
2013-11-19 20:26:31 -02:00
Yasuo Ohgaki
bf91f101a6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:25:04 +09:00
Yasuo Ohgaki
b8b92bd790
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:23:54 +09:00
Yasuo Ohgaki
0d558afc05
Fix WS in serialization_error_002.phpt
2013-11-20 07:17:53 +09:00
Aaron Hamid
050dd59c63
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:14:53 +09:00
Felipe Pena
a1adc8124e
- Removed unnecessary check and allocation
2013-11-19 20:13:51 -02:00
Felipe Pena
bc278c7013
- Removed unused var
2013-11-19 20:09:19 -02:00
krakjoe
3709ea995c
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-19 21:58:03 +00:00
krakjoe
b65cef950a
more on functions
2013-11-19 21:54:58 +00:00
Felipe Pena
dace704d15
- Check for PHPDBG_DEBUG
2013-11-19 19:53:27 -02:00
Felipe Pena
4672313057
- Removed unused var
2013-11-19 19:40:01 -02:00
Felipe Pena
2e3723f08f
- Cosmetic changes
2013-11-19 19:35:45 -02:00
Felipe Pena
3853f5b370
- Added phpdbg_trim()
2013-11-19 19:26:40 -02:00
Jeff Welch
72a8489a12
Fixed tests that fail with non-default serialize_precision configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:34 +09:00
Jeff Welch
101c780500
Fixed tests that fail with non-default serialize_precision configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:23 +09:00
Jeff Welch
b4210efe76
Fixed tests that fail with non-default serialize_precision configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:14:32 +09:00
Felipe Pena
dee048c22a
- WS, removed unused var
2013-11-19 19:02:38 -02:00
krakjoe
5af371409c
debugging new input stuff
2013-11-19 20:27:23 +00:00
krakjoe
1a2618b229
avoid memory error
2013-11-19 19:36:39 +00:00
krakjoe
99a1414924
show where
2013-11-19 19:35:48 +00:00
krakjoe
cfc62cdbe0
cleanup
2013-11-19 19:24:21 +00:00
krakjoe
13b0ef71b5
...
2013-11-19 19:11:18 +00:00
krakjoe
690a3202fd
escaped strings
2013-11-19 19:10:09 +00:00
krakjoe
8ac46de2cf
argc/argv started
2013-11-19 17:18:58 +00:00
krakjoe
71811f1f7f
include registered functions in help for register command
2013-11-19 14:28:57 +00:00
krakjoe
b237401167
fix broken repeat command
2013-11-19 14:06:33 +00:00
krakjoe
b2a19a42d1
removed a loop
2013-11-19 13:22:46 +00:00
krakjoe
cf4b451d39
bail on fail for console input, fix - ./phpdbg
2013-11-19 13:11:45 +00:00
krakjoe
73e7f5c645
more tidy
2013-11-19 13:00:04 +00:00
krakjoe
d906613eb5
tidy up reading input, avoid leaks, restore sanity
2013-11-19 12:39:48 +00:00
Remi Collet
8c05e861d6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
avoid doing a stream_select on a closed stream
2013-11-19 12:42:44 +01:00
Remi Collet
87cabc04ac
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
avoid doing a stream_select on a closed stream
2013-11-19 12:42:25 +01:00
Remi Collet
25c08a839a
avoid doing a stream_select on a closed stream
2013-11-19 12:41:58 +01:00
krakjoe
924d5bdbe6
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-19 10:59:45 +00:00
krakjoe
2ebb9e48be
better call register
2013-11-19 10:56:50 +00:00
Felipe Pena
d45e882573
- Fixed memory issue
2013-11-19 08:53:51 -02:00
Felipe Pena
e863e71234
- Removed unused variable
2013-11-19 08:49:44 -02:00
krakjoe
7c077f7040
ordering
2013-11-19 01:56:33 +00:00
krakjoe
54aaf898ca
...
2013-11-19 01:51:56 +00:00
krakjoe
fb6df2fa08
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-19 01:50:38 +00:00
krakjoe
9ebc61f282
help for register better formatting for help menu
2013-11-19 01:48:21 +00:00
Felipe Pena
db8f825414
- Fix build
2013-11-18 23:30:57 -02:00
krakjoe
0250a0992c
don't dtor that
2013-11-19 01:22:02 +00:00
krakjoe
dc1cd94dec
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-19 01:19:01 +00:00
krakjoe
599047f153
register functions, needs work
2013-11-19 01:18:43 +00:00
Felipe Pena
11b8fcf974
- Update changelog
2013-11-18 22:21:02 -02:00
krakjoe
a37de13a20
correction to print stack
2013-11-18 23:49:57 +00:00
krakjoe
af20f1a474
fix memory errors when printing execution context
2013-11-18 23:48:10 +00:00
krakjoe
407ab7d57e
make errors stand out more, don't duplicate output
2013-11-18 23:41:57 +00:00
krakjoe
d82eca8c86
add resource type to info
2013-11-18 23:18:22 +00:00
krakjoe
1051564059
changes to info
2013-11-18 23:04:20 +00:00
krakjoe
7f73c7486a
no data in variable info, too messy with normal objects
2013-11-18 22:45:16 +00:00
krakjoe
f141481cf2
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-18 22:18:29 +00:00
Felipe Pena
3660929530
- WS, removed unused var
2013-11-18 20:12:27 -02:00
krakjoe
2bd7ed4288
tidy vars
2013-11-18 22:10:41 +00:00
Felipe Pena
723c671750
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-18 20:08:31 -02:00
krakjoe
7b65a29471
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-18 22:04:36 +00:00
krakjoe
a582d2793d
fix memory errors
2013-11-18 21:59:42 +00:00
Felipe Pena
b4d9fbdbff
- WS
2013-11-18 19:59:15 -02:00
Felipe Pena
8951406678
- Fix valgrind reports + CS
2013-11-18 19:55:29 -02:00
Andrea Faulds
35b463a2c5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Removed UPGRADING note
Rewrote test using tcp instead of http:// stream
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
2013-11-18 21:43:59 +00:00
Felipe Pena
a1156cae5c
- Avoid to show number of variable
2013-11-18 19:36:25 -02:00
Felipe Pena
b649693a90
- Removed unused variable
2013-11-18 19:32:28 -02:00
Andrea Faulds
e3528f086a
Updated NEWS
2013-11-18 21:23:45 +00:00
Andrea Faulds
9937e2fda5
Merge branch 'CLIGetAllHeadersBackport' into PHP-5.5
...
* CLIGetAllHeadersBackport:
Removed UPGRADING note
Rewrote test using tcp instead of http:// stream
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
2013-11-18 21:19:07 +00:00
krakjoe
9b30877d56
fix memory error
2013-11-18 20:20:07 +00:00
krakjoe
9190e783a2
no more allocing params
2013-11-18 18:05:37 +00:00
krakjoe
75bc53d7de
avoid leaks from parameters
2013-11-18 17:51:14 +00:00
krakjoe
c78d9bf283
update image
2013-11-18 17:15:44 +00:00
krakjoe
9a5d51555e
remove changes
2013-11-18 17:05:34 +00:00
krakjoe
7a30a79fd4
improve uncaught exception handler
2013-11-18 17:00:26 +00:00
krakjoe
e02c26d1f5
correction to aliases
2013-11-18 14:51:08 +00:00
krakjoe
93c5968e72
tidy help
2013-11-18 14:47:27 +00:00
krakjoe
e349330a6f
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-18 14:25:29 +00:00
krakjoe
508ac961aa
add stack printer
...
add alias examples in help
tidy up in help
2013-11-18 14:24:58 +00:00
Felipe Pena
4a1cb2262e
- Removed unused variables
2013-11-18 12:09:25 -02:00
krakjoe
9b7b7c4a39
don't resize window on windows anymore, not required
2013-11-18 13:29:08 +00:00
krakjoe
8588f5cc84
compress text/tidy up
2013-11-18 13:23:28 +00:00
krakjoe
a1478217ce
corrections
2013-11-18 13:07:13 +00:00
krakjoe
d34f1e59c0
help for shell command
2013-11-18 13:03:33 +00:00
krakjoe
e7e3dbccbf
shell command
2013-11-18 12:46:10 +00:00
krakjoe
81e1f70e52
change message, it's wrong
2013-11-18 12:09:01 +00:00
krakjoe
858629b600
destroy displayed exception and reset eg
2013-11-18 12:06:06 +00:00
krakjoe
57b67d71b0
display uncaught exceptions
2013-11-18 11:51:41 +00:00
kovacs.ferenc
2042d78fce
Merge branch 'JSONCaseFix' of git://github.com/TazeTSchnitzel/php-src into TazeTSchnitzel-JSONCaseFix
2013-11-18 12:12:24 +01:00
krakjoe
5cc88ca88a
fix stack entry detection for symbol breakpoints
...
count yield as return for leave/finish
2013-11-18 11:04:24 +00:00
krakjoe
c70c156ca1
seek ZEND_YIELD
2013-11-18 10:32:33 +00:00
krakjoe
775376b362
better way to detect leave/finish
2013-11-18 03:18:37 +00:00
krakjoe
8ada4342a4
don't be lazy, scan for ZEND_RETURN when setting seek opline
2013-11-18 02:14:17 +00:00
krakjoe
5b4837846a
clean flags on run
2013-11-18 01:50:28 +00:00
krakjoe
a1620a7bb4
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-18 01:45:03 +00:00
krakjoe
07c0dc00cb
fixup until/leave/finish
2013-11-18 01:44:46 +00:00
Felipe Pena
7e2a4bcc94
- WS
2013-11-17 23:18:12 -02:00
Felipe Pena
a84ac64585
- WS
2013-11-17 23:08:53 -02:00
Felipe Pena
f72b2d6c7c
- Move phpdbg_welcome to phpdbg.c and staticfy it
2013-11-17 23:07:57 -02:00
Felipe Pena
66494ad94e
- CS
2013-11-17 23:05:14 -02:00
Felipe Pena
a7c4a6c21b
- Removed unreached break stmt
2013-11-17 23:04:46 -02:00
Felipe Pena
44168c36a8
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-17 22:56:07 -02:00
Felipe Pena
2941a4ab50
- print command has optional arguments
2013-11-17 22:55:52 -02:00
krakjoe
f9a66f0d44
brifer
2013-11-18 00:42:07 +00:00
krakjoe
e97fcb4592
try another layout
2013-11-18 00:27:21 +00:00
Joe Watkins
27ae287c49
fix window size on windows
...
make window as big as possible on windows for readability
2013-11-18 00:23:04 +00:00
Joe Watkins
0966cad651
fix mmap in windows
...
fix mmap in windows
2013-11-17 23:48:07 +00:00
Joe Watkins
ff2abccc4b
fix windows build
...
fix windows build and add header
2013-11-17 23:34:11 +00:00
Felipe Pena
eef21c186c
- Rename has_args to arg_type
2013-11-17 20:07:19 -02:00
Felipe Pena
35601e6fec
- Fix argument information
2013-11-17 20:05:21 -02:00
Felipe Pena
09391b1f72
- WS
2013-11-17 19:04:39 -02:00
Felipe Pena
0f7b4b3c30
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-17 19:02:22 -02:00
Felipe Pena
d054172a33
- Clean up command macros
...
- Added flag to specify no argument, required argument and optional argument
2013-11-17 19:01:41 -02:00
Felipe Pena
e514804cac
- WS
2013-11-17 17:40:49 -02:00
krakjoe
dbe8b26ab7
force clean build every time, no room for error
2013-11-17 19:10:12 +00:00
krakjoe
635466b609
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-17 19:07:12 +00:00
krakjoe
cf5ef86a86
correction
2013-11-17 19:07:02 +00:00
Felipe Pena
f2e4e63b5e
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-17 17:01:19 -02:00
Felipe Pena
66588d7ff7
- Implemented "info error" command
2013-11-17 17:00:59 -02:00
krakjoe
25d24f2ed9
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-17 18:57:34 +00:00
krakjoe
6acf069c58
added info funcs
2013-11-17 18:55:06 +00:00
Felipe Pena
2c9dbc6b62
- Fix conflict
2013-11-17 16:45:08 -02:00
Felipe Pena
31f45d5457
- Added "info vars" to show active variables
2013-11-17 16:43:37 -02:00
krakjoe
0230f7cd18
tidy
2013-11-17 18:33:34 +00:00
krakjoe
7c76e45410
info classes + help
2013-11-17 18:26:56 +00:00
Felipe Pena
33098232dc
- Fix conflict
2013-11-17 14:13:13 -02:00
Felipe Pena
478446b665
- Added macro for trailling command
2013-11-17 14:10:43 -02:00
krakjoe
02e3718ef9
fix segfault when autoglobals are not properly setup
2013-11-17 16:06:30 +00:00
Felipe Pena
4ee192ae3d
- Use macro here
2013-11-17 14:05:10 -02:00
krakjoe
a0151e91a5
fix list not working when exec is set but not executing
2013-11-17 15:57:49 +00:00
Felipe Pena
17cc942e7c
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-17 13:42:46 -02:00
Felipe Pena
ca32181b1c
- Initial code for info command
2013-11-17 13:42:34 -02:00
krakjoe
2ba9e9306f
leave function + help
2013-11-17 15:39:23 +00:00
krakjoe
e2f20c57c1
finish?
2013-11-17 15:01:22 +00:00
Felipe Pena
f2b8cdc5be
- Added finish/f command
2013-11-17 11:59:21 -02:00
Felipe Pena
146520f045
- Missing credits
2013-11-17 10:40:51 -02:00
Felipe Pena
180bb579bf
- Fix trailling newline handling
2013-11-17 10:23:50 -02:00
Felipe Pena
f51a08b6d6
- Fix conflict
2013-11-17 10:12:10 -02:00
Felipe Pena
4eb20ecfe7
- Drop unneeded parenthesis
2013-11-17 10:10:02 -02:00
krakjoe
ced99e1b1d
fix whitepsace in here first
2013-11-17 12:07:01 +00:00
Felipe Pena
677aa7baa7
- Change error message
2013-11-17 09:37:14 -02:00
krakjoe
605adfc613
phpdbg_default_switch_case(); in list lines
2013-11-17 11:31:09 +00:00
Felipe Pena
1e0d92975e
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-17 09:29:13 -02:00
Felipe Pena
dd25fb44fd
- Fix conflict
2013-11-17 09:28:14 -02:00
krakjoe
f2edc066f2
fix compiler warning
2013-11-17 11:17:47 +00:00
Felipe Pena
c302c94b0a
- Use offset when listing active file and reuse list handler code
2013-11-17 09:15:53 -02:00
krakjoe
dcead8ea90
add highlight param to file listing
2013-11-17 11:11:09 +00:00
krakjoe
5768e98cb0
correction
2013-11-17 09:36:14 +00:00
krakjoe
22ae0d51a1
add print exec command to show current execution context instructions
...
make phpdbg_compile public
2013-11-17 09:30:44 +00:00
Xinchen Hui
140a42f779
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-17 17:20:13 +08:00
Xinchen Hui
5e9268f469
Update NEWS
2013-11-17 17:06:27 +08:00
Xinchen Hui
de79c51555
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-17 17:05:04 +08:00
Xinchen Hui
823e330c75
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
2013-11-17 17:04:37 +08:00
krakjoe
434949c5b4
consistency in prompt/list, do not return FAILURE from command handlers
2013-11-16 23:35:11 +00:00
krakjoe
8f4f4f0628
uniform code in print.c
2013-11-16 23:25:33 +00:00
krakjoe
a28ea698b8
cleanup in list ... last time
2013-11-16 23:11:39 +00:00
krakjoe
7bc369399b
switches in list.c, be consistent in all command handlers
2013-11-16 22:58:30 +00:00
krakjoe
b424771ce8
stat before setting breakpoints on files
...
default switch case for command handlers
trace route through handler tree for debugging etc **selected
2013-11-16 22:40:01 +00:00
krakjoe
102e3477d7
remove more no expression provided messages
2013-11-16 21:28:59 +00:00
krakjoe
f0ed181081
get rid of No Expression Provided messages, not required anymore
2013-11-16 21:25:22 +00:00
krakjoe
593e7b28e8
stat execution context and check it is a regular file or symlink
2013-11-16 21:23:14 +00:00
krakjoe
5a0422d8c6
establish relationship between parent and child commands
...
extend alias help
automatically invoke child commands
2013-11-16 20:57:10 +00:00
krakjoe
dd89817362
include all alias and child command information in help
2013-11-16 19:39:14 +00:00
krakjoe
80b82cd538
add list class and method commands
...
update help text to be more specific
2013-11-16 18:53:12 +00:00
krakjoe
f03b6b4433
update bootstrap
2013-11-16 15:37:00 +00:00
krakjoe
74651f8d68
...
2013-11-16 14:58:16 +00:00
krakjoe
7acf88322b
fix is_class_method (needs revision)
...
don't free last (needs revision)
2013-11-16 14:55:53 +00:00
krakjoe
cf58c7cea3
make handlers take phpdbg_param_t
2013-11-16 14:34:49 +00:00
krakjoe
10ec0ee8b1
move phpdbg_param_t to phpdbg.c|h
...
add string length and type to param_t (made struct instead of union)
typedef enumerated param types
add some error messages when command recieves unsupported values
2013-11-16 13:15:00 +00:00
Felipe Pena
bff5abfd95
- Fixed possible memleak
2013-11-16 10:02:35 -02:00
Felipe Pena
515f7806c5
- Fixed repeat-last-command feature for next and until command
2013-11-16 09:50:25 -02:00
Felipe Pena
44d27200f6
- Fix compiler warning
2013-11-16 09:34:23 -02:00
krakjoe
403072e488
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-16 11:12:22 +00:00
krakjoe
19ada893cb
add phpdbg_debug function and --enable-phpdbg-debug configure option
...
added debug statement to do_cmd in preparation for updates
2013-11-16 11:11:47 +00:00
Felipe Pena
0629f32afc
- Added changelog file
2013-11-16 09:08:54 -02:00
Felipe Pena
25b9a366e4
- Implemented issue #11 (until command)
2013-11-16 08:59:50 -02:00
krakjoe
3cb6af2cc1
add clean-phpdbg rule to Makefile.frag to aid development
2013-11-16 10:39:12 +00:00
krakjoe
7a56e9bc84
fix segfault on some implementations of atoi
2013-11-15 20:52:48 +00:00
Christopher Jones
81d0ba10ba
Update NEWS
2013-11-15 12:37:52 -08:00
Christopher Jones
419bef3070
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
This is CLI web server change. Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that. Ref http://news.php.net/php.internals/69990
2013-11-15 12:37:17 -08:00
Christopher Jones
d0cd112702
This is CLI web server change. Added some common MIME types to the
...
existing lookup list, pending a more thorough lookup solution, if
anyone wants to do that. Ref http://news.php.net/php.internals/69990
A router can be used to add to, or override, the MIME type lookups,
see http://php.net/manual/en/features.commandline.webserver.php
2013-11-15 12:36:25 -08:00
Felipe Pena
1cbc914406
- Back to development
2013-11-15 18:21:36 -02:00
Felipe Pena
d83c7c27d2
- Preparing for first release
2013-11-15 18:10:04 -02:00
Felipe Pena
cd8efea14d
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-15 14:24:34 -02:00
Felipe Pena
d13c02bf68
- Fix compiler warning
2013-11-15 14:24:22 -02:00
krakjoe
95f5d779ba
arginfo for userland functions
2013-11-15 16:22:20 +00:00
krakjoe
8c67cf30b5
cleanup
2013-11-15 16:17:57 +00:00
krakjoe
24c6e3c317
add oplog status to context information on print command
2013-11-15 16:12:27 +00:00
krakjoe
ae5f0d0f27
...
2013-11-15 16:09:40 +00:00
krakjoe
1b615298bf
tidy example
2013-11-15 15:59:54 +00:00
krakjoe
057f11c4ca
extend userland api phpdbg_break function
2013-11-15 15:54:14 +00:00
krakjoe
38ed8d89d0
remove additional switch
2013-11-15 15:34:48 +00:00
krakjoe
a3f2137173
...
2013-11-15 15:26:51 +00:00
krakjoe
b63fd6d261
embed code in .phpdbginit
2013-11-15 14:53:40 +00:00
Felipe Pena
8b41387343
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-15 09:27:18 -02:00
Felipe Pena
00159635ad
- Removed unused var
2013-11-15 09:27:05 -02:00
krakjoe
f304541589
...
2013-11-15 11:21:30 +00:00
krakjoe
aeeba85221
implement 5.4 support
2013-11-15 11:19:26 +00:00
Remi Collet
4508a84d0d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix Bug #65714 PHP cli forces the tty to cooked mode
2013-11-15 09:53:07 +01:00
Remi Collet
cd6eda5e5f
NEWS
2013-11-15 09:52:48 +01:00
Remi Collet
b8d88bf2c5
Fix Bug #65714 PHP cli forces the tty to cooked mode
...
Only drop the using_history() call with libedit as I don't know
if it is required with readline.
This also allow to run a php script in background without
it being aborted on first output.
2013-11-15 09:49:42 +01:00
krakjoe
76ec5635a4
include conditional breakpoints in out
2013-11-14 23:06:31 +00:00
krakjoe
ad73291405
swap welcome/init around
2013-11-14 21:51:55 +00:00
krakjoe
9516dc4269
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-14 21:40:44 +00:00
krakjoe
2a2c88cace
change image on tutorial
2013-11-14 21:40:34 +00:00
Felipe Pena
99f35d72f1
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-14 19:40:25 -02:00
Felipe Pena
0896236a7a
- Change comment style
2013-11-14 19:39:59 -02:00
krakjoe
0144192e0b
..
2013-11-14 21:37:07 +00:00
krakjoe
918703ff94
tidy
2013-11-14 21:20:37 +00:00
krakjoe
04149df489
update image
2013-11-14 21:18:12 +00:00
krakjoe
4c62cc97e4
better description
2013-11-14 21:15:47 +00:00
krakjoe
c3c95610c1
...
2013-11-14 21:13:29 +00:00
krakjoe
582a84d728
correction
2013-11-14 21:12:51 +00:00
krakjoe
f2212c05c7
add opline logging and setup including command line option
2013-11-14 21:10:44 +00:00
Adam Harvey
3683713b2c
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
2013-11-14 10:52:43 -08:00
krakjoe
365b5db1f6
...
2013-11-14 18:52:26 +00:00
Adam Harvey
d7441f6695
Move the JSON bugfix into the 5.5.6 changelog.
2013-11-14 10:52:07 -08:00
krakjoe
d948ea62cb
correction
2013-11-14 18:51:45 +00:00
krakjoe
cd956373ba
help for command line options
2013-11-14 18:50:34 +00:00
krakjoe
5da544ecb3
correction
2013-11-14 17:32:10 +00:00
krakjoe
1e19001693
example .phpdbginit
2013-11-14 17:29:21 +00:00
krakjoe
6b864a8b0f
fix crash when .phpdbginit quits
2013-11-14 17:03:36 +00:00
krakjoe
5147c87f2c
updates
2013-11-14 17:00:51 +00:00
krakjoe
1ee3950747
implement init file and command line options
2013-11-14 16:58:50 +00:00
krakjoe
1544562b49
fix case sensitivity in print func command
2013-11-14 16:29:48 +00:00
krakjoe
6c6779d474
fix case sensitivity in print method command
2013-11-14 16:25:55 +00:00
krakjoe
fb1ee0bbf6
...
2013-11-14 16:17:22 +00:00
krakjoe
e4fefee020
fix stepping
2013-11-14 16:14:20 +00:00
krakjoe
b4de11a2b4
...
2013-11-14 16:03:40 +00:00
krakjoe
6a3194a47d
move listing commands out to their own command list
...
add TSRMLS_CC in clear_param for consistency
2013-11-14 15:46:06 +00:00
krakjoe
7763b0b383
phpdbg_init from file & command line option (no impl yet)
2013-11-14 14:14:13 +00:00
krakjoe
1107ccef99
fix for calculator hardware :)
2013-11-14 13:48:13 +00:00
krakjoe
22a3a2394f
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-14 13:05:37 +00:00
krakjoe
8e597eba07
additional checks in is_*
2013-11-14 13:04:59 +00:00
Felipe Pena
b4ff86b79b
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-14 10:40:15 -02:00
Felipe Pena
1d7562bb99
- Added .gdbinit
2013-11-14 10:40:01 -02:00
krakjoe
187d1c726b
fix duplicate message on print .func if no active class
2013-11-14 12:29:23 +00:00
krakjoe
4283b125c9
alias printing commands
2013-11-14 12:25:19 +00:00
krakjoe
dc580c685f
fix quit not working
2013-11-14 12:21:28 +00:00
krakjoe
801a575c47
fix crash on clean
2013-11-14 11:30:31 +00:00
krakjoe
dcb6906bc4
fix crash when cleaning environment
...
fix crash when specifying exec on command line
2013-11-14 11:13:21 +00:00
krakjoe
6eba5c6664
clear conditional breaks in uapi
2013-11-14 09:18:06 +00:00
krakjoe
695decf7e1
TSRMLS_CC missing
2013-11-14 07:46:30 +00:00
Felipe Pena
2475207588
- Missing break
2013-11-13 22:30:03 -02:00
Felipe Pena
0eea7e4504
- Cosmetic changes
2013-11-13 22:29:44 -02:00
Felipe Pena
b91a5053f8
- Cosmetics
2013-11-13 22:16:41 -02:00
Felipe Pena
782615ac1c
- Use realpath on PHPDBG_G(exec)
2013-11-13 21:36:02 -02:00
Felipe Pena
d074b7a9df
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-13 21:13:54 -02:00
Felipe Pena
4c59ad6e2e
- Added parameter parsing functions
2013-11-13 21:13:41 -02:00
krakjoe
0c2a76ad5f
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-13 22:18:35 +00:00
krakjoe
453194d0ac
change defaults for windows
2013-11-13 22:18:20 +00:00
Joe Watkins
667456529a
windows preview image
2013-11-13 21:48:04 +00:00
Felipe Pena
9840c6ae97
- Unnesting some code
2013-11-13 19:43:54 -02:00
Felipe Pena
b81236d694
- Removed double checking + ws changes
2013-11-13 19:31:33 -02:00
Felipe Pena
9bc6296fe0
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-13 19:27:38 -02:00
Felipe Pena
0cc067aa81
- Added check for file context on "break lineno" and name length on "break func"
2013-11-13 19:27:24 -02:00
krakjoe
a43bc6ef91
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-13 21:15:57 +00:00
krakjoe
3f927019cb
updates for windows
2013-11-13 21:15:45 +00:00
Felipe Pena
388b132d31
- Fixed crash when supplied invalid syntax to "break file"
2013-11-13 19:11:45 -02:00
krakjoe
1c1cc51295
...
2013-11-13 19:32:21 +00:00
krakjoe
0bc987c9b4
fix clashing
2013-11-13 18:17:06 +00:00
krakjoe
375c90324c
...
2013-11-13 17:39:53 +00:00
krakjoe
188f4d3c51
aliasing commands
2013-11-13 17:35:51 +00:00
Andrea Faulds
7d2609b0f5
Removed UPGRADING note
...
Conflicts:
UPGRADING
2013-11-13 17:05:02 +00:00
krakjoe
a6a909101f
...
2013-11-13 14:53:28 +00:00
krakjoe
f6d45107b2
show conditionals
2013-11-13 14:50:13 +00:00
krakjoe
072622e799
don't allow conditionals to be executed by eval()'d code
2013-11-13 14:41:25 +00:00
krakjoe
b81005f94b
...
2013-11-13 14:32:36 +00:00
krakjoe
57ae58c9bf
support conditional breakpoints
2013-11-13 14:22:01 +00:00
Remi Collet
74ab30e216
fix merge
2013-11-13 13:21:12 +01:00
Remi Collet
018b9445da
Fix failed test with recent glibc
...
In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See http://repo.or.cz/w/glibc.git/commitdiff/ddc7e412ab252e7360a4357664beb3b5d9c4f42b
So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string
Removing %Z from tested format gives the same behavior with all version.
2013-11-13 13:19:10 +01:00
Joe Watkins
bc610565fc
Merge pull request #10 from salathe/patch-1
...
Small grammar changes
2013-11-13 03:47:10 -08:00
Peter Cowburn
3bac20c598
Small grammar changes
2013-11-13 10:54:58 +00:00
krakjoe
f55acc410c
...
2013-11-13 10:39:36 +00:00
krakjoe
03b43e3404
consistency
2013-11-13 10:35:25 +00:00
krakjoe
4def1ab3a9
...
2013-11-13 10:32:54 +00:00
krakjoe
68ba58ee48
move image from root
2013-11-13 10:31:03 +00:00
krakjoe
af1bb02dab
...
2013-11-13 10:26:27 +00:00
krakjoe
ed3339f627
...
2013-11-13 10:25:51 +00:00
krakjoe
9b616b17c9
...
2013-11-13 10:25:14 +00:00
krakjoe
ae1c05944c
...
2013-11-13 10:17:53 +00:00
krakjoe
7928d1f9e2
...
2013-11-13 10:16:09 +00:00
krakjoe
ae683043e2
...
2013-11-13 10:10:47 +00:00
krakjoe
b74dda9576
...
2013-11-13 09:55:42 +00:00
krakjoe
0f2c75efb2
add intro tutorial
2013-11-13 09:55:06 +00:00
krakjoe
216c1f5e99
show printing image
2013-11-13 09:39:43 +00:00
krakjoe
34ca093f65
add show verbose execution image
2013-11-13 09:33:22 +00:00
krakjoe
459232e7b7
...
2013-11-13 09:22:22 +00:00
krakjoe
2ee351d90b
show break screen image
2013-11-13 09:17:58 +00:00
krakjoe
9967c7d6bb
break help image
2013-11-13 09:03:58 +00:00
krakjoe
f4f8246de9
help image
2013-11-13 08:29:00 +00:00
krakjoe
b72a37dc5f
tutorials directory for images and markdown
2013-11-13 08:23:40 +00:00
krakjoe
8b7ab83014
clean up build
2013-11-13 08:11:23 +00:00
krakjoe
5e266f34fc
non readline fixes
2013-11-13 08:05:26 +00:00
krakjoe
b6c4fbee1b
...
2013-11-13 05:39:18 +00:00
krakjoe
99bbc8e811
method printer
2013-11-13 05:36:01 +00:00
krakjoe
88ad7f9279
more detailed opline
2013-11-13 04:47:07 +00:00
krakjoe
63a0c1ca15
...
2013-11-13 04:34:02 +00:00
krakjoe
a6d08af06b
fix leak from readline
2013-11-13 04:20:39 +00:00
krakjoe
176f995c24
activate globals
2013-11-13 04:04:41 +00:00
krakjoe
60a8d908ce
...
2013-11-13 03:04:47 +00:00
krakjoe
0354bab777
...
2013-11-13 02:59:10 +00:00
krakjoe
2464629b5c
fix
2013-11-13 02:50:00 +00:00
krakjoe
fec3b77a0f
...
2013-11-13 02:48:22 +00:00
krakjoe
0ade5f0d9d
fix list length lookup
2013-11-13 02:43:09 +00:00
krakjoe
94e887cf2a
...
2013-11-13 02:39:02 +00:00
krakjoe
efee212045
class/func printers
2013-11-13 02:26:37 +00:00
krakjoe
0781e7b863
fix segfault on set break opline address
2013-11-13 01:44:59 +00:00
krakjoe
68cff82d8b
class printer
2013-11-13 01:35:39 +00:00
krakjoe
43c2748dce
fix bug in passing correct expression length
...
add class printer (half done)
2013-11-13 00:36:47 +00:00
krakjoe
5204026308
housework
2013-11-12 23:54:41 +00:00
krakjoe
a8285e3bbf
no more printf
2013-11-12 23:43:49 +00:00
krakjoe
ce78503e15
remove more printf
2013-11-12 23:31:46 +00:00
krakjoe
afa216fd7e
deploy _write
2013-11-12 23:17:37 +00:00
krakjoe
a712674964
added phpdbg_write to replace all the printf
2013-11-12 23:10:53 +00:00
Felipe Pena
ff54d20b58
- Fix prototype and memory leak
2013-11-12 20:55:39 -02:00
Felipe Pena
5d435cb831
- Spred more some macro usage instead of phpdbg_print()
2013-11-12 20:48:52 -02:00
Felipe Pena
27f640d879
- Added phpdbg_notice() and phpdbg_error()
2013-11-12 20:39:39 -02:00
Felipe Pena
bbd523e5cb
- Cosmetic
2013-11-12 19:40:15 -02:00
Nikita Popov
dc4bf922d9
Allow $num=0 in array_fill()
...
Implemented request #49824 .
2013-11-12 22:02:51 +01:00
Andrea Faulds
a3f5b9f62d
Rewrote test using tcp instead of http:// stream
2013-11-12 20:27:38 +00:00
Andrea Faulds
aee271ec0d
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
...
- Implemented apache_request_headers() and getallheaders() alias in CLI server
- Implemented apache_response_headers() in CLI server using FastCGI code
Conflicts:
NEWS
UPGRADING
2013-11-12 20:27:34 +00:00
Felipe Pena
e8cb646fed
- Fix compiler warning
2013-11-12 16:53:48 -02:00
Julien Pauli
1984919ddc
5.5.7 now
2013-11-12 18:20:09 +01:00
krakjoe
6b3b14e8dd
...
2013-11-12 16:13:14 +00:00
krakjoe
b6f5b64c61
...
2013-11-12 16:07:59 +00:00
krakjoe
c43d5a558f
...
2013-11-12 16:04:41 +00:00
krakjoe
803303057a
fix output from print command to show all breakpoints
2013-11-12 15:51:30 +00:00
Felipe Pena
9c37190876
- Fix allocation size
2013-11-12 13:17:24 -02:00
Felipe Pena
edbb1313a1
- Simplify code
2013-11-12 13:10:29 -02:00
Felipe Pena
5a3285ae99
- Cosmetic change
2013-11-12 11:44:36 -02:00
Felipe Pena
2e14649c92
- Added check for malformed class::method syntax
2013-11-12 11:39:02 -02:00
Felipe Pena
b133dbefe0
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-12 11:34:09 -02:00
Felipe Pena
af90b6d5c7
- Improved breakpoint code
2013-11-12 11:33:51 -02:00
krakjoe
4269b29c03
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-12 13:23:54 +00:00
krakjoe
277b10a5c0
...
2013-11-12 13:21:55 +00:00
Felipe Pena
fdf26eaa0f
- Removed name member to opline breakpoints
2013-11-12 11:07:35 -02:00
Felipe Pena
fe7a3ef578
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-12 10:58:30 -02:00
Felipe Pena
ffad3fa211
- Implemented "break N" where N is the line number on the current file
2013-11-12 10:58:19 -02:00
krakjoe
3168b7b057
more windows
2013-11-12 12:38:04 +00:00
krakjoe
9e47ce64ac
windows
2013-11-12 12:11:02 +00:00
krakjoe
6cc7a5784e
windows
2013-11-12 12:10:53 +00:00
krakjoe
7f743e1fca
...
2013-11-12 09:52:59 +00:00
krakjoe
1d373be4fb
updates to helpers
2013-11-12 09:26:26 +00:00
krakjoe
83852d3bb7
...
2013-11-12 08:28:03 +00:00
krakjoe
c00abb0e75
printer commands
2013-11-12 08:26:11 +00:00
krakjoe
ff4c0c9397
...
2013-11-12 07:09:07 +00:00
krakjoe
6c5831aa09
...
2013-11-12 07:08:00 +00:00
krakjoe
25475ff95e
...
2013-11-12 07:01:28 +00:00
krakjoe
4b2490426f
web-bootstrap example
2013-11-12 06:57:56 +00:00
krakjoe
bb715ac77d
...
2013-11-12 06:47:33 +00:00
krakjoe
f566a6136b
additional list option, class methods
2013-11-12 06:43:23 +00:00
krakjoe
a29c0e5c96
...
2013-11-12 06:31:29 +00:00
krakjoe
f452364060
...
2013-11-12 06:29:54 +00:00
krakjoe
fd0aeb5b53
...
2013-11-12 06:05:24 +00:00
krakjoe
78418cc38c
...
2013-11-12 06:04:32 +00:00
krakjoe
4112330bb5
colourfulness
2013-11-12 06:03:37 +00:00
krakjoe
12926b6aa9
...
2013-11-12 04:54:41 +00:00
krakjoe
6c317b771e
more command line options
2013-11-12 04:53:04 +00:00
krakjoe
bf8a9c141f
readline
2013-11-12 04:22:33 +00:00
krakjoe
33f0502f19
readline support #6
2013-11-12 04:20:14 +00:00
krakjoe
97d4052bb8
...
2013-11-12 03:14:56 +00:00
krakjoe
08973a6bf5
...
2013-11-12 03:04:12 +00:00
krakjoe
3097c36f30
more help
2013-11-12 03:02:42 +00:00
krakjoe
ed690e1899
...
2013-11-12 02:59:10 +00:00
krakjoe
94c32c7256
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-12 02:52:54 +00:00
Felipe Pena
5785df4957
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-12 00:54:35 -02:00
Felipe Pena
f704fdea57
- Not needed strlen() here
2013-11-12 00:54:22 -02:00
krakjoe
32acf4736b
...
2013-11-12 02:52:43 +00:00
krakjoe
69a8403175
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-12 02:50:44 +00:00
krakjoe
b9c1c872f6
...
2013-11-12 02:50:24 +00:00
Felipe Pena
6658f58d4a
- Added phpdbg_is_empty function
2013-11-12 00:50:15 -02:00
krakjoe
79ab9a3f74
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-12 02:35:29 +00:00
krakjoe
8c91727484
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-12 02:35:07 +00:00
Felipe Pena
bd432b995e
- Update list cmd description
2013-11-12 00:34:10 -02:00
krakjoe
c7b51537a0
fix
2013-11-12 02:29:56 +00:00
Felipe Pena
6aad2ee42c
- Fix function
2013-11-12 00:28:52 -02:00
Felipe Pena
629b96295e
- Fix conflict
2013-11-12 00:25:30 -02:00
Felipe Pena
e32d511cec
- Added "list func" support
2013-11-12 00:19:43 -02:00
krakjoe
d7e09f9564
blurb/version/issues string
2013-11-12 02:04:54 +00:00
krakjoe
fa3056c833
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-12 01:58:39 +00:00
krakjoe
c2365d8283
compress globals
2013-11-12 01:51:50 +00:00
Felipe Pena
77cb82dd22
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-11 23:41:29 -02:00
Felipe Pena
8ec5d30097
- Added PHPDBG_BP_MASK macro
2013-11-11 23:41:14 -02:00
krakjoe
8de21cb2e2
[Not running]
2013-11-12 01:31:51 +00:00
Felipe Pena
9d18e1dc3e
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-11 23:31:08 -02:00
krakjoe
8586a1b4cc
...
2013-11-12 01:27:48 +00:00
krakjoe
749e0cfc36
condense globals
...
introduce flags
sensible silence and stepping
2013-11-12 01:24:53 +00:00
krakjoe
0a6804a986
...
2013-11-12 00:47:27 +00:00
krakjoe
ef134e585f
...
2013-11-12 00:40:40 +00:00
krakjoe
179debd730
...
2013-11-12 00:36:00 +00:00
Felipe Pena
c9c61da288
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-11 22:33:26 -02:00
Felipe Pena
217c906ea5
- Improve error message and added check for fstat return
2013-11-11 22:33:17 -02:00
krakjoe
95d33c18a0
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-12 00:28:48 +00:00
krakjoe
e0cbd92fa4
break on class methods
...
don't dtor eval'd retval
more reliable break on methods
2013-11-12 00:27:48 +00:00
Felipe Pena
bbc35b60f9
- Added check for no context file
2013-11-11 22:24:24 -02:00
Felipe Pena
36d2329187
- Added initial code for list command
2013-11-11 21:40:03 -02:00
Andrea Faulds
91779db95b
Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-11 22:54:16 +00:00
Felipe Pena
d61fa4cc52
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-11 20:06:49 -02:00
Felipe Pena
b5b7935d40
- Added lineno to breakpoint message
2013-11-11 20:06:36 -02:00
Felipe Pena
dd4e962c56
- WS
2013-11-11 20:02:34 -02:00
krakjoe
de3daf55c5
...
2013-11-11 21:51:45 +00:00
krakjoe
bce3481ed3
update
2013-11-11 17:37:59 +00:00
krakjoe
42eaa989af
separation etc
2013-11-11 17:19:05 +00:00
krakjoe
5ef19b1b45
ws
2013-11-11 17:12:31 +00:00
krakjoe
fb815caf7a
fix segfault on empty eval
2013-11-11 17:09:08 +00:00
krakjoe
f62b47c9ff
fix opcode missing on eval
2013-11-11 17:06:30 +00:00
krakjoe
3c644612af
typo
2013-11-11 17:01:33 +00:00
krakjoe
3e3a7babad
stop multiple executions from occuring at once, #5
2013-11-11 15:54:33 +00:00
krakjoe
da065d6fb2
no estrdup on opline breakpoints
2013-11-11 15:14:37 +00:00
krakjoe
632c89b65a
fix output from userland break point insertion
2013-11-11 14:59:51 +00:00
krakjoe
e8c98020ef
fix breakpoint in userland
2013-11-11 14:55:36 +00:00
krakjoe
97fda0eaf2
precise break from userland
2013-11-11 14:38:11 +00:00
krakjoe
34ae94ad9a
phpdbg_break userland
2013-11-11 14:33:53 +00:00
krakjoe
dc3ef20964
...
2013-11-11 14:11:06 +00:00
krakjoe
5fdae4612b
...
2013-11-11 14:07:07 +00:00
krakjoe
56957d9e25
output [] around phpdbg text
2013-11-11 14:03:14 +00:00
krakjoe
207e54a1c5
...
2013-11-11 13:31:41 +00:00
krakjoe
be460647ef
...
2013-11-11 13:07:02 +00:00
krakjoe
764d7d492c
fix break on opline
2013-11-11 13:04:21 +00:00
krakjoe
616cb9c35f
...
2013-11-11 12:09:57 +00:00
krakjoe
28848919cf
break opline help
2013-11-11 12:07:11 +00:00
krakjoe
67dc98732e
break on opline
2013-11-11 11:54:41 +00:00
krakjoe
cb24989f06
updates to break setting
2013-11-11 09:36:33 +00:00
krakjoe
3955dcf673
more output on setting break points
...
output breaks with print command
2013-11-11 09:14:30 +00:00
krakjoe
5f82f002f0
clean not destroy included files
...
remove argc, argv from phpdbg_interactive, unused
2013-11-11 08:08:26 +00:00
krakjoe
b77508f250
noquit on fatal errors
...
clean command to clear environment
2013-11-11 08:02:04 +00:00
krakjoe
b5da426776
...
2013-11-10 23:44:16 +00:00
krakjoe
f745c841b8
...
2013-11-10 23:40:57 +00:00
krakjoe
a6864679a2
...
2013-11-10 23:38:55 +00:00
krakjoe
4f5096af3c
register server vars
2013-11-10 23:30:52 +00:00
krakjoe
92c0fbebed
ini working
2013-11-10 23:06:20 +00:00
krakjoe
4f9f86a15d
update to default on
2013-11-10 22:55:07 +00:00
krakjoe
aba249e5c7
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-10 22:46:49 +00:00
krakjoe
7de0b76ba8
...
2013-11-10 22:44:28 +00:00
Felipe Pena
8ffa4025fb
- Cosmetics
2013-11-10 20:04:22 -02:00
Felipe Pena
f45f2ab8f8
- Fix comment
2013-11-10 20:01:40 -02:00
Felipe Pena
7886665b52
- Cosmetic changes
2013-11-10 19:57:43 -02:00
Felipe Pena
e1931c14a5
- Move PHPDBG_NEXT to prompt header
2013-11-10 19:51:44 -02:00
krakjoe
587003ee48
exec last command automatically on enter
2013-11-10 21:49:37 +00:00
Felipe Pena
816925c7da
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-10 19:39:07 -02:00
Felipe Pena
d141bf4ea8
- Get rid llist from symbol breakpoint
2013-11-10 19:38:58 -02:00
krakjoe
493e81e4c7
...
2013-11-10 21:29:14 +00:00
krakjoe
fedd47e383
...
2013-11-10 21:28:12 +00:00
krakjoe
9ba19e8224
quiet
2013-11-10 21:23:18 +00:00
krakjoe
26ec44350e
...
2013-11-10 21:15:45 +00:00
Adam Harvey
1205a6c7dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-10 16:15:12 -05:00
krakjoe
7d99241455
...
2013-11-10 21:12:41 +00:00
Adam Harvey
304bff90f4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-10 16:11:28 -05:00
krakjoe
1591b0e5f6
remove cont
2013-11-10 21:09:35 +00:00
krakjoe
6203c96061
...
2013-11-10 21:07:29 +00:00
krakjoe
05c9f82a15
...
2013-11-10 20:59:35 +00:00
Felipe Pena
ac0ecc476c
- Fix code
2013-11-10 19:00:58 -02:00
Adam Harvey
c9cfd98bcd
Update NEWS and remove the unnecessary UPGRADING note.
2013-11-10 15:46:31 -05:00
Adam Harvey
288e9c6423
Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4
2013-11-10 15:43:56 -05:00
krakjoe
52f9c52475
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-10 20:30:32 +00:00
Felipe Pena
fb4f94c52c
- Improved phpdbg_set_breakpoint_symbol function
2013-11-10 18:30:24 -02:00
krakjoe
dd141fa085
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-10 20:30:18 +00:00
Felipe Pena
3414680557
- Improved phpdbg_set_breakpoint_file function
2013-11-10 18:24:13 -02:00
Felipe Pena
eaf5d89292
- Change breakpoint id to int
2013-11-10 18:10:54 -02:00
Felipe Pena
972550a120
- Change header inclusion order
2013-11-10 18:07:56 -02:00
Felipe Pena
5b6982796d
- Renamed breakpoint find functions
2013-11-10 18:06:19 -02:00
Felipe Pena
20f37407e1
- Added separated file to opcode decode function
2013-11-10 18:01:09 -02:00
Felipe Pena
1fcc54a6b8
- Added breakpoint counter
2013-11-10 17:15:32 -02:00
krakjoe
663a13635a
fix symbol breakpoints
2013-11-10 18:56:19 +00:00
krakjoe
fa63ecbba9
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-10 18:29:04 +00:00
Felipe Pena
aedf45252f
- WS changes
2013-11-10 16:29:05 -02:00
krakjoe
cc85f285c6
print opcode names
2013-11-10 18:28:50 +00:00
Felipe Pena
7752077b63
- Added prototype for breakpoint funcs
2013-11-10 16:24:08 -02:00
Felipe Pena
ddf5c42e2d
- Cosmetic changes
2013-11-10 16:21:49 -02:00
Felipe Pena
226052fb8a
- Simplify code
2013-11-10 16:15:00 -02:00
Felipe Pena
a7309b6d25
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-10 16:10:38 -02:00
Felipe Pena
7d43677b1f
- Fix code
2013-11-10 16:10:23 -02:00
krakjoe
4bfbdf55dc
next not quitting when not stepping
2013-11-10 18:08:08 +00:00
Felipe Pena
9f15e3791a
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-10 16:06:56 -02:00
Felipe Pena
defc4c3180
- Added separated file to handle breakpoint feature
2013-11-10 16:06:41 -02:00
krakjoe
38883e7cbb
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-10 18:05:30 +00:00
krakjoe
4d127e4afb
print_opline function to decode opline
2013-11-10 18:05:11 +00:00
krakjoe
bd02c250b8
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-10 17:51:58 +00:00
krakjoe
307897e602
instructions
2013-11-10 17:51:48 +00:00
Felipe Pena
22f0ff6c12
- Fix conflict
2013-11-10 15:51:20 -02:00
Felipe Pena
16930d85f8
- Initial code for breakpoint on function
2013-11-10 15:49:25 -02:00
krakjoe
3716646d3c
...
2013-11-10 17:45:06 +00:00
krakjoe
c6f443db2e
improve output from eval()
2013-11-10 16:47:39 +00:00
krakjoe
5f6c416b14
consistency
2013-11-10 16:34:12 +00:00
krakjoe
782ea75c9e
...
2013-11-10 16:33:35 +00:00
krakjoe
5cca4190f4
fix interference while quitting
2013-11-10 16:30:36 +00:00
Felipe Pena
8532076c64
- WS changes
2013-11-10 14:16:52 -02:00
Felipe Pena
c060093acf
- WS change
2013-11-10 14:12:43 -02:00
krakjoe
5971ab299b
...
2013-11-10 16:06:57 +00:00
krakjoe
9a15ea4d58
...
2013-11-10 16:06:15 +00:00
krakjoe
22d85c6a63
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-10 16:05:23 +00:00
krakjoe
2f4acda67b
...
2013-11-10 16:05:15 +00:00
krakjoe
72a60589ec
consistent help
2013-11-10 15:55:53 +00:00
krakjoe
4ef6705a74
correction to headers
...
backtrace help
2013-11-10 15:54:19 +00:00
krakjoe
940f4e27de
backtrace
2013-11-10 15:49:35 +00:00
Felipe Pena
53f4201566
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-10 13:47:37 -02:00
Felipe Pena
6069121e23
- Added llist dtor
2013-11-10 13:47:28 -02:00
krakjoe
48f9db90dd
cont
2013-11-10 15:32:24 +00:00
krakjoe
2770068e76
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-10 15:21:48 +00:00
Felipe Pena
9552817864
- Get the realpath on break command
2013-11-10 13:21:20 -02:00
krakjoe
1b41ab2e34
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-11-10 15:16:54 +00:00
krakjoe
2f9b34d4b6
backtrace
2013-11-10 15:16:45 +00:00
Felipe Pena
a6d573cd89
Merge branch 'master' of github.com:krakjoe/phpdbg
2013-11-10 13:12:09 -02:00
Felipe Pena
23cfc8ed35
- More work on file:line breakpoint
2013-11-10 13:11:56 -02:00
krakjoe
ac5063468a
...
2013-11-10 14:49:52 +00:00
krakjoe
2977840a4a
eval()
2013-11-10 14:43:46 +00:00
Felipe Pena
d772009921
- Breakpoint initial work
2013-11-10 12:36:30 -02:00
krakjoe
5c866a9f13
stepping
2013-11-10 14:28:14 +00:00
krakjoe
8043d1ee5f
run help
2013-11-10 13:06:57 +00:00
krakjoe
c6cb411d39
execution
2013-11-10 13:01:46 +00:00
Felipe Pena
a366eadee2
- Renamed brake to break
2013-11-10 09:48:01 -02:00
Felipe Pena
9dd3e54351
- Cosmetic changes
2013-11-10 09:36:57 -02:00
krakjoe
b978c20f63
+compile
2013-11-10 11:35:59 +00:00
krakjoe
6df19b3aa2
...
2013-11-10 11:03:29 +00:00
krakjoe
ad3aa32a2f
woops
2013-11-10 10:46:18 +00:00
krakjoe
2089caed53
bit more work on menu
...
implement helper menu
name some macros to help with declarations (sorry Felipe :))
2013-11-10 10:44:42 +00:00
krakjoe
39263cbfb1
header in main
2013-11-10 08:20:57 +00:00
Remi Collet
6997b8793d
missing 'config.h' in 5dc37b3
2013-11-10 07:10:36 +01:00
Felipe Pena
2bda09abc6
- Added prototype for non-static function, fixed typo and staticfy command handler
2013-11-09 23:42:41 -02:00
Felipe Pena
19c16083a7
- WS change
2013-11-09 23:38:17 -02:00
Felipe Pena
612d6b2582
- Added initial code for a simple prompt
2013-11-09 23:30:32 -02:00
Felipe Pena
1c7ae5f1a6
- Declaration first
2013-11-09 22:34:38 -02:00
Felipe Pena
f16ccad2ff
- Fixed unexpected memory leak warning
2013-11-09 21:33:43 -02:00
Felipe Pena
8ac55d018c
- Added .gitignore
2013-11-09 21:08:01 -02:00
Felipe Pena
19a5ac93b4
- WS changes
2013-11-09 21:07:04 -02:00
krakjoe
1dd5d42bd8
cleanup
2013-11-09 22:53:27 +00:00
krakjoe
60ee0cc74c
change server->phpdbg
2013-11-09 22:47:39 +00:00
krakjoe
2fee7dce77
import
2013-11-09 22:35:03 +00:00
Joe Watkins
dac2297b10
Initial commit
2013-11-09 14:34:16 -08:00
Igor Wiedler
611da37617
use ZVAL_ZVAL to init ZVAL from ZVAL
2013-11-09 13:48:23 -05:00
Rasmus Lerdorf
6713f9c4b2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix broken test
2013-11-09 09:46:55 -08:00
Rasmus Lerdorf
df7321359e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix broken test
2013-11-09 09:46:43 -08:00
Rasmus Lerdorf
064ba179b1
Fix broken test
2013-11-09 09:45:52 -08:00
Igor Wiedler
eb063e0075
Merge remote-tracking branch 'lgnome/use-function' into use-function
...
* lgnome/use-function:
Only check user functions for filenames.
2013-11-08 21:50:04 -05:00
Adam Harvey
cc049e6450
Only check user functions for filenames.
2013-11-08 21:49:05 -05:00
Igor Wiedler
719db1a7b2
Merge pull request #4 from LawnGnome/use-function
...
FIX ALL THE THINGS
2013-11-08 18:39:29 -08:00
Adam Harvey
da553a8166
Fix constant resolution.
2013-11-08 21:37:38 -05:00
Adam Harvey
95675dfba9
Remove now unused function_filenames struct.
2013-11-08 21:32:09 -05:00
Adam Harvey
1ea01f55db
Look in the function_table instead of function_filenames for actually declared
...
functions.
2013-11-08 21:29:23 -05:00
Adam Harvey
9711c58bc4
Stop PHP from modifying the lowercase function name in place.
2013-11-08 20:26:46 -05:00
Igor Wiedler
24e0b99103
Merge remote-tracking branch 'upstream/PHP-5.6' into use-function
...
* upstream/PHP-5.6: (399 commits)
Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).
Added tests for PHAR/OPCahce incompatibilities
Update NEWS
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
Update NEWS
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
NEWS entry
NEWS entry
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
bump API versions
Add a couple more test cases to parse_url() tests
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Cleanup temp test file
Revert "Fixed issue #115 (path issue when using phar)."
Update LiteSpeed SAPI code to V6.4
Fixed typo in Makefile.frag
updated NEWS
Remove outdate codes, make it clearer, although just a bit..
Update NEWS
...
Conflicts:
Zend/zend_compile.h
2013-11-08 19:14:58 -05:00
Dmitry Stogov
0e5c5072e6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).
Conflicts:
NEWS
2013-11-08 16:36:31 +04:00
Dmitry Stogov
915c428ba1
Fixed issue #115 (path issue when using phar).
...
Fixed issue #149 (Phar mount points not working with OPcache enabled).
2013-11-08 16:35:05 +04:00
Dmitry Stogov
4e6a0bd5a9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added tests for PHAR/OPCahce incompatibilities
Update NEWS
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
Update NEWS
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
NEWS entry
NEWS entry
Conflicts:
NEWS
2013-11-08 14:15:41 +04:00
Dmitry Stogov
49fbe2579e
Added tests for PHAR/OPCahce incompatibilities
2013-11-08 13:50:57 +04:00
Xinchen Hui
717268cb1e
Update NEWS
2013-11-08 15:33:49 +08:00
Xinchen Hui
5f17c4d08e
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-08 15:33:27 +08:00
Xinchen Hui
cf2626f10c
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
...
previous codes: "#define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)):
(int)mbrlen(ptr, len, &BG(mblen_state)))#
it use mbsinit there, seems try to initialize the mblen_state, but:
"This function does not change the state identified by ps. Typical ways
to make the state pointed by ps an initial state are:
memset (ps,0,sizeof(*ps)); // ps points to zero-valued object
"
http://www.cplusplus.com/reference/cwchar/mbsinit/?kw=mbsinit
2013-11-08 15:32:28 +08:00
Xinchen Hui
f345152037
Update NEWS
2013-11-08 15:08:07 +08:00
Xinchen Hui
41eb3c959d
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-08 15:07:43 +08:00
Xinchen Hui
fd3fa9b53c
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
...
Although the doc said it is (unsigned int *), but it is ulong* in the
libmysql 5.0 's source codes
2013-11-08 15:06:36 +08:00
Rasmus Lerdorf
caab95155d
NEWS entry
2013-11-07 18:16:12 -08:00
Rasmus Lerdorf
224dc52ea9
NEWS entry
2013-11-07 18:15:15 -08:00
Rasmus Lerdorf
756dc19e59
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
2013-11-07 18:09:53 -08:00
Rasmus Lerdorf
b3d522d215
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
Conflicts:
ext/pdo/pdo_sql_parser.c
2013-11-07 18:09:15 -08:00
Rasmus Lerdorf
890ea8411f
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
2013-11-07 18:05:08 -08:00
Rasmus Lerdorf
8cb128159d
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src: (65 commits)
Add a couple more test cases to parse_url() tests
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Cleanup temp test file
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
Typo fix: umknown -> unknown
Fix bug #66008
5.4.23-dev
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
add bundled libzip LICENSE, as required by BSD License terms
- Updated to version 2013.8 (2013h)
remove "PHP 6" staff
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- Updated to version 2013.7 (2013g)
Fix Coverity issue reporting wrong sizeof()
exif NEWS
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
Just SKIP that test on travis
...
2013-11-07 07:55:26 -08:00
Rasmus Lerdorf
54fe719953
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Add a couple more test cases to parse_url() tests
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Cleanup temp test file
Revert "Fixed issue #115 (path issue when using phar)."
Remove outdate codes, make it clearer, although just a bit..
Update NEWS
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
Fixed coredump due to abnormal implemention of phar
Typo fix: umknown -> unknown
Fix bug #66008
5.4.23-dev
remove "PHP 6" staff
2013-11-07 07:54:08 -08:00
Bob Weinand
152898ff28
Moved arrays again to "static_scalar:" & little cleanup
2013-11-07 16:39:47 +01:00
Dmitry Stogov
e0135014c3
Renaming
2013-11-07 10:22:49 +04:00
Dmitry Stogov
9647c61dc1
Constant expressions refactoring
2013-11-06 22:21:07 +04:00
Dmitry Stogov
af600c240d
Merge branch 'const_scalar_exprs' of github.com:bwoebi/php-src into const_scalar_exprs
...
* 'const_scalar_exprs' of github.com:bwoebi/php-src:
Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
Added a few more operators
Whitespace fix
converted several switches to ifs and made more opcache friendly
Fatal error about self referencing constants fixed
Fixed mem leaks, added tests and ternary operator
Working commit for constant scalar expressions (with constants). Tests will follow.
Conflicts:
Zend/Makefile.am
configure.in
win32/build/config.w32
2013-11-06 15:41:33 +04:00
Ferenc Kovacs
929bf11e91
bump API versions
2013-11-06 11:17:58 +01:00
Ferenc Kovacs
d87388ba0f
Merge branch 'PHP-5.5'
2013-11-06 10:47:45 +01:00
Ferenc Kovacs
91108818e1
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
2013-11-06 10:46:34 +01:00
Sara Golemon
8b6b39fdcf
Add a couple more test cases to parse_url() tests
...
http://::# (valid but silly)
http://# (invalid)
2013-11-06 10:32:11 +01:00
ptarjan
290becb1f1
fix missing change from 'tcp_socket' to the more common 'server'
2013-11-06 10:32:00 +01:00
ptarjan
9c1e1bbc05
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-11-06 10:31:47 +01:00
Christopher Jones
c439ac6c35
Cleanup temp test file
2013-11-06 10:31:35 +01:00
Xinchen Hui
c76be5696d
Merge branch 'PHP-5.5'
...
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-06 17:01:24 +08:00
Xinchen Hui
9d75b9fb27
Revert "Fixed issue #115 (path issue when using phar)."
...
We need another better way to fix this
This reverts commit 098855433d .
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-06 16:53:45 +08:00
George Wang
01bc13212e
Update LiteSpeed SAPI code to V6.4
2013-11-05 16:14:49 -05:00
George Wang
3720fd77b5
Fixed typo in Makefile.frag
2013-11-05 16:12:24 -05:00
Anatol Belski
c4cfdfa911
updated NEWS
2013-11-05 19:54:50 +01:00
Anatol Belski
c675980046
Merge branch 'pull-request/500'
...
* pull-request/500:
limit virtual_cwd_activate() duplicated call to ZTS only
reverted the previous commit, both calls are needed in TS mode
virtual_cwd_activate() should be called only in one place
back to do_alloca()
removed unnecessary call
simplify the state free macros
compact the code to preserve the error info after state freeing
back to do_alloca(), reverted the wrong replacement
enabled windows to use stack in both ts/nts mode, some more fixes
moved to do_alloca() usage where appropriate
fixed invalid free
fixed virtual cwd header in phar
updated NEWS
fixed all the places where last error could be lost
preserve the error code
applied and fixed the original patch
initial move on renaming files and fixing includes
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-05 19:23:23 +01:00
Xinchen Hui
6c8ff0031c
Merge branch 'PHP-5.5'
...
Conflicts:
ext/phar/phar_internal.h
ext/phar/stream.c
ext/phar/util.c
2013-11-05 19:29:13 +08:00
Xinchen Hui
63dba7ec9d
Remove outdate codes, make it clearer, although just a bit..
2013-11-05 18:47:12 +08:00
Xinchen Hui
2a94494b7e
Merge branch 'PHP-5.5'
2013-11-05 11:09:08 +08:00
Xinchen Hui
906d3ae0ed
Update NEWS
2013-11-05 11:08:55 +08:00
Xinchen Hui
d4f5ca467f
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
configure.in
ext/mysqlnd/mysqlnd.c
main/php_version.h
2013-11-05 11:08:09 +08:00
Xinchen Hui
e3d9e18e7b
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
...
I know zend_call_function will initilize retval_ptr_ptr, but still set
it to NULL explict is more readable
2013-11-05 11:04:55 +08:00
Xinchen Hui
2b7e89e20a
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-11-05 11:03:47 +08:00
Pierre Joye
bf875e269a
Merge branch 'master' of git.php.net:php-src
...
# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
NEWS + UPGRADING
Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
Fixed coredump due to abnormal implemention of phar
remove "PHP 6" staff
2013-11-04 22:26:40 +01:00
Remi Collet
5b8ae0143f
NEWS + UPGRADING
2013-11-04 13:32:45 +01:00
Remi Collet
5dc37b3510
Sync ext/zip with pecl/zip version 1.3.2
...
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip
2013-11-04 13:23:36 +01:00
Xinchen Hui
2f555b8e60
Merge branch 'master' of git.php.net:php-src
2013-11-04 14:47:34 +08:00
Xinchen Hui
a07ae67a21
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-11-04 14:47:16 +08:00
Xinchen Hui
15eabbb436
Merge branch 'PHP-5.5'
2013-11-04 14:43:30 +08:00
Xinchen Hui
3d4ef50dd7
Fixed coredump due to abnormal implemention of phar
2013-11-04 14:42:54 +08:00
Bob Weinand
18e2b1a9a9
Removed operations on constant arrays.
...
They make no sense as constants are not allowed to be arrays.
And as just properties are allowed to; no problem, we still don't
need operations on any constant array.
2013-11-03 12:28:00 +01:00
Bob Weinand
ad967e1329
Added a few more operators
2013-11-03 01:58:39 +01:00
Rasmus Lerdorf
e5e25c43f4
Fix English here
2013-11-02 10:46:37 -07:00
Anatol Belski
699f07ba44
limit virtual_cwd_activate() duplicated call to ZTS only
2013-11-02 13:32:31 +01:00
Bob Weinand
82cd3779f4
Whitespace fix
2013-11-01 16:49:23 +01:00
Bob Weinand
b45043a1b7
converted several switches to ifs and made more opcache friendly
2013-11-01 16:16:58 +01:00
Anatol Belski
9df78bf9fd
reverted the previous commit, both calls are needed in TS mode
2013-11-01 01:20:57 +01:00
Anatol Belski
6aedfac7f7
virtual_cwd_activate() should be called only in one place
2013-11-01 00:56:22 +01:00
Rasmus Lerdorf
bb42643ae0
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src: (107 commits)
Typo fix: umknown -> unknown
add news entry about FPM backlog change
Fix bug #66008
updated libs_versions.txt
Update NEWS
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
add bundled libzip LICENSE, as required by BSD License terms
- Updated to version 2013.8 (2013h)
Use zval* instead of zval**
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Improved performance of array_merge() by eliminating useless copying
Improved performance of func_get_args() by eliminating useless copying
Link to more readmes
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- Updated to version 2013.7 (2013g)
Increment version number, since this will be 5.5.6.
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
...
2013-10-31 16:23:38 -07:00
Lior Kaplan
d3fd163d27
Typo fix: umknown -> unknown
2013-10-31 23:12:41 +02:00
Martin Hujer
55ee543e2f
Typo fix: umknown -> unknown
2013-10-31 22:59:42 +02:00
Anatol Belski
39e7dcc3bb
back to do_alloca()
2013-10-31 21:42:55 +01:00
Anatol Belski
f1c2f8f9f1
removed unnecessary call
2013-10-31 21:38:24 +01:00
Bob Weinand
b56c1ca95e
Fatal error about self referencing constants fixed
2013-10-31 19:05:29 +01:00
Bob Weinand
466c5dd1fe
Fixed mem leaks, added tests and ternary operator
2013-10-31 18:21:37 +01:00
Anatol Belski
4d430ecb02
simplify the state free macros
2013-10-31 17:39:17 +01:00
Antony Dovgal
7cd5ae6fab
add news entry about FPM backlog change
...
and move the other entry to its proper place
2013-10-31 15:04:33 +04:00
Rasmus Lerdorf
a0244a69cc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #66008
2013-10-31 03:18:36 -07:00
Rasmus Lerdorf
812dfbc431
Fix bug #66008
2013-10-31 03:18:07 -07:00
Rasmus Lerdorf
b4bed6fde0
Fix bug #66008
2013-10-31 03:06:35 -07:00
Bob Weinand
2361745806
Working commit for constant scalar expressions (with constants).
...
Tests will follow.
2013-10-31 08:57:12 +01:00
Dmitry Stogov
3b2ca392f1
Removed unnecessary GC checks
2013-10-31 11:33:39 +04:00
Yasuo Ohgaki
832c82603f
Add crypt() change in UPGRADING
2013-10-31 07:29:00 +09:00
Anatol Belski
abb962d54d
compact the code to preserve the error info after state freeing
2013-10-30 20:46:08 +01:00
Anatol Belski
fc707a27ff
back to do_alloca(), reverted the wrong replacement
2013-10-30 20:13:14 +01:00
Sherif Ramadan
98c9e56ef0
Merge branch 'pull-request/287'
...
Add ability to use array keys with array_filter().
This adds a third (optional) argument to array_filter() that will determine
what gets passed to the callback, the array key, value or both.
The third argument can be one of two constants: ARRAY_FILTER_USE_BOTH or,
ARRAY_FILTER_USE_KEY.
2013-10-30 09:36:19 -04:00
Stanislav Malyshev
4ded6ee971
5.4.23-dev
2013-10-29 18:11:02 -07:00
Nikita Popov
4218e89f8d
Fix bug #65997 by switching to Serializable for GMP
...
Rather than using get_properties and __wakeup for serialization
the code now uses Serializable::serialize() and
Serializable::unserialize(). The get_properties handler is switched
to a get_debug_info handler. Thus get_gc will now return only
the normal properties and not do any modifications, thus fixing
the leak. This also avoids a $num property from being publicly
visible after the object was dumped or serialized, so that's an
extra plus.
2013-10-29 20:58:30 +01:00
Nikita Popov
647e0be64b
Fix compile warning in GMP
2013-10-29 20:07:34 +01:00
Nikita Popov
82eca388d2
Fix ZTS build
2013-10-29 20:01:37 +01:00
Anatol Belski
e17de5e9fd
Merge branch 'bug50333' of github.com:weltling/php-src into bug50333
2013-10-29 17:15:40 +01:00
Anatol Belski
4295bfeeaf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated libs_versions.txt
2013-10-29 13:35:38 +01:00
Anatol Belski
5f1cbfacf9
updated libs_versions.txt
2013-10-29 13:35:02 +01:00
Yasuo Ohgaki
416f8fce5c
Implemented Change crypt() behavior w/o salt RFC
2013-10-29 18:53:45 +09:00
Yasuo Ohgaki
0d89265a69
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 17:38:22 +09:00
Yasuo Ohgaki
3cf2682083
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:30:58 +09:00
Yasuo Ohgaki
5c89d5a539
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src: (22 commits)
add bundled libzip LICENSE, as required by BSD License terms
Avoid copy in func_get_arg()
- Updated to version 2013.8 (2013h)
Use zval* instead of zval**
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Improved performance of array_merge() by eliminating useless copying
Improved performance of func_get_args() by eliminating useless copying
fix limitation of upload size == (U)INT_MAX in CGI
Link to more readmes
test commit
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- test3
- test commit 2
- test commit1
ldap_escape() notes
- Updated to version 2013.7 (2013g)
Increment version number, since this will be 5.5.6.
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
...
2013-10-29 17:30:47 +09:00
Yasuo Ohgaki
4c45e95cfe
Update NEWS
2013-10-29 17:29:53 +09:00
Yasuo Ohgaki
d04bcb8969
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:28:35 +09:00
Yasuo Ohgaki
16a9fec889
Update NEWS
2013-10-29 17:27:49 +09:00
Yasuo Ohgaki
49b3fef86a
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
add bundled libzip LICENSE, as required by BSD License terms
- Updated to version 2013.8 (2013h)
Use zval* instead of zval**
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Improved performance of array_merge() by eliminating useless copying
Improved performance of func_get_args() by eliminating useless copying
Link to more readmes
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- Updated to version 2013.7 (2013g)
Increment version number, since this will be 5.5.6.
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
2013-10-29 17:24:48 +09:00
Yasuo Ohgaki
4dc4302a30
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:24:23 +09:00
Remi Collet
141b77d97d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:58 +01:00
Remi Collet
a7fc8eecb0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:44 +01:00
Remi Collet
e2c9f3983a
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:24 +01:00
Yasuo Ohgaki
69808d698c
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
- Updated to version 2013.8 (2013h)
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- Updated to version 2013.7 (2013g)
2013-10-29 14:03:17 +09:00
Nikita Popov
d86b5f01ac
Avoid copy in func_get_arg()
...
Complements dmitry's change to func_get_args()
2013-10-28 19:51:31 +01:00
Derick Rethans
f626db130c
Merge branch 'PHP-5.5'
2013-10-28 15:12:38 +01:00
Derick Rethans
ad7793d94c
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-28 15:12:31 +01:00
Derick Rethans
ab6481993e
- Updated to version 2013.8 (2013h)
2013-10-28 15:12:30 +01:00
Derick Rethans
824bac9f23
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-10-28 15:09:13 +01:00
Derick Rethans
7a526f01b5
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-10-28 15:08:57 +01:00
Derick Rethans
8d8e8a43de
Merge branch 'master' of git.php.net:/php-src
2013-10-28 15:02:37 +01:00
Dmitry Stogov
592be912c2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use zval* instead of zval**
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-10-28 15:23:10 +04:00
Dmitry Stogov
2d14cc2a49
Use zval* instead of zval**
2013-10-28 14:44:07 +04:00
Dmitry Stogov
ace2ee931c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Conflicts:
NEWS
2013-10-28 14:22:05 +04:00
Dmitry Stogov
eb22041ffe
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
2013-10-28 14:19:40 +04:00
Dmitry Stogov
1dcca1fdb9
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
Conflicts:
NEWS
2013-10-28 13:50:04 +04:00
Dmitry Stogov
c6fb00e6d7
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-28 13:48:02 +04:00
Dmitry Stogov
b0f9768e02
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved performance of array_merge() by eliminating useless copying
Conflicts:
NEWS
2013-10-28 13:47:37 +04:00
Antony Dovgal
a9c288ed3c
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Improved performance of func_get_args() by eliminating useless copying
Link to more readmes
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-28 13:47:13 +04:00
Antony Dovgal
09ad5fbbb3
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Improved performance of func_get_args() by eliminating useless copying
fix limitation of upload size == (U)INT_MAX in CGI
Link to more readmes
test commit
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-28 13:46:40 +04:00
Yasuo Ohgaki
0db6adda48
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Improved performance of func_get_args() by eliminating useless copying
Link to more readmes
2013-10-28 18:38:22 +09:00
Yasuo Ohgaki
4bdac868da
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Improved performance of func_get_args() by eliminating useless copying
fix limitation of upload size == (U)INT_MAX in CGI
Link to more readmes
test commit
- test3
- test commit 2
- test commit1
2013-10-28 18:36:51 +09:00
Dmitry Stogov
5c0890ba8a
Improved performance of array_merge() by eliminating useless copying
2013-10-28 13:31:44 +04:00
Dmitry Stogov
9bbdc90ed2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved performance of func_get_args() by eliminating useless copying
Conflicts:
NEWS
2013-10-28 13:19:08 +04:00
Dmitry Stogov
91b8a6752e
Improved performance of func_get_args() by eliminating useless copying
2013-10-28 13:17:55 +04:00
Michael Wallner
8962f3ff0c
fix limitation of upload size == (U)INT_MAX in CGI
2013-10-28 07:37:47 +01:00
Hannes Magnusson
d1727d8401
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Link to more readmes
2013-10-27 16:41:31 -07:00
Hannes Magnusson
f8f643b4f7
Link to more readmes
2013-10-27 16:40:37 -07:00
Rasmus Lerdorf
8da5734cf5
test commit
2013-10-27 15:21:21 -07:00
Antony Dovgal
73788d1c23
Merge branch 'PHP-5.5'
...
* PHP-5.5:
increase backlog to the highest value everywhere
2013-10-27 22:57:31 +04:00
Antony Dovgal
9765763413
increase backlog to the highest value everywhere
...
It makes no sense to use -1 for *BSD (which is the highest value there)
and still use 128 for Linux.
Lets raise it right to up the limit and let the people lower it if they
think that 3.5Mb is too much for a process.
IMO this is better than silently dropping connections.
2013-10-27 22:54:47 +04:00
Xinchen Hui
7fe370f9c7
Merge branch 'PHP-5.5'
2013-10-27 16:53:35 +08:00
Xinchen Hui
a3bd4fda09
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-27 16:53:13 +08:00
Xinchen Hui
9b399be778
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-10-27 16:53:05 +08:00
Xinchen Hui
e18e7a5983
remove "PHP 6" staff
2013-10-27 16:52:43 +08:00
Derick Rethans
59f4c351d3
Merge branch 'master' of git.php.net:/php-src
2013-10-26 09:53:34 +01:00
Yasuo Ohgaki
37fb8e0c15
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:43:14 +09:00
Yasuo Ohgaki
66fe7fabad
Update NEWS
2013-10-26 10:42:55 +09:00
Yasuo Ohgaki
bd1d2d8fb0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:42:18 +09:00
Yasuo Ohgaki
a209cf7a5a
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Increment version number, since this will be 5.5.6.
2013-10-26 10:41:53 +09:00
Yasuo Ohgaki
e50eb1ce34
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:31:21 +09:00
Sascha Schumann
8cef677dc3
- test3
2013-10-25 21:34:28 +02:00
Sascha
bf087d85af
- test commit 2
2013-10-25 21:26:58 +02:00
Sascha
e53afaafcd
- test commit1
2013-10-25 21:04:45 +02:00
Anatol Belski
25dc4af392
enabled windows to use stack in both ts/nts mode, some more fixes
2013-10-24 08:48:09 -07:00
Anatol Belski
08f6a76b92
moved to do_alloca() usage where appropriate
2013-10-24 05:12:37 -07:00
Michael Wallner
dfe4b15b8e
ldap_escape() notes
2013-10-24 10:36:44 +02:00
Derick Rethans
20f7fcefdb
Merge branch 'PHP-5.5'
2013-10-23 22:33:59 +01:00
Derick Rethans
bb73d18c85
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-23 22:33:54 +01:00
Derick Rethans
9cb3a759a7
- Updated to version 2013.7 (2013g)
2013-10-23 22:33:53 +01:00
Adam Harvey
96b6d4be49
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Increment version number, since this will be 5.5.6.
Conflicts:
configure.in
main/php_version.h
2013-10-23 12:39:16 -07:00
Adam Harvey
70c3a722e2
Increment version number, since this will be 5.5.6.
2013-10-23 12:36:27 -07:00
Xinchen Hui
5241cf7000
Merge branch 'PHP-5.5'
2013-10-23 19:27:48 +08:00
Xinchen Hui
0adba0abb9
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
2013-10-23 19:26:24 +08:00
Christopher Jones
e68c1ef2ec
Added a LICENSE file to make it easier for PECL binary distributions to conform with the license.
2013-10-22 11:03:09 -07:00
Yasuo Ohgaki
29e5a9659f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:30:24 +09:00
Yasuo Ohgaki
fa11c7c1cc
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src: (270 commits)
Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
exif NEWS
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
fix bug #65936 (dangling context pointer causes crash)
remove TRAVIS check in test source
Fixed compilation warning
Just SKIP that test on travis
Fixed issue #115 (path issue when using phar).
fix memory leak on error (from Coverity scan)
fix argument type & remove warning
fix const warnings in intl methods
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
fix possibility of access to *storedType without initialization
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
5.4.21 release date
fix argument type & remove warning
fix const warnings in intl methods
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
...
2013-10-22 12:29:41 +09:00
Yasuo Ohgaki
6af3683a4c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:29:01 +09:00
Yasuo Ohgaki
6410f6ff68
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src: (178 commits)
Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
exif NEWS
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
fix bug #65936 (dangling context pointer causes crash)
remove TRAVIS check in test source
Fixed compilation warning
Just SKIP that test on travis
Fixed issue #115 (path issue when using phar).
fix memory leak on error (from Coverity scan)
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
5.4.21 release date
fix argument type & remove warning
fix const warnings in intl methods
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
fix possibility of access to *storedType without initialization
5.4.21 release date
Fix typo
These getpwnam('') tests are silly and not portable
...
2013-10-22 12:27:47 +09:00
Yasuo Ohgaki
1f5b1cfb2b
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:27:18 +09:00
Yasuo Ohgaki
2cf5614f5f
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src: (101 commits)
exif NEWS
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
Just SKIP that test on travis
fix memory leak on error (from Coverity scan)
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
5.4.21 release date
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
Fix typo
Clean up this weird safe_emalloc() call
Minor Coverity tweaks
- Moved NULL check before dereferencing
- Fixed possible NULL ptr dereference
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
Remove senseless check here
- Fix extern declaration according to definition
- Fix possible memory leak
- Moved allocation to if block to make Coverity happy
- Fixed possible memory leak
Fix unitialized opened_path here - found by Coverity
...
2013-10-22 12:23:07 +09:00
Christopher Jones
b3a2b44198
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
2013-10-21 14:21:19 -07:00
Christopher Jones
b6ceea4a25
Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
2013-10-21 14:20:35 -07:00
Michael Wallner
d15cedfba9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
exif NEWS
2013-10-21 22:45:12 +02:00
Michael Wallner
ee7cfa022d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
exif NEWS
2013-10-21 22:44:53 +02:00
Michael Wallner
5cc797d119
exif NEWS
2013-10-21 22:44:37 +02:00
Michael Wallner
cfd911473b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
2013-10-21 22:16:21 +02:00
Michael Wallner
757f4a952c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
2013-10-21 22:15:55 +02:00
Michael Wallner
2fa5f39e4c
add tests for bug #62523
2013-10-21 22:15:09 +02:00
Michael Wallner
1b43f95040
Merged PR #293 (Exif crash on unknown encoding was fixed)
...
By:
Draal
Conflicts:
configure.in
main/php_version.h
2013-10-21 21:48:27 +02:00
Anatol Belski
8591a52fab
fixed invalid free
2013-10-21 11:15:31 -07:00
Antony Dovgal
605b3c2ca1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65936 (dangling context pointer causes crash)
2013-10-21 15:10:15 +04:00
Antony Dovgal
b636c03426
fix bug #65936 (dangling context pointer causes crash)
...
reported by Leon Sorokin
2013-10-21 15:09:29 +04:00
Michael Wallner
4ddbb7dd15
Merge remote-tracking branch 'refs/remotes/origin/master'
...
* refs/remotes/origin/master:
Fixed compilation warning
2013-10-21 12:23:10 +02:00
Michael Wallner
e78c53680f
Merge remote-tracking branch 'refs/remotes/origin/PHP-5.5' into PHP-5.5
...
* refs/remotes/origin/PHP-5.5:
Fixed compilation warning
2013-10-21 12:23:01 +02:00
Michael Wallner
6764993358
Merge branch 'PHP-5.5'
...
* PHP-5.5:
remove TRAVIS check in test source
Just SKIP that test on travis
2013-10-21 12:21:21 +02:00
Michael Wallner
fb610b4e80
remove TRAVIS check in test source
2013-10-21 12:18:58 +02:00
Dmitry Stogov
02214e7a22
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilation warning
2013-10-21 14:18:17 +04:00
Michael Wallner
825174e480
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Just SKIP that test on travis
2013-10-21 12:18:10 +02:00
Dmitry Stogov
60ce3811ae
Fixed compilation warning
2013-10-21 14:17:10 +04:00
Michael Wallner
2ecf94e07e
Just SKIP that test on travis
2013-10-21 12:16:41 +02:00
Michael Wallner
454a9fcb14
Merge branch 'master' of https://github.com/guggemand/php-src
...
* 'master' of https://github.com/guggemand/php-src :
Dont reset other counters when incrementing slow_rq
2013-10-21 12:04:37 +02:00
Michael Wallner
41da537614
Merge branch 'master' of https://github.com/DylanArnold/php-src
...
* 'master' of https://github.com/DylanArnold/php-src :
Call php_module_shutdown() for php-fpm child processes
2013-10-21 12:04:06 +02:00
Xinchen Hui
aed56fc9a7
Merge branch 'PHP-5.5'
2013-10-21 17:41:03 +08:00
Xinchen Hui
098855433d
Fixed issue #115 (path issue when using phar).
2013-10-21 17:40:39 +08:00
Stanislav Malyshev
19e8052be3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix memory leak on error (from Coverity scan)
2013-10-21 00:02:33 -07:00
Stanislav Malyshev
cb47396d46
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix memory leak on error (from Coverity scan)
2013-10-21 00:02:21 -07:00
Stanislav Malyshev
f860486de5
fix memory leak on error (from Coverity scan)
2013-10-21 00:01:24 -07:00
Stanislav Malyshev
ae31a68774
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
5.4.21 release date
fix argument type & remove warning
fix const warnings in intl methods
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
fix possibility of access to *storedType without initialization
5.4.21 release date
2013-10-20 23:04:41 -07:00
Stanislav Malyshev
3900ce97a3
fix argument type & remove warning
2013-10-20 23:04:38 -07:00
Stanislav Malyshev
06954d1bc1
fix const warnings in intl methods
2013-10-20 23:04:38 -07:00
Stanislav Malyshev
444612cdc4
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
2013-10-20 23:04:38 -07:00
Stanislav Malyshev
219a682e8e
fix possibility of access to *storedType without initialization
2013-10-20 23:04:38 -07:00
Stanislav Malyshev
00697927d8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
5.4.21 release date
2013-10-20 23:04:26 -07:00
Stanislav Malyshev
297324146e
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
2013-10-20 23:04:16 -07:00
Stanislav Malyshev
27ebcb8d0e
5.4.21 release date
2013-10-20 23:04:16 -07:00
Stanislav Malyshev
8f19a8da65
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 23:04:03 -07:00
Stanislav Malyshev
8bef8e66cf
fix argument type & remove warning
2013-10-20 22:59:07 -07:00
Stanislav Malyshev
ef9069b4ef
fix const warnings in intl methods
2013-10-20 22:32:20 -07:00
Rasmus Lerdorf
ec2e6951b8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 22:18:33 -07:00
Rasmus Lerdorf
910d4751e3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 22:18:15 -07:00
Rasmus Lerdorf
2186e1583d
When src->src is null this doesn't get initialized
...
but it is still used, so the passed in *ze will point
to unitialized memory. Hopefully src->src is never
null, but just in case this initialization doesn't hurt.
2013-10-20 22:15:35 -07:00
Stanislav Malyshev
42cb9ac7a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
5.4.21 release date
2013-10-20 22:05:48 -07:00
Stanislav Malyshev
dab1d76e9d
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
2013-10-20 22:04:21 -07:00
Stanislav Malyshev
646813a37a
fix possibility of access to *storedType without initialization
2013-10-20 21:57:33 -07:00
Stanislav Malyshev
9aad9114e3
5.4.21 release date
2013-10-20 19:59:39 -07:00
Rasmus Lerdorf
7ccffeea75
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix typo
2013-10-20 17:56:24 -07:00
Rasmus Lerdorf
9e4651f6f1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix typo
2013-10-20 17:56:14 -07:00
Rasmus Lerdorf
18cc5386de
Fix typo
2013-10-20 17:55:55 -07:00
Rasmus Lerdorf
73e65ea3c9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
These getpwnam('') tests are silly and not portable
2013-10-20 14:05:29 -07:00
Rasmus Lerdorf
2129de4569
These getpwnam('') tests are silly and not portable
2013-10-20 14:04:47 -07:00
Rasmus Lerdorf
7b2a4c168e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Clean up this weird safe_emalloc() call
2013-10-20 09:37:40 -07:00
Rasmus Lerdorf
288a4ec3bd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Clean up this weird safe_emalloc() call
2013-10-20 09:37:25 -07:00
Rasmus Lerdorf
8f4a6d6e1b
Clean up this weird safe_emalloc() call
2013-10-20 09:36:50 -07:00
Rasmus Lerdorf
32a729a3ae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Minor Coverity tweaks
2013-10-20 08:56:41 -07:00
Rasmus Lerdorf
c5e5a6c2ac
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Minor Coverity tweaks
2013-10-20 08:56:24 -07:00
Rasmus Lerdorf
1494298231
Minor Coverity tweaks
2013-10-20 08:55:48 -07:00
Felipe Pena
048923b3c6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Moved NULL check before dereferencing
2013-10-20 09:50:17 -02:00
Felipe Pena
8aa19c9fd8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Moved NULL check before dereferencing
2013-10-20 09:50:13 -02:00
Felipe Pena
9976b5cd7f
- Moved NULL check before dereferencing
2013-10-20 09:50:11 -02:00
Felipe Pena
d23f089fb9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed possible NULL ptr dereference
2013-10-20 09:04:36 -02:00
Felipe Pena
5b0560efc3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible NULL ptr dereference
2013-10-20 09:04:27 -02:00
Felipe Pena
52555a7894
- Fixed possible NULL ptr dereference
2013-10-20 09:04:24 -02:00
Felipe Pena
b6feabc8c6
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-10-20 08:52:31 -02:00
Felipe Pena
b7c64683da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
2013-10-20 08:51:27 -02:00
Felipe Pena
df31eb8fdc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
2013-10-20 08:51:17 -02:00
Felipe Pena
33d377e701
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
2013-10-20 08:51:09 -02:00
Rasmus Lerdorf
eb616f8c0f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove senseless check here
2013-10-19 20:57:02 -07:00
Rasmus Lerdorf
683a7d719b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove senseless check here
2013-10-19 20:56:01 -07:00
Rasmus Lerdorf
fb38fdc7fd
Remove senseless check here
2013-10-19 20:55:02 -07:00
Felipe Pena
ab7b0f9f43
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fix extern declaration according to definition
2013-10-20 01:16:15 -02:00
Felipe Pena
0d6247f968
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fix extern declaration according to definition
2013-10-20 01:16:10 -02:00
Felipe Pena
a1daebefda
- Fix extern declaration according to definition
2013-10-20 01:16:07 -02:00
Felipe Pena
84011f7c32
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fix possible memory leak
2013-10-20 01:05:06 -02:00
Felipe Pena
8d22c23161
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fix possible memory leak
2013-10-20 01:05:00 -02:00
Felipe Pena
420068c6e1
- Fix possible memory leak
2013-10-20 01:04:55 -02:00
Felipe Pena
39e746a424
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Moved allocation to if block to make Coverity happy
2013-10-19 23:36:41 -03:00
Felipe Pena
0b5c2887cd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Moved allocation to if block to make Coverity happy
2013-10-19 23:36:36 -03:00
Felipe Pena
85a622e42f
- Moved allocation to if block to make Coverity happy
2013-10-19 23:36:28 -03:00
Felipe Pena
07361a4efc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed possible memory leak
2013-10-19 23:30:53 -03:00
Felipe Pena
c1f22176f3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible memory leak
2013-10-19 23:30:12 -03:00
Felipe Pena
aa4f9b322b
- Fixed possible memory leak
2013-10-19 23:29:34 -03:00
Rasmus Lerdorf
6650bed41c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix unitialized opened_path here - found by Coverity
2013-10-19 19:25:47 -07:00
Rasmus Lerdorf
1ce00048fd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix unitialized opened_path here - found by Coverity
2013-10-19 19:25:25 -07:00
Rasmus Lerdorf
2be67ca457
Fix unitialized opened_path here - found by Coverity
2013-10-19 19:24:17 -07:00
Rasmus Lerdorf
259c74654c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Trivial Coverity fix
2013-10-19 17:56:21 -07:00
Rasmus Lerdorf
4a205092f7
Trivial Coverity fix
2013-10-19 17:55:34 -07:00
Rasmus Lerdorf
12aa4aa61c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Initialize these to make Coverity happy
Typo fix: managment -> management
Use minus sign instead of hyphen
Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 17:42:36 -07:00
Rasmus Lerdorf
26b27767a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Initialize these to make Coverity happy
Typo fix: managment -> management
Use minus sign instead of hyphen
Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 17:41:04 -07:00
Rasmus Lerdorf
813e867652
Initialize these to make Coverity happy
2013-10-19 17:37:59 -07:00
Nikita Popov
9b46a15a6e
Remove extraneous NULL check of Z_ARRVAL_P()
...
Z_ARRVAL_P() is never NULL
2013-10-19 23:52:23 +02:00
Nikita Popov
870d3e75ca
Remove dead comparison (size_t < 0)
2013-10-19 23:46:09 +02:00
Nikita Popov
1292091670
Fix misleading sizeof
...
An array of zval* is allocated, but sizeof(zval **) is used.
Makes no practical difference as sizeof(zval *) == sizeof(zval **).
2013-10-19 23:43:05 +02:00
Nikita Popov
a1ae79e114
Fix assignment in dummy_encoding_list_parser
2013-10-19 23:25:31 +02:00
Nikita Popov
64caedd927
Use zend_error_noreturn for all E_COMPILE_ERRORs
2013-10-19 23:22:20 +02:00
Lior Kaplan
a55d3b9295
Typo fix: managment -> management
2013-10-19 23:53:23 +03:00
Lior Kaplan
df501fd464
Use minus sign instead of hyphen
2013-10-19 23:52:43 +03:00
Xinchen Hui
e1f9993ba8
Merge branch 'PHP-5.5'
2013-10-19 22:19:11 +08:00
Xinchen Hui
d42fa2a059
Revert "Need a way to check whether this API exists"
...
hmm, we can check whether the head file exists instead
This reverts commit 4d7d85640d .
2013-10-19 22:18:37 +08:00
Xinchen Hui
b96bee6fdd
Merge branch 'PHP-5.5'
2013-10-19 22:17:06 +08:00
Xinchen Hui
4d7d85640d
Need a way to check whether this API exists
2013-10-19 22:16:31 +08:00
Rasmus Lerdorf
55b16f40a2
Merge branch 'pull-request/499'
...
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:43:21 -07:00
Rasmus Lerdorf
6919d15a2e
Merge branch 'pull-request/499'
...
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:42:53 -07:00
Rasmus Lerdorf
adcd481ddf
Merge branch 'pull-request/499'
...
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:01:13 -07:00
Xinchen Hui
9a2aa11132
Merge branch 'PHP-5.5'
2013-10-19 13:29:42 +08:00
Xinchen Hui
30d64b0efb
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-19 13:27:36 +08:00
Michael Wallner
1fe1f7305b
use $YACC instead of 'bison' as suggested by Yasuo
...
Conflicts:
Zend/acinclude.m4
2013-10-19 13:27:24 +08:00
Anatol Belski
ecd03baf61
fixed virtual cwd header in phar
2013-10-18 10:02:19 -07:00
Anatol Belski
423e1c77b5
updated NEWS
2013-10-18 07:57:01 -07:00
Anatol Belski
2786a2a1ab
fixed all the places where last error could be lost
...
whereby this commit should be applied to master anyway
2013-10-18 07:00:05 -07:00
Anatol Belski
515ef09b62
preserve the error code
...
otherwise it'd be cleared by a subsequent calls
2013-10-18 05:01:16 -07:00
Michael Wallner
c86862cb3c
Merge branch 'openssl_compile_warning_fix' of https://github.com/bukka/php-src
...
* 'openssl_compile_warning_fix' of https://github.com/bukka/php-src :
Fix compiler warnings in openssl.c
2013-10-18 12:03:02 +02:00
Michael Wallner
a03b1328b8
fix compiler warnings and type usage
2013-10-18 11:34:24 +02:00
Michael Wallner
f711c1219d
Merge branch 'ldap_escape-dev' of https://github.com/DaveRandom/php-src
...
* 'ldap_escape-dev' of https://github.com/DaveRandom/php-src :
Add ldap_escape()
2013-10-18 11:17:41 +02:00
jrchamp
fd06c5206a
Fix RFC 6598 IPv4 Range
2013-10-18 02:04:15 -04:00
jrchamp
8713089f22
Fix 100.64 IPv4 Range Check
2013-10-18 02:01:06 -04:00
Xinchen Hui
d345ad211b
Merge branch 'zend-documentation-fix' of https://github.com/AskDrCatcher/php-src-1
2013-10-18 10:40:44 +08:00
Xinchen Hui
065bbeb83f
Merge branch 'PHP-5.5'
2013-10-18 10:34:59 +08:00
Xinchen Hui
db61685edf
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-10-18 10:34:36 +08:00
Xinchen Hui
4417421ab6
Retruning SUCCESS/FAILURE instead of int
2013-10-18 10:33:53 +08:00
ArunSK
6b90f23787
fixed typo and few grammar mistakes
2013-10-17 22:00:40 -04:00
Christopher Jones
5e368b76ed
Add missing test to package.xml
2013-10-17 13:49:50 -07:00
Christopher Jones
c59d790949
Prepare for OCI8 2.0.5 release
2013-10-17 12:15:45 -07:00
Christopher Jones
cefbf932c8
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
TLS news
previous revert killed that file
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
TLS news
fix ws
Added support for TLSv1.1 and TLSv1.2
Added support for TLSv1.1 and TLSv1.2
2013-10-17 09:23:15 -07:00
Christopher Jones
a4b4477466
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
TLS news
Added support for TLSv1.1 and TLSv1.2
2013-10-17 09:21:39 -07:00
Michael Wallner
66868c8fd4
TLS news
2013-10-17 15:47:55 +02:00
Michael Wallner
b95f9fa0aa
previous revert killed that file
2013-10-17 15:32:18 +02:00
Michael Wallner
3f2fba4c34
Merge branch 'updated_tls_support' of https://github.com/rdlowrey/php-src
...
* 'updated_tls_support' of https://github.com/rdlowrey/php-src :
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 15:27:15 +02:00
Michael Wallner
dd3a4c303b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
2013-10-17 15:22:07 +02:00
Michael Wallner
d89d46d940
Revert "TLS news"
...
This reverts commit 62be976abe .
2013-10-17 15:21:34 +02:00
Michael Wallner
8aaecef524
Revert "Added support for TLSv1.1 and TLSv1.2"
...
This reverts commit 2aaa3d538a .
2013-10-17 15:20:38 +02:00
Michael Wallner
e6481e2393
Merge branch 'PHP-5.5'
...
* PHP-5.5:
TLS news
2013-10-17 15:13:25 +02:00
Michael Wallner
62be976abe
TLS news
2013-10-17 15:13:12 +02:00
Michael Wallner
ad0a85b9e2
fix ws
2013-10-17 15:09:28 +02:00
Michael Wallner
5a7ca69e56
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 14:53:50 +02:00
Daniel Lowrey
2aaa3d538a
Added support for TLSv1.1 and TLSv1.2
...
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 14:49:44 +02:00
Christopher Jones
134caeb837
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Assume the free space is correct on Travis CI.
2013-10-17 05:41:53 -07:00
Christopher Jones
4628c9b375
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Assume the free space is correct on Travis CI.
2013-10-17 05:40:57 -07:00
Michael Wallner
bd666e2f99
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Assume the free space is correct on Travis CI.
2013-10-17 12:12:26 +02:00
Tjerk Meesters
51b809e3ad
Assume the free space is correct on Travis CI.
2013-10-17 12:12:05 +02:00
Anatol Belski
cf6ab0e915
applied and fixed the original patch
...
initial work on the patch import done
2013-10-17 10:40:43 +02:00
Anatol Belski
e30b2aae5a
initial move on renaming files and fixing includes
2013-10-17 09:43:52 +02:00
Christopher Jones
89e93bd2a2
OCI8: More test updates
2013-10-16 22:33:34 -07:00
Christopher Jones
0d909f5bfc
OCI8: Mostly SKIPIF version updates to simplify version checks at the expense of not testing some edge cases with older Oracle patch set versions.
...
Delete two obsolete .phpt's.
2013-10-16 22:02:32 -07:00
Xinchen Hui
a1a7522105
Merge branch 'PHP-5.5'
2013-10-17 12:25:01 +08:00
Xinchen Hui
06994a419d
Add ability of alias resolving (it cause problem while work with opcache)
2013-10-17 12:23:09 +08:00
Nikita Popov
d51553e399
Merge branch 'PHP-5.5'
2013-10-16 18:39:13 +02:00
Nikita Popov
865f221627
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-16 18:37:49 +02:00
bwoebi
4c0bb6d76e
Fixed bug #65911 ($this not usable as static property)
...
In context of static accesses like classname::$this, the string
"$this" should not be handled like a $this variable, but as an
identifier for a static variable.
2013-10-16 18:33:14 +02:00
Andrea Faulds
872ef919ca
UPGRADING and NEWS
2013-10-15 22:44:23 +00:00
Andrea Faulds
29e755ac66
Merge branch 'PHP-5.4' into JSONWhitespaceFix
2013-10-15 22:38:46 +00:00
Andrea Faulds
8495d63034
Better test: Check combined leading/trailing
2013-10-15 20:42:31 +00:00
Julien Pauli
aa76f779ef
5.5.6 now
2013-10-15 16:11:11 +02:00
Paul Tarjan
a2eacd8a2c
fix typo in copy_variation16 test
2013-10-14 23:54:59 -07:00
Igor Wiedler
602fef0e52
Clarify type of use in error messages
2013-10-14 23:32:11 +02:00
Igor Wiedler
e23ad4eeb2
Add "Done" output to distinguish hard from soft failures
2013-10-14 23:21:06 +02:00
Anatol Belski
eb97d270da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix whitespaces
2013-10-14 17:13:30 +02:00
Anatol Belski
7e4a42c278
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix whitespaces
2013-10-14 17:13:11 +02:00
Anatol Belski
b0a36007ab
fix whitespaces
2013-10-14 17:12:32 +02:00
Anatol Belski
2a093551e7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added notes about the PECL site conformity
Conflicts:
README.EXTENSIONS
2013-10-14 16:10:10 +02:00
Anatol Belski
78cbe9aed5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added notes about the PECL site conformity
2013-10-14 16:08:21 +02:00
Anatol Belski
9ccde8a415
added notes about the PECL site conformity
2013-10-14 16:07:26 +02:00
Anatol Belski
dcfd753104
fixed skeleton to produce the normalized ext version macros
...
See http://news.php.net/php.pecl.dev/11191 for more info.
2013-10-14 14:37:39 +02:00
Anatol Belski
ea4ef75918
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed skeleton to produce the normalized ext version macros
2013-10-14 14:34:33 +02:00
Anatol Belski
2c9fc139fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed skeleton to produce the normalized ext version macros
2013-10-14 14:21:46 +02:00
Anatol Belski
7a038ccbe6
fixed skeleton to produce the normalized ext version macros
...
See http://news.php.net/php.pecl.dev/11191 for more info.
2013-10-14 14:18:43 +02:00
Jakub Zelenka
c092d286fc
Fix compiler warnings in openssl.c
2013-10-13 15:52:39 +01:00
Felipe Pena
314a3aa9ac
Merge branch 'master' of git.php.net:/php-src
2013-10-12 18:07:58 -03:00
Felipe Pena
eed5d9cc5f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed possible memory leak
2013-10-12 18:06:39 -03:00
Felipe Pena
62a8305007
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible memory leak
2013-10-12 18:06:27 -03:00
Felipe Pena
960b4e81f3
- Fixed possible memory leak
2013-10-12 18:06:20 -03:00
Daniel Lowrey
9d57243794
Fixes broken zts build (recent openssl changes)
2013-10-12 22:28:15 +02:00
Felipe Pena
0ca4b6c083
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed resource leak
2013-10-12 17:25:37 -03:00
Felipe Pena
5c6dbc35e7
- Fixed resource leak
2013-10-12 17:25:26 -03:00
Felipe Pena
54a595a091
Merge branch 'master' of git.php.net:/php-src
2013-10-12 17:05:20 -03:00
Levi Morrison
73c44d6e6a
Fixed assumption that the temporary directory is located in /tmp
2013-10-11 22:18:07 +02:00
Levi Morrison
7f3b5b77cc
Standardized usage of zpp_none and the order of the comparison zpp(...) == FAILURE
2013-10-11 10:32:40 -06:00
Christopher Jones
5ae8c51e68
OCI8: sync README and package.xml descriptions
2013-10-10 13:38:38 -07:00
Christopher Jones
71a3c07843
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Dmitry Stogov
# Via Christopher Jones (2) and Dmitry Stogov (2)
* 'master' of https://git.php.net/repository/php-src :
Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
2013-10-10 11:15:12 -07:00
Christopher Jones
ef7fd7f4b5
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Dmitry Stogov
# Via Dmitry Stogov
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
2013-10-10 11:14:22 -07:00
Dmitry Stogov
a2aa6a3440
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
Conflicts:
NEWS
2013-10-10 15:33:17 +04:00
Dmitry Stogov
ef8cf76815
Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
2013-10-10 15:32:30 +04:00
Christopher Jones
141c2cb97a
Re-enable OCI8 DLL builds with Oracle 10g & 11g client libraries on
...
Windows, in addition to Oracle 12c. From discussions with Anatol &
Pierre this seems to be the most direct way for the Windows PECL build
scripts to automatically create links to the generated DLLs. The
issue is that the name php_oci8_12c.dll doesn't match the package
name.
In the far future when php_oci8.dll (with Oracle 10g) is no longer
built then another Windows PECL packaging fix will be needed.
2013-10-09 12:17:11 -07:00
Christopher Jones
3979b8b9c4
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Michael Wallner (4) and others
# Via Michael Wallner (8) and Stanley Sufficool (1)
* 'master' of https://git.php.net/repository/php-src :
C89
Changed return types to zend_bool, renamed test
C89 compatibility
Fixed segfault when built with OpenSSL >= 1.0.1
Thanks Daniel, I didn't think long enough
consolidate NEWS with 5.4
Added SAN matching during peer verification
fixing a minor typo in CODING_STANDARDS document
FIX BUG #65219 - Typo correction
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736)
2013-10-09 09:41:12 -07:00
Christopher Jones
f859b8d2cf
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Michael Wallner (2) and others
# Via Michael Wallner (3) and Stanley Sufficool (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src :
C89 compatibility
Fixed segfault when built with OpenSSL >= 1.0.1
consolidate NEWS with 5.4
fixing a minor typo in CODING_STANDARDS document
FIX BUG #65219 - Typo correction
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
2013-10-09 09:41:01 -07:00
Christopher Jones
9fbfdb3396
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Daniel Lowrey (1) and Michael Wallner (1)
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src :
C89 compatibility
Fixed segfault when built with OpenSSL >= 1.0.1
2013-10-09 09:40:54 -07:00
Michael Wallner
e2d123a720
C89
2013-10-09 17:16:25 +02:00
Michael Wallner
c85c50e35c
Merge branch 'san_peer_matching' of https://github.com/rdlowrey/php-src
...
* 'san_peer_matching' of https://github.com/rdlowrey/php-src :
Changed return types to zend_bool, renamed test
Added SAN matching during peer verification
2013-10-09 17:09:03 +02:00
Daniel Lowrey
a40dd6e963
Changed return types to zend_bool, renamed test
2013-10-09 09:55:36 -04:00
Michael Wallner
302b9d4e5c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
C89 compatibility
2013-10-09 12:30:51 +02:00
Michael Wallner
3b3c57e79e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
C89 compatibility
2013-10-09 12:30:42 +02:00
Michael Wallner
22700890d4
C89 compatibility
2013-10-09 12:30:31 +02:00
Michael Wallner
5f41cb18be
Merge branch 'issue-55736' of https://github.com/tistre/php-src
...
implements FR #55736
* 'issue-55736' of https://github.com/tistre/php-src :
run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736)
2013-10-09 10:06:45 +02:00
Michael Wallner
29d5ff75d5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed segfault when built with OpenSSL >= 1.0.1
fixing a minor typo in CODING_STANDARDS document
FIX BUG #65219 - Typo correction
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
2013-10-09 09:18:29 +02:00
Michael Wallner
36fb4ed968
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed segfault when built with OpenSSL >= 1.0.1
fixing a minor typo in CODING_STANDARDS document
FIX BUG #65219 - Typo correction
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
2013-10-09 09:17:48 +02:00
Daniel Lowrey
b026993a74
Fixed segfault when built with OpenSSL >= 1.0.1
...
(PR #481 )
2013-10-09 09:17:25 +02:00
Michael Wallner
1815942f53
Thanks Daniel, I didn't think long enough
2013-10-09 08:22:33 +02:00
Michael Wallner
cfa4eced9f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
consolidate NEWS with 5.4
2013-10-09 08:16:23 +02:00
Michael Wallner
e3c7b48709
consolidate NEWS with 5.4
2013-10-09 08:16:00 +02:00
Daniel Lowrey
2ddefbd2b3
Added support for TLSv1.1 and TLSv1.2
2013-10-08 14:09:17 -04:00
Christopher Jones
c0bcedafbc
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Tjerk Meesters (12) and others
# Via Michael Wallner
* 'master' of https://git.php.net/repository/php-src: (24 commits)
openssl NEWS,UPGRADING
fix bad cast
fix bug #51076 (race condition in shtool's mkdir -p)
DNS name comparison is now case insensitive.
Use zend_bool as return value for _match()
Added two more test cases for CN matching.
Using SUCCESS and FAILURE for return values Using zend_bool for boolean arguments and return values Reduced one level of zval indirection where possible
Add unit test that covers setting the crypto method.
show method in error message
Support string and array for peer fingerprint matching
who put that stupid newline there?
add md5 and sha1 fingerprint tests
Renamed to be more descriptive of what it does
Streams for ssl:// transports can now be configured to use a specific crypto method (SSLv3, SSLv2 etc.) by calling
yay, reduced one variable
Fixed bug that would lead to out of bounds memory access
don't leak cert on errors, return null on zpp failure
added better wildcard matching for CN
Added test case for openssl_x509_digest()
removed the byref result
...
2013-10-08 10:21:42 -07:00
Christopher Jones
fe650a43ed
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Michael Wallner
# Via Michael Wallner
* 'PHP-5.5' of https://git.php.net/repository/php-src :
fix bug #51076 (race condition in shtool's mkdir -p)
2013-10-08 10:21:10 -07:00
Daniel Lowrey
1970b96443
Added SAN matching during peer verification
2013-10-08 12:37:44 -04:00
Michael Wallner
cf6413ae7c
openssl NEWS,UPGRADING
2013-10-08 16:20:07 +02:00
Michael Wallner
ea0578e223
Merge branch 'ssl-streams-crypto-method' of https://github.com/mj/php-src
...
* 'ssl-streams-crypto-method' of https://github.com/mj/php-src :
Add unit test that covers setting the crypto method.
Streams for ssl:// transports can now be configured to use a specific crypto method (SSLv3, SSLv2 etc.) by calling
2013-10-08 16:10:00 +02:00
Michael Wallner
8300ced2f7
Merge branch 'bug65729' of https://github.com/datibbaw/php-src
...
* 'bug65729' of https://github.com/datibbaw/php-src :
DNS name comparison is now case insensitive.
Use zend_bool as return value for _match()
Added two more test cases for CN matching.
yay, reduced one variable
Fixed bug that would lead to out of bounds memory access
added better wildcard matching for CN
2013-10-08 15:58:28 +02:00
Michael Wallner
0d8c83a251
Merge branch 'openssl-x509-digest' of https://github.com/datibbaw/php-src
...
* 'openssl-x509-digest' of https://github.com/datibbaw/php-src :
Using SUCCESS and FAILURE for return values Using zend_bool for boolean arguments and return values Reduced one level of zval indirection where possible
show method in error message
Support string and array for peer fingerprint matching
who put that stupid newline there?
add md5 and sha1 fingerprint tests
Renamed to be more descriptive of what it does
don't leak cert on errors, return null on zpp failure
Added test case for openssl_x509_digest()
removed the byref result
indentation fail
added option for hash function
added option for raw output
added openssl_x509_digest(), output is binary sha1
2013-10-08 15:57:18 +02:00
Michael Wallner
5d430ad902
fix bad cast
2013-10-08 11:16:53 +02:00
Michael Wallner
b15765412a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #51076 (race condition in shtool's mkdir -p)
2013-10-08 08:37:44 +02:00
Michael Wallner
f32d2ac3aa
fix bug #51076 (race condition in shtool's mkdir -p)
2013-10-08 08:37:08 +02:00
datibbaw
6106896440
DNS name comparison is now case insensitive.
2013-10-08 10:07:54 +08:00
Christopher Jones
f0863fa43a
Add new tests to package.xml
2013-10-07 17:38:56 -07:00
Christopher Jones
1675fd2277
Add new tests
2013-10-07 17:26:00 -07:00
Christopher Jones
12f9939b79
Bump mininum requirements for PHP OCI8 2.0 to PHP 5.2 and Oracle
...
client library 10.2 (Note this will connect to Oracle Database 8.1.7
onwards). Use the older OCI8 1.4 from PECL if using an earlier PHP
version or older Oracle client library support is necessary.
2013-10-07 17:23:11 -07:00
Tjerk Meesters
39c0daeb71
Use zend_bool as return value for _match()
2013-10-07 23:04:24 +08:00
Tjerk Meesters
674dd73f8c
Added two more test cases for CN matching.
2013-10-07 22:10:05 +08:00
Anatol Belski
4fe7ec33f1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added fixed tests for ICU >= 51.2
fixed failing tests for ICU >= 51.2
FIX BUG #65219 - Typo correction
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
2013-10-07 13:50:59 +02:00
Anatol Belski
0117eb747e
added fixed tests for ICU >= 51.2
2013-10-07 13:49:55 +02:00
Anatol Belski
4840b0a749
fixed failing tests for ICU >= 51.2
2013-10-07 13:49:10 +02:00
datibbaw
955bc1d91b
Using SUCCESS and FAILURE for return values
...
Using zend_bool for boolean arguments and return values
Reduced one level of zval indirection where possible
2013-10-07 15:38:48 +08:00
ArunSK
b5a0f12871
fixing a minor typo in CODING_STANDARDS document
2013-10-07 00:26:49 +02:00
Stanley Sufficool
fa40290fb7
FIX BUG #65219 - Typo correction
2013-10-05 21:00:47 -07:00
Stanley Sufficool
63f242178d
FIX BUG #65219 - Typo correction
2013-10-05 20:59:20 -07:00
Stanley Sufficool
9c7dbb0487
Fix bug #64338 pdo_dblib can't connect to Azure SQL
2013-10-05 18:26:25 -07:00
Stanley Sufficool
3e023c3ddf
Merge branch 'master' of https://git.php.net/push/php-src
...
* 'master' of https://git.php.net/push/php-src: (705 commits)
Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired. Note the implementations differ so you will see different ldap behavior.
Fix bug #65667 : ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
Fix bug #65821 : By-ref foreach on property access of string offset segfaults
Fixed bug #64230 (XMLReader does not suppress errors)
add NEWS and UPGRADING about gost-crypto
fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
typo: really fix bug #51936 Crash with clone xmlreader
fix bug #59613 (Crash with clone XMLReader)
Fix Bug #60633 build warning in bcmath
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
Revert "Make 'make distclean' remove the downloaded pear PHAR"
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
Reverted patch (it was used for internal testing and was committed by accident)
OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
Make 'make distclean' remove the downloaded pear PHAR
fix test
...
2013-10-05 17:57:23 -07:00
Stanley Sufficool
5ce23f39d5
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92
...
FreeTDS <0.92 does not support DBSETLDBNAME option and therefore
will not work with SQL Azure. Fallback to dbuse command in
letter versions.
2013-10-05 10:06:42 -07:00
Stanley Sufficool
d74b9cfee5
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/push/php-src :
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
Fix bug #65667 : ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
Fixed bug #64230 (XMLReader does not suppress errors)
typo: really fix bug #51936 Crash with clone xmlreader
fix bug #59613 (Crash with clone XMLReader)
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
fix test
fix memleak on resetting rebind_proc
Fix bug #65322 : compile time errors won't trigger auto loading
5.4.20 release date
Add information about which INI file is which inside respective files
- Updated to version 2013.6 (2013f)
2013-10-05 09:57:13 -07:00
Stanley Sufficool
690bbe170d
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92
...
FreeTDS <0.92 does not support DBSETLDBNAME option and therefore
will not work with SQL Azure. Fallback to dbuse command in
letter versions.
2013-10-05 09:54:45 -07:00
Felipe Pena
606a97f4ec
Merge branch 'master' of git.php.net:/php-src
2013-10-05 12:55:35 -03:00
Felipe Pena
8153dd2a95
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired. Note the implementations differ so you will see different ldap behavior.
2013-10-05 12:53:24 -03:00
Felipe Pena
93f3ba66a7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
2013-10-05 12:53:10 -03:00
Felipe Pena
3aaee86ee3
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
2013-10-05 12:52:55 -03:00
Felipe Pena
248afd1c3c
- BFN
2013-10-05 12:52:32 -03:00
Christopher Jones
3261eb348f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired. Note the implementations differ so you will see different ldap behavior.
2013-10-04 15:51:39 -07:00
Christopher Jones
5bc377457e
Allow the ldap extension to be compiled with Oracle's LDAP
...
implementation, if desired. Note the implementations differ so you
will see different ldap behavior.
The patch allows configuration similar to:
--with-ldap=$HOME/instantclient --with-oci8=instantclient,$HOME/instantclient
The patch doesn't support configuration similar to:
--with-ldap --with-oci8=instantclient,$HOME/instantclient
since this would try and mix the default LDAP and Oracle LDAP
implementations.
This patch closes out bug #61450 and the associated github PR.
Regardless of this patch, my recommended way to install both OCI8 and
ldap extensions is to statically configure PHP with ldap, and then add
OCI8 as a shared extension from PECL.
2013-10-04 15:50:16 -07:00
Martin Jansen
047877e810
Add unit test that covers setting the crypto method.
2013-10-04 21:55:29 +02:00
Christopher Jones
1fee78e465
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix bug #65667 : ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
2013-10-04 10:51:36 -07:00
Christopher Jones
fb6f5d2e2d
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fix bug #65667 : ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
2013-10-04 10:51:04 -07:00
Christopher Jones
6a823071f9
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fix bug #65667 : ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
2013-10-04 10:50:53 -07:00
Nikita Popov
44a2ae059e
Merge branch 'PHP-5.5'
2013-10-04 17:27:22 +02:00
Nikita Popov
90f0a77cad
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-04 17:26:35 +02:00
Philip Hofstetter
96cc419924
Fix bug #65667 : ftp_nb_continue produces segfault
...
the idea behind ftp_nb_get is for it to be followed by multiple calls
to ftp_nb_continue in order to download a file piece-by-piece.
As such, it's unwise to close the stream used to write the downloaded
data to when the file hasn't been completely downloaded within the first
call to ftp_nb_get.
This regression was added in a93a462dce
and this patch restores the behavior that was seen pre-patch.
2013-10-04 17:25:46 +02:00
Michael Wallner
f72ed22749
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
2013-10-04 16:17:46 +02:00
Michael Wallner
d72a4d1634
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
2013-10-04 16:17:37 +02:00
Michael Wallner
8973390541
fix bug #64146 (serialize incorrectly saving objects when they are
...
cloned)
2013-10-04 16:16:15 +02:00
Michael Wallner
39022ba227
Merge branch 'PHP-5.5'
...
* PHP-5.5:
such a weird hack probably helps in finding regressions in the future
2013-10-04 16:12:41 +02:00
Michael Wallner
adfb5ab7ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
such a weird hack probably helps in finding regressions in the future
2013-10-04 16:12:23 +02:00
Michael Wallner
e8ae795529
such a weird hack probably helps in finding regressions in the future
2013-10-04 16:11:49 +02:00
Christopher Jones
27d46a4454
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix bug #65821 : By-ref foreach on property access of string offset segfaults
Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 05:41:03 -07:00
Christopher Jones
366491c1ce
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fix bug #65821 : By-ref foreach on property access of string offset segfaults
Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 05:40:43 -07:00
Christopher Jones
76d2d474be
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 05:40:30 -07:00
Nikita Popov
ff46b6f633
Merge branch 'PHP-5.5'
2013-10-04 13:15:45 +02:00
Nikita Popov
536260f2c5
Fix bug #65821 : By-ref foreach on property access of string offset segfaults
...
This removes the now unnecessary ZEND_FETCH_ADD_LOCK on the
container of a property fetch of a by-reference foreach.
2013-10-04 13:13:46 +02:00
Michael Wallner
e13e5b17ff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 11:22:52 +02:00
Michael Wallner
2e2bda3508
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 11:22:43 +02:00
Michael Wallner
f6ff3a28d6
Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 11:22:17 +02:00
Christopher Jones
5d6087497c
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
add NEWS and UPGRADING about gost-crypto
fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
fix failing tests
fix indention
Add support for CryptoPro S-box for GOST
2013-10-03 13:37:34 -07:00
Michael Wallner
099b295646
add NEWS and UPGRADING about gost-crypto
2013-10-03 16:23:59 +02:00
Michael Wallner
05f847da45
Merge PR #430 gost-crypto
...
Merge branch 'master' of github.com:manuelm/php-src
* 'master' of github.com:manuelm/php-src:
fix failing tests
fix indention
Add support for CryptoPro S-box for GOST
2013-10-03 16:20:00 +02:00
Michael Wallner
c7b1d76eb9
fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
2013-10-03 15:23:05 +02:00
Christopher Jones
333539b5fc
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
typo: really fix bug #51936 Crash with clone xmlreader
fix bug #59613 (Crash with clone XMLReader)
Fix Bug #60633 build warning in bcmath
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
2013-10-03 05:41:05 -07:00
Christopher Jones
2e2636dcc5
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
typo: really fix bug #51936 Crash with clone xmlreader
fix bug #59613 (Crash with clone XMLReader)
Fix Bug #60633 build warning in bcmath
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
2013-10-03 05:40:31 -07:00
Christopher Jones
545363cce0
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
typo: really fix bug #51936 Crash with clone xmlreader
fix bug #59613 (Crash with clone XMLReader)
fix bug #65808 the socket_connect() won't work with IPv6 address
2013-10-03 05:40:24 -07:00
Michael Wallner
2a1bd123d6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
typo: really fix bug #51936 Crash with clone xmlreader
2013-10-03 13:35:09 +02:00
Michael Wallner
92fd085ebf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo: really fix bug #51936 Crash with clone xmlreader
2013-10-03 13:35:00 +02:00
Michael Wallner
dc3d360a0f
typo: really fix bug #51936 Crash with clone xmlreader
2013-10-03 13:34:31 +02:00
Michael Wallner
95fd508dfa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #59613 (Crash with clone XMLReader)
2013-10-03 13:30:02 +02:00
Michael Wallner
86f2b33629
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #59613 (Crash with clone XMLReader)
2013-10-03 13:29:18 +02:00
Michael Wallner
fc3f8a8f54
fix bug #59613 (Crash with clone XMLReader)
2013-10-03 13:28:41 +02:00
Remi Collet
99598fd873
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix Bug #60633 build warning in bcmath
2013-10-03 08:45:40 +02:00
Remi Collet
60d9175280
Fix Bug #60633 build warning in bcmath
2013-10-03 08:45:31 +02:00
Michael Wallner
bc16dfda1f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
2013-10-02 15:56:09 +02:00
Michael Wallner
2ba3926815
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
Conflicts:
configure.in
ext/sockets/sockets.c
main/php_version.h
2013-10-02 15:55:38 +02:00
Michael Wallner
9209c19f8f
fix bug #65808 the socket_connect() won't work with IPv6 address
2013-10-02 15:19:25 +02:00
Christopher Jones
83955de57e
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Revert "Make 'make distclean' remove the downloaded pear PHAR"
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
2013-10-02 05:41:20 -07:00
Christopher Jones
6cd0bd82dc
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Revert "Make 'make distclean' remove the downloaded pear PHAR"
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
2013-10-02 05:40:42 -07:00
Christopher Jones
dbe2d7745f
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
5.4.22-dev now
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
2013-10-02 05:40:33 -07:00
Stanislav Malyshev
b2f8f35a88
5.4.22-dev now
2013-10-01 22:25:56 -07:00
Christopher Jones
67df40fd54
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "Make 'make distclean' remove the downloaded pear PHAR"
2013-10-01 10:35:03 -07:00
Christopher Jones
60e38b3243
Revert "Make 'make distclean' remove the downloaded pear PHAR"
...
This reverts commit d7baf0427f .
2013-10-01 10:33:39 -07:00
Christopher Jones
471413ab19
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (5) and others
* 'master' of https://git.php.net/repository/php-src :
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
Reverted patch (it was used for internal testing and was committed by accident)
2013-10-01 10:19:45 -07:00
Christopher Jones
ec5b87c50d
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (3) and Christopher Jones (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src :
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
Reverted patch (it was used for internal testing and was committed by accident)
2013-10-01 10:19:40 -07:00
Christopher Jones
33fd0e0b78
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Michael Wallner
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src :
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
2013-10-01 10:19:24 -07:00
Michael Wallner
54c08e3e1e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
2013-10-01 17:02:20 +02:00
Michael Wallner
4b61203b01
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
2013-10-01 17:01:44 +02:00
Michael Wallner
cd1cab3f47
fix bug #62396 'make test' crashes starting with 5.3.14
...
(missing gzencode())
2013-10-01 17:01:03 +02:00
Christopher Jones
1d65acea41
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fixed bug #61548
Reverted patch (it was used for internal testing and was committed by accident)
OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
2013-10-01 05:40:48 -07:00
Christopher Jones
d56850aaff
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed bug #61548
Reverted patch (it was used for internal testing and was committed by accident)
2013-10-01 05:40:28 -07:00
Christopher Jones
930946005e
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fixed bug #61548
2013-10-01 05:40:24 -07:00
Michael Wallner
d29a01de3f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #61548
Conflicts:
ext/standard/http_fopen_wrapper.c
2013-10-01 11:11:48 +02:00
Michael Wallner
ad139d9a00
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61548
2013-10-01 11:08:20 +02:00
Michael Wallner
18b04b480e
Fixed bug #61548
2013-10-01 11:07:55 +02:00
Dmitry Stogov
66cd9ef04c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reverted patch (it was used for internal testing and was committed by accident)
2013-10-01 11:34:19 +04:00
Dmitry Stogov
51fca2b4b3
Reverted patch (it was used for internal testing and was committed by accident)
2013-10-01 11:32:11 +04:00
Christopher Jones
954a0f8bf4
OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
...
Currently this code is #ifdef'd out, since I can't consider the feature stable until an Oracle-side fix for Oracle bug 16695981 is available. Having the code available in PHP OCI8 facilitates testing of any fix.
2013-09-30 16:51:07 -07:00
Christopher Jones
ca6a259ed1
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Michael Wallner (2) and others
# Via Christopher Jones (8) and others
* 'master' of https://git.php.net/repository/php-src :
Make 'make distclean' remove the downloaded pear PHAR
fix test
fix memleak on resetting rebind_proc
Fix bug #64979 : Wrong behavior of static variables in closure generators
Fix bug #65322 : compile time errors won't trigger auto loading
5.5.4 release date
5.4.20 release date
Add information about which INI file is which inside respective files
2013-09-30 15:54:39 -07:00
Christopher Jones
aeb6e9c264
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Michael Wallner (2) and others
# Via Christopher Jones (4) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Make 'make distclean' remove the downloaded pear PHAR
fix test
fix memleak on resetting rebind_proc
Fix bug #64979 : Wrong behavior of static variables in closure generators
Fix bug #65322 : compile time errors won't trigger auto loading
5.5.4 release date
5.4.20 release date
2013-09-30 15:54:36 -07:00
Christopher Jones
679bf479b6
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Michael Wallner (2) and others
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src :
fix test
fix memleak on resetting rebind_proc
Fix bug #65322 : compile time errors won't trigger auto loading
5.4.20 release date
2013-09-30 15:54:34 -07:00
Christopher Jones
86c3378c5c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Make 'make distclean' remove the downloaded pear PHAR
2013-09-30 15:47:33 -07:00
Christopher Jones
d7baf0427f
Make 'make distclean' remove the downloaded pear PHAR
2013-09-30 15:46:22 -07:00
Tjerk Meesters
e45eacd8fa
show method in error message
2013-09-30 21:21:56 +08:00
Michael Wallner
6757033355
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix test
fix memleak on resetting rebind_proc
2013-09-30 14:05:37 +02:00
Michael Wallner
d4d6a95105
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
fix memleak on resetting rebind_proc
2013-09-30 14:04:48 +02:00
Michael Wallner
2b78edfba2
fix test
2013-09-30 11:41:35 +02:00
Michael Wallner
e9e63f9223
fix memleak on resetting rebind_proc
2013-09-30 11:23:33 +02:00
Nikita Popov
cbf0683c6f
Merge branch 'PHP-5.5'
2013-09-29 20:19:40 +02:00
Nikita Popov
6b68f44e6b
Fix bug #64979 : Wrong behavior of static variables in closure generators
2013-09-29 20:18:12 +02:00
Nikita Popov
9529b8f5c4
Merge branch 'PHP-5.5'
2013-09-29 18:01:42 +02:00
Nikita Popov
1d1fb69c8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-09-29 18:01:18 +02:00
Nikita Popov
f0c926564c
Fix bug #65322 : compile time errors won't trigger auto loading
...
Also fixes duplicate bugs #54054 and #42098 .
Furthermore this fixes incorrect error messages thrown from code
running inside an error handler when a compilation is in progress.
The error file and line are now correctly associated with the
file/line of the executor, rather than the compiler.
2013-09-29 17:58:25 +02:00
Stanislav Malyshev
7a9530612d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.5.4 release date
5.4.20 release date
Add information about which INI file is which inside respective files
2013-09-28 18:07:32 -07:00
Stanislav Malyshev
f0c1ea1d2e
5.5.4 release date
2013-09-28 18:06:15 -07:00
Stanislav Malyshev
c91a638ed7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.20 release date
2013-09-28 18:05:38 -07:00
Stanislav Malyshev
d143c2b60f
5.4.20 release date
2013-09-28 18:04:44 -07:00
Christopher Jones
0a3ee7b26b
Prepare for next release
2013-09-27 17:16:02 -07:00
Christopher Jones
9b9eaba083
OCI8: Fix alloc function and DLL generation
2013-09-27 17:00:41 -07:00
Christopher Jones
aba30ce306
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Dmitry Stogov (2) and others
# Via Christopher Jones (22) and others
* 'master' of https://git.php.net/repository/php-src :
Removed references to "Zend Support"
Added support for GNU Hurd. (Svante Signell)
- Updated to version 2013.6 (2013f)
More OCI8 DTrace probe updates. Change php.ini-* doc to match an earlier change to config.w32
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
Don't track parameter number in separate znode
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
2013-09-27 15:57:13 -07:00
Christopher Jones
0eb414e2a5
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Dmitry Stogov (2) and others
# Via Lior Kaplan (2) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Add information about which INI file is which inside respective files
Removed references to "Zend Support"
Added support for GNU Hurd. (Svante Signell)
- Updated to version 2013.6 (2013f)
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
2013-09-27 15:57:08 -07:00
Christopher Jones
7e35004e39
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Derick Rethans (1) and others
# Via Lior Kaplan (1) and Stanley Sufficool (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Add information about which INI file is which inside respective files
- Updated to version 2013.6 (2013f)
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
2013-09-27 15:57:04 -07:00
Tjerk Meesters
75ba75e205
Using only two constants to signal use type intent.
2013-09-28 00:06:04 +08:00
datibbaw
0492145e58
added bitmask variation
2013-09-28 00:06:04 +08:00
Tjerk Anne Meesters
b8653d3457
fixed test case to pass on other systems than my own
2013-09-28 00:06:03 +08:00
datibbaw
6442e49b22
forgot introspection changes
2013-09-28 00:06:03 +08:00
datibbaw
a88c7be88b
added use_keys argument to array_filter()
2013-09-28 00:06:03 +08:00
Lior Kaplan
e98fc7de52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add information about which INI file is which inside respective files
2013-09-27 17:50:03 +02:00
Ondřej Surý
0ad0a2f56e
Add information about which INI file is which inside respective files
2013-09-27 17:46:14 +02:00
Dmitry Stogov
56eee05f66
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed references to "Zend Support"
2013-09-27 14:02:01 +04:00
Dmitry Stogov
80346690ba
Removed references to "Zend Support"
2013-09-27 14:01:07 +04:00
Dmitry Stogov
3eba8cf673
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added support for GNU Hurd. (Svante Signell)
Conflicts:
NEWS
2013-09-27 13:44:31 +04:00
Dmitry Stogov
f904830012
Added support for GNU Hurd. (Svante Signell)
2013-09-27 13:43:25 +04:00
Derick Rethans
9ef4e5d23d
Merge branch 'PHP-5.5'
2013-09-27 10:14:51 +01:00
Derick Rethans
ea0f832f10
Merge branch 'PHP-5.4' into PHP-5.5
2013-09-27 10:14:47 +01:00
Derick Rethans
7a1a1aec8c
- Updated to version 2013.6 (2013f)
2013-09-27 10:14:46 +01:00
datibbaw
edd93f3452
Support string and array for peer fingerprint matching
2013-09-27 14:13:11 +08:00
Christopher Jones
5ac7c533a0
More OCI8 DTrace probe updates.
...
Change php.ini-* doc to match an earlier change to config.w32
2013-09-26 21:12:11 -07:00
Christopher Jones
8554800e76
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Don't track parameter number in separate znode
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
2013-09-26 21:07:57 -07:00
Stanley Sufficool
577b10b214
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
2013-09-26 20:16:28 -07:00
Stanley Sufficool
ac05cfb499
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
2013-09-26 19:53:47 -07:00
Stanley Sufficool
9aa904c375
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/push/php-src: (140 commits)
Copy dba_*() keys before converting to string.
Fix the broken sh syntax in ext/imap/config.m4.
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
Tinker with the wording of the short_open_tag description.
Handle CLI server request headers case insensitively.
5.4.21 now
Typo....
Add a XFAIL test for #64896
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
...
2013-09-26 19:52:01 -07:00
Sara Golemon
92fe33c570
Merge branch 'pull-request/473'
2013-09-26 13:24:08 -07:00
Nikita Popov
0ceea8a2e8
Don't track parameter number in separate znode
...
We already track it in the op array already.
2013-09-26 19:43:32 +02:00
Christopher Jones
eb8e63bd3c
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Implement variadic function syntax
2013-09-26 09:57:54 -07:00
Christopher Jones
a3b0fa0d04
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Adam Harvey (2) and others
# Via Adam Harvey (2) and others
* 'master' of https://git.php.net/repository/php-src :
Implement variadic function syntax
Added function opcache_compile_file() to load PHP scripts into cache without execution.
Fixed issue #135 (segfault in interned strings if initial memory is too low)
Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
Make message and format arguments const char * to avoid build warning about invalid cast.
Copy dba_*() keys before converting to string.
2013-09-26 09:57:36 -07:00
Christopher Jones
9a655fcb18
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Dmitry Stogov (2) and others
# Via Adam Harvey (1) and Dmitry Stogov (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Added function opcache_compile_file() to load PHP scripts into cache without execution.
Fixed issue #135 (segfault in interned strings if initial memory is too low)
Make message and format arguments const char * to avoid build warning about invalid cast.
Copy dba_*() keys before converting to string.
2013-09-26 09:57:32 -07:00
Christopher Jones
b4b4372c88
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Adam Harvey
# Via Adam Harvey
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Copy dba_*() keys before converting to string.
2013-09-26 09:57:30 -07:00
Nikita Popov
0d7a638866
Implement variadic function syntax
...
As per RFC: https://wiki.php.net/rfc/variadics
2013-09-26 18:39:17 +02:00
ptarjan
361e984e46
fix missing change from 'tcp_socket' to the more common 'server'
2013-09-26 01:06:36 -07:00
ptarjan
ecbe4af0de
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-09-26 00:30:23 -07:00
Christopher Jones
c02ff01548
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Added function opcache_compile_file() to load PHP scripts into cache without execution.
Fixed issue #135 (segfault in interned strings if initial memory is too low)
2013-09-25 05:40:56 -07:00
Dmitry Stogov
6daa04a4f6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added function opcache_compile_file() to load PHP scripts into cache without execution.
Conflicts:
NEWS
2013-09-25 12:15:01 +04:00
Dmitry Stogov
69454d9f0f
Added function opcache_compile_file() to load PHP scripts into cache without execution.
2013-09-25 12:14:06 +04:00
Dmitry Stogov
4e249c8a93
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #135 (segfault in interned strings if initial memory is too low)
Conflicts:
NEWS
2013-09-25 11:04:03 +04:00
Dmitry Stogov
dc8705c256
Fixed issue #135 (segfault in interned strings if initial memory is too low)
2013-09-25 11:02:39 +04:00
Christopher Jones
f4ce01864a
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
2013-09-24 05:40:53 -07:00
Adam Harvey
8d087dc0d7
Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
...
Fixes bug #65745 (Typo in commit 4a3936ef4a ).
2013-09-23 13:30:47 -07:00
Tjerk Meesters
69bdc5aca8
who put that stupid newline there?
2013-09-23 23:42:31 +08:00
Tjerk Meesters
1c7cabb2ca
add md5 and sha1 fingerprint tests
2013-09-23 23:29:17 +08:00
Christopher Jones
fad80daec5
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Make message and format arguments const char * to avoid build warning about invalid cast.
Copy dba_*() keys before converting to string.
2013-09-23 05:41:25 -07:00
Remi Collet
c760ff1615
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Make message and format arguments const char * to avoid build warning about invalid cast.
2013-09-23 13:23:00 +02:00
Remi Collet
f7eff9cd41
Make message and format arguments const char * to avoid
...
build warning about invalid cast.
2013-09-23 13:21:57 +02:00
Adam Harvey
859b708722
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Copy dba_*() keys before converting to string.
2013-09-22 16:54:12 -07:00
Adam Harvey
a92a350cce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Copy dba_*() keys before converting to string.
2013-09-22 16:52:41 -07:00
Adam Harvey
30e0442c54
Copy dba_*() keys before converting to string.
...
A nice Sunday afternoon project for somebody would be to refactor the dba
functions to use zend_parse_parameters() reliably and try to untangle some of
the macros in dba.c. Sadly, it is not a nice Sunday afternoon here.
Fixes bug #65708 (dba functions cast $key param to string in-place, bypassing
copy on write).
2013-09-22 16:46:17 -07:00
Tjerk Meesters
2bfc5a253b
Renamed to be more descriptive of what it does
2013-09-23 00:51:17 +08:00
Martin Jansen
ce2789558a
Streams for ssl:// transports can now be configured to use a specific
...
crypto method (SSLv3, SSLv2 etc.) by calling
stream_context_set_option($ctx, "ssl", "crypto_method", $crypto_method)
where $crypto_method can be one of STREAM_CRYPTO_METHOD_SSLv2_CLIENT,
STREAM_CRYPTO_METHOD_SSLv3_CLIENT, STREAM_CRYPTO_METHOD_SSLv23_CLIENT
or STREAM_CRYPTO_METHOD_TLS_CLIENT. SSLv23 remains the default crypto
method.
This change makes it possible to fopen() SSL URLs that are only
provided using SSL v3.
2013-09-21 21:26:40 +02:00
Tjerk Meesters
a820c3d6ba
yay, reduced one variable
2013-09-21 20:42:52 +08:00
Tjerk Meesters
8e847b5845
Fixed bug that would lead to out of bounds memory access
2013-09-21 19:38:09 +08:00
Tjerk Meesters
521a5c9568
don't leak cert on errors, return null on zpp failure
2013-09-21 18:24:00 +08:00
Tjerk Meesters
8915c3fb4f
added better wildcard matching for CN
2013-09-21 16:45:20 +08:00
Christopher Jones
b3a17e53f3
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix the broken sh syntax in ext/imap/config.m4.
Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 17:10:16 -07:00
Christopher Jones
c175617b80
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Adam Harvey (1) and Anatol Belski (1)
# Via Adam Harvey (3) and others
* 'master' of https://git.php.net/repository/php-src :
Fix the broken sh syntax in ext/imap/config.m4.
Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 17:09:53 -07:00
Christopher Jones
9bf997c1db
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Adam Harvey (1) and Anatol Belski (1)
# Via Adam Harvey (2) and Christopher Jones (2)
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fix the broken sh syntax in ext/imap/config.m4.
Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 17:09:50 -07:00
Christopher Jones
34fc79bd61
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Adam Harvey
# Via Adam Harvey
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fix the broken sh syntax in ext/imap/config.m4.
2013-09-20 17:09:47 -07:00
Adam Harvey
9e3bedcd73
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix the broken sh syntax in ext/imap/config.m4.
2013-09-20 14:21:28 -07:00
Adam Harvey
3f64d35559
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix the broken sh syntax in ext/imap/config.m4.
2013-09-20 14:19:01 -07:00
Adam Harvey
cc66eaa04b
Fix the broken sh syntax in ext/imap/config.m4.
...
Patch by ryotakatsuki at gmail dot com. Fixes bug #65721 (configure script
broken in 5.5.4 and 5.4.20 when enabling imap).
2013-09-20 14:15:19 -07:00
Tjerk Meesters
a97aec16c0
Added test case for openssl_x509_digest()
2013-09-20 23:29:04 +08:00
Tjerk Meesters
574fe449dc
removed the byref result
2013-09-20 22:50:30 +08:00
Anatol Belski
ac562b027b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 16:01:11 +02:00
Anatol Belski
8f146c2bb0
Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
...
Patch by Pierre Renaudet
2013-09-20 15:59:33 +02:00
datibbaw
ce13f9fa32
indentation fail
2013-09-20 16:59:44 +08:00
datibbaw
b2881db9a9
added option for hash function
2013-09-20 16:56:50 +08:00
datibbaw
5cff92fb12
added option for raw output
2013-09-20 15:45:41 +08:00
datibbaw
b8f9a20286
added openssl_x509_digest(), output is binary sha1
2013-09-20 15:04:52 +08:00
Christopher Jones
d135e08a98
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Added application/pdf to PHP CLI Web Server mime types.
2013-09-19 20:38:53 -07:00
Christopher Jones
b0a5e760fe
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
add note about request_body and php://input
2013-09-19 20:27:28 -07:00
Christopher Jones
dcafcd01a9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added application/pdf to PHP CLI Web Server mime types.
2013-09-19 20:23:18 -07:00
Christopher Jones
dfa43d55dd
Added application/pdf to PHP CLI Web Server mime types.
2013-09-19 20:22:50 -07:00
Christopher Jones
d879d3de1e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
2013-09-19 20:22:12 -07:00
Christopher Jones
6ee3472a5f
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Michael Wallner
# Via Michael Wallner
* 'master' of https://git.php.net/repository/php-src :
add note about request_body and php://input
2013-09-19 10:53:22 -07:00
Michael Wallner
11d60447f9
add note about request_body and php://input
2013-09-19 15:41:04 +02:00
Christopher Jones
4f62df4f28
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Build OCI8 2.0 on Windows with Oracle Database 12c libraries only
2013-09-19 05:40:24 -07:00
Michael Wallner
98e4ecb6f0
fix Zend/tests/ns_040.phpt failing
...
It was wrongly assumed the namespace has to be looked up in a case
sensitive manner too. Fixed the lookup to use a lower case
represenation of the import name.
2013-09-19 10:51:57 +02:00
Christopher Jones
b6d0cb0553
Build OCI8 2.0 on Windows with Oracle Database 12c libraries only
2013-09-18 19:50:32 -07:00
Christopher Jones
3d165224da
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Michael Wallner (18) and others
# Via David Soria Parra (8) and others
* 'master' of https://git.php.net/repository/php-src: (37 commits)
better way to fix PRIu64 availability on windows
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
fix test concurrency
fix test concurrency
fix test concurrency
fix test concurrency
fix test concurrency
fix build - PRIu64 vs %I64u
final bits
we need to use the full stream wrapper for filters
let the libsqlite3 symbols be exported in dll
NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
Exclude bison 3.0 by Mike
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
upload2G note
NEWS for #60577
NEWS for bug #64441
...
2013-09-18 19:49:40 -07:00
Christopher Jones
c2b8a72673
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By David Soria Parra (6) and others
# Via David Soria Parra (5) and Michael Wallner (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
2013-09-18 19:49:36 -07:00
Christopher Jones
d5ba2d8a99
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By David Soria Parra (6) and others
# Via David Soria Parra
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
2013-09-18 19:49:30 -07:00
Christopher Jones
44ff556a82
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
better way to fix PRIu64 availability on windows
Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 08:16:09 -07:00
Anatol Belski
86dfe7be49
better way to fix PRIu64 availability on windows
2013-09-18 15:14:36 +02:00
David Soria Parra
dc7015d4e4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 15:06:58 +02:00
David Soria Parra
94e4c4df86
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 15:06:51 +02:00
David Soria Parra
7a24ee13ec
Revert "EmptyIterator now implements Countable; fixes bug 60577"
...
This reverts commit 8a936e8eb9 .
2013-09-18 15:06:36 +02:00
Christopher Jones
b1574a78e7
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
fix test concurrency
fix test concurrency
fix test concurrency
fix test concurrency
fix test concurrency
fix build - PRIu64 vs %I64u
2013-09-18 05:41:20 -07:00
David Soria Parra
58c6e05748
Merge branch 'PHP-5.5'
...
* PHP-5.5:
RFC 6598 reserved ip range starts at 100.64.0.0
2013-09-18 14:29:02 +02:00
David Soria Parra
2eb5661886
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
RFC 6598 reserved ip range starts at 100.64.0.0
2013-09-18 14:28:57 +02:00
David Soria Parra
7e9044b6a2
RFC 6598 reserved ip range starts at 100.64.0.0
2013-09-18 14:27:58 +02:00
Chris Wright
0d534d7c5e
Add ldap_escape()
2013-09-18 12:18:05 +01:00
Michael Wallner
33c4b61c7f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix a very rare case of use of uninitialized value combined with a memleak
2013-09-18 11:12:44 +02:00
Michael Wallner
a34b141e08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix a very rare case of use of uninitialized value combined with a memleak
2013-09-18 11:12:11 +02:00
Michael Wallner
9bfd55cda3
fix a very rare case of use of uninitialized value combined with a
...
memleak
2013-09-18 11:10:55 +02:00
Michael Wallner
cdf5d201ab
fix test concurrency
2013-09-18 11:02:45 +02:00
Michael Wallner
e9877fe92e
fix test concurrency
2013-09-18 10:53:11 +02:00
Michael Wallner
14d5341787
fix test concurrency
2013-09-18 10:52:51 +02:00
Michael Wallner
6866b45a48
fix test concurrency
2013-09-18 10:52:35 +02:00
Michael Wallner
002763fb7b
fix test concurrency
2013-09-18 10:52:18 +02:00
Andrea Faulds
2524428504
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-09-17 19:09:52 +00:00
Anatol Belski
4a85b5e190
fix build - PRIu64 vs %I64u
2013-09-17 16:02:08 +02:00
Christopher Jones
f0d8de4ca3
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src: (27 commits)
final bits
we need to use the full stream wrapper for filters
let the libsqlite3 symbols be exported in dll
NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
Exclude bison 3.0 by Mike
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
upload2G note
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
remove unused code
tests
make reading php://input JIT if enable_post_data_reading=0
revert stream cast
fix ZTS build
slim post data
...
2013-09-17 05:40:50 -07:00
Michael Wallner
e6084da473
final bits
2013-09-17 13:59:49 +02:00
Michael Wallner
423c70fb4d
Merge branch 'slim-postdata-merge'
...
* slim-postdata-merge:
remove unused code
tests
make reading php://input JIT if enable_post_data_reading=0
revert stream cast
fix ZTS build
slim post data
Conflicts:
ext/soap/soap.c
ext/standard/php_fopen_wrapper.c
main/SAPI.c
2013-09-17 13:52:25 +02:00
Michael Wallner
0f78d8612a
we need to use the full stream wrapper for filters
2013-09-17 13:44:50 +02:00
Anatol Belski
41d78110ff
let the libsqlite3 symbols be exported in dll
2013-09-17 13:05:44 +02:00
Michael Wallner
512734b58d
Merge remote-tracking branch 'refs/remotes/origin/master'
...
* refs/remotes/origin/master:
Exclude bison 3.0 by Mike
2013-09-17 11:10:38 +02:00
Michael Wallner
4a3936ef4a
NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
2013-09-17 11:08:23 +02:00
Xinchen Hui
be581ec66d
Exclude bison 3.0 by Mike
2013-09-17 16:54:27 +08:00
Michael Wallner
1c15d70cbd
Merge branch 'slim-postdata'
...
* slim-postdata:
slim post data
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
2013-09-17 10:50:49 +02:00
David Soria Parra
52ff129607
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
2013-09-17 09:55:59 +02:00
David Soria Parra
5e3da04fb0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
2013-09-17 09:55:03 +02:00
David Soria Parra
dfd7d1063a
NEWS for added reserved ip addresses according to RFC 6598
2013-09-17 09:54:58 +02:00
Sebastian Nohn
7c279df6ae
Add RFC 6598 IPs to reserved addresses
...
(cherry picked from commit b3f5b822e9f83d99d7cb5eed36ba8d307d1408ee)
2013-09-17 09:52:53 +02:00
Michael Wallner
552f22abae
upload2G note
2013-09-17 08:04:07 +02:00
David Soria Parra
ca75e6f760
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
2013-09-16 23:36:48 +02:00
David Soria Parra
3d6ac70e66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
2013-09-16 23:36:37 +02:00
Christopher Jones
b740bfc741
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Michael Wallner (3) and others
# Via Michael Wallner (2) and Xinchen Hui (2)
* 'master' of https://git.php.net/repository/php-src :
use 65k of data to get a more explicit result
double test timeout for travis
this test is fragile on travis, let's see why
Add test for ISSUE #128
Fixed bug #65665 (Exception not properly caught when opcache enabled)
Save a TSRMLS_FETCH() for zval_ptr_dtor in executor
2013-09-16 10:21:31 -07:00
Christopher Jones
e06a712c90
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Xinchen Hui (2) and Michael Wallner (1)
# Via Michael Wallner
* 'PHP-5.5' of https://git.php.net/repository/php-src :
double test timeout for travis
Add test for ISSUE #128
Fixed bug #65665 (Exception not properly caught when opcache enabled)
2013-09-16 10:21:22 -07:00
David Soria Parra
6a0b90da84
NEWS for #60577
2013-09-16 16:23:29 +02:00
David Soria Parra
1939d9e3db
NEWS for bug #64441
2013-09-16 16:21:35 +02:00
Christopher Jones
699b43ff87
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
use 65k of data to get a more explicit result
double test timeout for travis
this test is fragile on travis, let's see why
Add test for ISSUE #128
Fixed bug #65665 (Exception not properly caught when opcache enabled)
Save a TSRMLS_FETCH() for zval_ptr_dtor in executor
2013-09-16 05:40:44 -07:00
Michael Wallner
ca3d5d06e4
use 65k of data to get a more explicit result
2013-09-16 10:50:02 +02:00
Michael Wallner
6dff371a35
Merge branch 'PHP-5.5'
...
* PHP-5.5:
double test timeout for travis
2013-09-16 09:35:29 +02:00
Michael Wallner
b5283b9b7a
double test timeout for travis
2013-09-16 09:35:08 +02:00
Michael Wallner
52bd9f05ea
this test is fragile on travis, let's see why
2013-09-16 09:29:42 +02:00
Xinchen Hui
743c680545
Merge branch 'PHP-5.5'
2013-09-16 15:03:09 +08:00
Xinchen Hui
1916aaa272
Add test for ISSUE #128
2013-09-16 14:58:18 +08:00
Xinchen Hui
e53e79c701
Merge branch 'PHP-5.5'
2013-09-16 14:43:13 +08:00
Xinchen Hui
46f18ccf0d
Fixed bug #65665 (Exception not properly caught when opcache enabled)
2013-09-16 14:43:01 +08:00
Alex Bobrov
18b54a2366
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
...
(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)
2013-09-16 05:23:52 +02:00
Levi Morrison
8a936e8eb9
EmptyIterator now implements Countable; fixes bug 60577
...
(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)
2013-09-16 04:04:53 +02:00
David Soria Parra
c0afe829e3
News for bugfix #64157
2013-09-16 04:04:51 +02:00
Boro Sitnikovski
a475b2c1db
Bug 64157
...
Changed error message to make sense
2013-09-16 03:42:49 +02:00
Nikita Popov
bdfa03d79d
Save a TSRMLS_FETCH() for zval_ptr_dtor in executor
...
This gives me about 9% improvement on Zend/bench.php for a zts build.
2013-09-14 23:02:26 +02:00
Christopher Jones
f71167e252
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix intl build
2013-09-13 16:46:20 -07:00
Christopher Jones
c4df19187a
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src :
Fix intl build
2013-09-13 16:44:10 -07:00
Nikita Popov
8748e146b9
Fix intl build
2013-09-14 01:37:09 +02:00
Christopher Jones
81b5a06fd6
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Remove some more unnecessary macros from phar
Remove PHAR_(Z)STR* usages
Remove version checks in phar
2013-09-13 16:21:28 -07:00
Christopher Jones
e03a3d55d8
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Nikita Popov (10) and others
# Via Nikita Popov (6) and others
* 'master' of https://git.php.net/repository/php-src: (26 commits)
Remove some more unnecessary macros from phar
Remove PHAR_(Z)STR* usages
Remove version checks in phar
Fix two warnings
Provide more macros for handling of interned strings
Make use of Z_*VAL and ZVAL_* in language scanner
Make consistent use of Z_*VAL macros in compiler
fix broken sha2 configure tests
fix broken sha2 configure tests
Small cleanup in class name resolution of compiler
Fixed minor bug in test.
Move NEWS entries to correct version
Fix bug #64782 : SplFileObject constructor make $context optional
Prepare pdo_firebird for a pecl release also
Fix bug #65502 : DateTimeImmutable::createFromFormat returns DateTime
Fix bug #65548 : Comparison for DateTimeImmutable doesn't work
Sort the NEWS file alphabetically.
Request non-keep-alive connections by default in HTTP 1.1 requests.
Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
Tinker with the wording of the short_open_tag description.
...
2013-09-13 14:10:58 -07:00
Christopher Jones
d52dbd569f
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Adam Harvey (3) and others
# Via Adam Harvey (2) and Michael Wallner (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src :
fix broken sha2 configure tests
Fixed minor bug in test.
Move NEWS entries to correct version
Fix bug #64782 : SplFileObject constructor make $context optional
Fix bug #65502 : DateTimeImmutable::createFromFormat returns DateTime
Fix bug #65548 : Comparison for DateTimeImmutable doesn't work
Tinker with the wording of the short_open_tag description.
Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
Handle CLI server request headers case insensitively.
ensure that the defined interpolation method is used by the generic scaling functions
Fixed issue #128 (opcache_invalidate segmentation fault)
5.4.21 now
2013-09-13 14:10:53 -07:00
Christopher Jones
7bb8cbcdee
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Adam Harvey
# Via Adam Harvey
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Tinker with the wording of the short_open_tag description.
Handle CLI server request headers case insensitively.
2013-09-13 14:10:50 -07:00
Nikita Popov
db6d93feca
Remove some more unnecessary macros from phar
2013-09-13 21:49:09 +02:00
Nikita Popov
e6b228332f
Remove PHAR_(Z)STR* usages
2013-09-13 21:49:09 +02:00
Nikita Popov
39bd738fbf
Remove version checks in phar
...
No need to keep around compatability code for PHP 5.0 and PHP 6.
2013-09-13 21:47:59 +02:00
Christopher Jones
3a8f0b1077
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix two warnings
Provide more macros for handling of interned strings
Make use of Z_*VAL and ZVAL_* in language scanner
Make consistent use of Z_*VAL macros in compiler
2013-09-13 11:20:38 -07:00
Nikita Popov
91a9569d85
Fix two warnings
2013-09-13 20:01:23 +02:00
Nikita Popov
96b1c2145c
Provide more macros for handling of interned strings
...
* str_erealloc behaves like erealloc for normal strings, but will
use emalloc+memcpy for interned strings.
* str_estrndup behaves like estrndup for normal strings, but will
not copy interned strings.
* str_strndup behaves like zend_strndup for normal strings, but
will not copy interned strings.
* str_efree_rel behaves like efree_rel for normal strings, but
will not free interned strings.
* str_hash will return INTERNED_HASH for interned strings and
compute it using zend_hash_func for normal strings.
2013-09-13 19:42:10 +02:00
Nikita Popov
d2950ac279
Make use of Z_*VAL and ZVAL_* in language scanner
2013-09-13 15:08:01 +02:00
Nikita Popov
00799319f9
Make consistent use of Z_*VAL macros in compiler
2013-09-13 15:07:47 +02:00
Christopher Jones
e75171ec8a
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
fix broken sha2 configure tests
fix broken sha2 configure tests
Small cleanup in class name resolution of compiler
Fixed minor bug in test.
Move NEWS entries to correct version
2013-09-13 05:40:48 -07:00
Michael Wallner
da30202d55
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix broken sha2 configure tests
2013-09-13 12:59:45 +02:00
Michael Wallner
2e692b22e9
fix broken sha2 configure tests
...
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
2013-09-13 12:56:38 +02:00
Michael Wallner
9eaffd34c1
fix broken sha2 configure tests
...
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
2013-09-13 12:56:26 +02:00
Nikita Popov
ef9e003b0c
Small cleanup in class name resolution of compiler
...
* The fetch_type and check_ns_name parameters of
zend_resolve_class_name were unused and are now removed.
* ZEND_FETCH_CLASS_GLOBAL is no longer used (no code actually
checking for it).
* The checks for usage of "namespace" as class name were
unnecessary as that situation can't occur anyways.
2013-09-13 12:18:39 +02:00
Nikita Popov
5350b9957a
Merge branch 'PHP-5.5'
2013-09-12 23:30:40 +02:00
Levi Morrison
d76959a3b9
Fixed minor bug in test.
2013-09-12 23:29:52 +02:00
Nikita Popov
70cd85b6ec
Merge branch 'PHP-5.5'
2013-09-12 18:25:49 +02:00
Nikita Popov
506a61549f
Move NEWS entries to correct version
...
Accidentially inserted NEWS entries in previous release.
2013-09-12 18:24:58 +02:00
Christopher Jones
d59db90d37
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix bug #64782 : SplFileObject constructor make $context optional
Prepare pdo_firebird for a pecl release also
Fix bug #65502 : DateTimeImmutable::createFromFormat returns DateTime
Fix bug #65548 : Comparison for DateTimeImmutable doesn't work
2013-09-12 08:57:33 -07:00
Nikita Popov
64ee0cde5d
Merge branch 'PHP-5.5'
2013-09-12 17:49:28 +02:00
Nikita Popov
ad976d8240
Fix bug #64782 : SplFileObject constructor make $context optional
2013-09-12 17:46:14 +02:00
Popa Adrian Marius
074385cb33
Prepare pdo_firebird for a pecl release also
2013-09-12 17:47:05 +03:00
Nikita Popov
89d115264c
Merge branch 'PHP-5.5'
2013-09-12 15:23:11 +02:00
Boro Sitnikovski
165f544ae9
Fix bug #65502 : DateTimeImmutable::createFromFormat returns DateTime
...
DateTimeImmutable::createFromFormat should call
date_create_immutable_from_format instead of date_create_from_format
2013-09-12 15:21:45 +02:00
Nikita Popov
32437b945a
Merge branch 'PHP-5.5'
2013-09-12 15:15:17 +02:00
Boro Sitnikovski
d7f5f1ef35
Fix bug #65548 : Comparison for DateTimeImmutable doesn't work
2013-09-12 15:12:16 +02:00
Christopher Jones
c10d8a4b1e
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Sort the NEWS file alphabetically.
Request non-keep-alive connections by default in HTTP 1.1 requests.
2013-09-12 05:40:59 -07:00
Adam Harvey
59e2ce9ff1
Sort the NEWS file alphabetically.
...
Insert OCD otter meme here.
2013-09-11 14:37:07 -07:00
Adam Harvey
8983a38d51
Request non-keep-alive connections by default in HTTP 1.1 requests.
...
As noted in FR #65634 , at present we don't send a Connection request header
when the protocol version is set to 1.1, which means that RFC-compliant Web
servers should respond with keep-alive connections. Since there's no way of
reusing the HTTP connection at present, this simply means that PHP will appear
to hang until the remote server hits its connection timeout, which may be quite
some time.
This commit sends a "Connection: close" header by default when HTTP 1.1 (or
later) is requested by the user via the context options. It can be overridden
by specifying a Connection header in the context options. It isn't possible to
disable sending of the Connection header, but given "Connection: keep-alive" is
the same as the default HTTP 1.1 behaviour, I don't see this as a significant
issue — users who want to opt in for that still can.
As a note, although I've removed an efree(protocol_version), this doesn't
result in a memory leak: protocol_version is freed in the out: block at the end
of the function anyway, and there are no returns between the removed efree()
and the later call. Yes, I ran the tests with valgrind to check that. ☺
Implements FR #65634 (HTTP wrapper is very slow with protocol_version 1.1).
2013-09-11 14:11:29 -07:00
Christopher Jones
f34e9fcd5f
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
2013-09-11 05:41:00 -07:00
Adam Harvey
fba290c061
Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
...
Newer versions of libcurl prevent file:// location response headers by default,
which means that the open_basedir check is unnecessary — the fact
CURLOPT_REDIR_PROTOCOLS can't set CURLPROTO_FILE with open_basedir enabled
means that there's no possibility of breaching the open_basedir restriction,
and this allows HTTP redirects to be followed automatically.
Implements FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir or
safe_mode).
2013-09-10 11:42:42 -07:00
Christopher Jones
97f9a677b8
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Tinker with the wording of the short_open_tag description.
Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
Handle CLI server request headers case insensitively.
5.4.21 now
2013-09-10 05:41:01 -07:00
Michael Wallner
71bee63fad
remove unused code
2013-09-10 13:16:24 +02:00
Michael Wallner
832e2d0d8c
tests
2013-09-10 13:14:02 +02:00
Michael Wallner
449d4c0b1c
make reading php://input JIT if enable_post_data_reading=0
2013-09-10 13:13:33 +02:00
Michael Wallner
e3e4d1b144
revert stream cast
2013-09-10 13:13:09 +02:00
Adam Harvey
b8beb657ca
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Tinker with the wording of the short_open_tag description.
Conflicts:
php.ini-development
php.ini-production
2013-09-09 16:59:26 -07:00
Adam Harvey
d209c362d2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Tinker with the wording of the short_open_tag description.
2013-09-09 16:58:35 -07:00
Adam Harvey
160cd8d0a7
Tinker with the wording of the short_open_tag description.
...
I'm still not thrilled with this, but it's a bit better and addresses the
issues noted in bug #65644 . Plus, it now mentions the decoupling of <?=.
2013-09-09 16:56:57 -07:00
Adam Harvey
2240f9531b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
2013-09-09 16:46:45 -07:00
Adam Harvey
144f2f1773
Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
2013-09-09 16:46:14 -07:00
Adam Harvey
1ff81965c5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Handle CLI server request headers case insensitively.
5.4.21 now
2013-09-09 16:33:43 -07:00
Adam Harvey
8b6270271e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Handle CLI server request headers case insensitively.
5.4.21 now
Conflicts:
configure.in
main/php_version.h
2013-09-09 16:32:16 -07:00
Adam Harvey
3c3b2b5bdc
Handle CLI server request headers case insensitively.
...
Fixes bug #65633 (built-in server treat some http headers as case-sensitive).
2013-09-09 16:24:49 -07:00
Christopher Jones
3ce8b70220
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
ensure that the defined interpolation method is used by the generic scaling functions
Fixed issue #128 (opcache_invalidate segmentation fault)
5.5.5 now
2013-09-09 05:43:28 -07:00
unknown
d32194172a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ensure that the defined interpolation method is used by the generic scaling functions
2013-09-09 11:56:58 +02:00
unknown
b54b6e30a4
ensure that the defined interpolation method is used by the generic scaling functions
2013-09-09 11:56:05 +02:00
Dmitry Stogov
df711f2c56
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #128 (opcache_invalidate segmentation fault)
2013-09-09 10:11:43 +04:00
Dmitry Stogov
2f4bc9d4af
Merge commit 'fc9d886f6cd7858bc38c0b564a547dfa2bb743c6'
...
* commit 'fc9d886f6cd7858bc38c0b564a547dfa2bb743c6':
5.5.5 now
2013-09-09 10:11:20 +04:00
Dmitry Stogov
8d860c1218
Fixed issue #128 (opcache_invalidate segmentation fault)
2013-09-09 10:05:59 +04:00
Dylan Arnold
a911fbc80a
Call php_module_shutdown() for php-fpm child processes
2013-09-09 13:06:38 +12:00
Christopher Jones
ac519eaef2
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Remove obsolete flag
Update DTrace probes
Add test for oci_set_* error changes
Make oci_set_*($connection,...) errors retrievable via oci_error($connection). Improve some error handling to produce error text on some rare edge cases. Disambiguate the Oracle library function call return status values from ORA error numbers. Review and unify error data types.
2013-09-06 11:05:13 -07:00
Christopher Jones
e5678c9b95
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
2013-09-06 11:05:08 -07:00
Christopher Jones
43289d664c
Remove obsolete flag
2013-09-06 10:12:16 -07:00
Christopher Jones
ca4d122adc
Update DTrace probes
2013-09-06 08:54:19 -07:00
Christopher Jones
e504ed66a8
Add test for oci_set_* error changes
2013-09-06 08:14:18 -07:00
Christopher Jones
4b778faa80
Make oci_set_*($connection,...) errors retrievable via oci_error($connection).
...
Improve some error handling to produce error text on some rare edge cases.
Disambiguate the Oracle library function call return status values from ORA error numbers.
Review and unify error data types.
2013-09-05 18:18:29 -07:00
Christopher Jones
768c776d30
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Julien Pauli
# Via Julien Pauli
* 'PHP-5.5' of https://git.php.net/repository/php-src :
5.5.5 now
2013-09-05 10:49:21 -07:00
Manuel Mausz
7dbb1bba64
fix failing tests
2013-09-05 09:32:12 +02:00
Manuel Mausz
0be6ecb862
fix indention
2013-09-05 01:19:00 +02:00
Manuel Mausz
8ca43527e8
Add support for CryptoPro S-box for GOST
...
This adds a new hash identifier "gost-crypto" which uses the CryptoPro
S-box tables as specified by RFC 4357, section 11.2.
2013-09-05 01:04:25 +02:00
Christopher Jones
fc9d886f6c
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
5.5.5 now
2013-09-04 05:40:24 -07:00
Julien Pauli
0e10f26e27
5.5.5 now
2013-09-04 11:22:23 +02:00
Christopher Jones
6ece550394
Cast time_t since some "dtrace -G" invocations fail on time_t arguments
2013-09-03 15:17:36 -07:00
Stanislav Malyshev
7beef74a82
5.4.21 now
2013-09-03 13:38:15 -07:00
Christopher Jones
8a0ae67dd9
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Update NEWS/UPGRADING with info about incompat ctx
2013-09-03 05:40:49 -07:00
Tim Strehle
5ffaf95d3f
run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736)
2013-09-03 14:40:43 +02:00
Gustavo André dos Santos Lopes
04fcf6a98b
Update NEWS/UPGRADING with info about incompat ctx
2013-09-02 23:19:53 +02:00
Christopher Jones
d532ffae42
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Typo....
Add a XFAIL test for #64896
Implement phase 1 of rfc/incompat_ctx
Make use of direct returns in some places
Always pass return_value_ptr to internal functions
2013-09-02 05:40:51 -07:00
Christopher Jones
2452e7b680
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Typo....
Add a XFAIL test for #64896
2013-09-02 05:40:40 -07:00
Xinchen Hui
825c1f239b
Merge branch 'PHP-5.5'
2013-09-02 16:16:15 +08:00
Xinchen Hui
b2ee1b629e
Merge branch 'PHP-5.4' into PHP-5.5
2013-09-02 16:16:07 +08:00
Xinchen Hui
6c48c6bc78
Typo....
2013-09-02 16:15:52 +08:00
Xinchen Hui
f33bdf68b1
Merge branch 'PHP-5.5'
2013-09-02 16:03:10 +08:00
Xinchen Hui
dd1cbd140b
Merge branch 'PHP-5.4' into PHP-5.5
2013-09-02 16:02:59 +08:00
Xinchen Hui
ed038d2ee3
Add a XFAIL test for #64896
2013-09-02 16:02:24 +08:00
Gustavo André dos Santos Lopes
d515455589
Implement phase 1 of rfc/incompat_ctx
...
Just changing the error level of the message from E_STRICT to
E_DEPRECATED. This comes one version later than the timeline
mentioned in the RFC.
Oddly, there were no tests for this ‘feature’. I added a simple
one.
2013-09-02 01:53:06 +02:00
Nikita Popov
47ee470992
Make use of direct returns in some places
2013-08-31 13:16:50 +02:00
Nikita Popov
0856714576
Always pass return_value_ptr to internal functions
...
Previous some places passed return_value_ptr only if the function
returned by reference. Now return_value_ptr is always set, even
for functions returning by-value.
This allows you to return zvals without copying their contents. For
this purpose two new macros RETVAL_ZVAL_FAST and RETURN_ZVAL_FAST
are added:
RETVAL_ZVAL_FAST(zv); /* Analog to RETVAL_ZVAL(zv, 1, 0) */
RETURN_ZVAL_FAST(zv); /* Analog to RETURN_ZVAL(zv, 1, 0) */
These macros behave similarly to the non-FAST versions with
copy=1 and dtor=0, with the difference that the FAST versions
will try return the zval without copying by utilizing return_value_ptr.
2013-08-31 13:16:41 +02:00
Christopher Jones
d7ffca590b
Allow OCI8 to be DTrace-enabled independently of core PHP's DTrace
...
status. The proviso is OCI8 must be built "shared" when DTrace is
enabled. This implementation (i) works around an incomplete core PHP
solution for extension tracing (ii) avoid any issues with DOF section
location and the complexities of needing to merge all provider .d
files for static builds (iii) allows OCI8 to be DTrace-enabled when
doing PECL installs of OCI8 on PHP versions without core PHP DTrace
support.
This is an initial patch i.e. it will undergo further testing.
2013-08-30 17:37:44 -07:00
Christopher Jones
82da51bbce
OCI8: remove unused ext/oci8/config.m4 macro
2013-08-30 11:15:56 -07:00
Christopher Jones
e6053acd78
OCI8 whitespace: remove tabs embedded in code
2013-08-30 11:14:20 -07:00
Anthony Ferrara
612e77e5c9
Fix issue with global fallback not in global space
2013-08-30 11:55:43 -04:00
Anthony Ferrara
d7e3aca9c9
Fix issue with global fallback when not in global space
2013-08-30 11:53:57 -04:00
Christopher Jones
faddd409a4
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Update NEWS
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
Remove ini dependency in test
2013-08-30 05:40:44 -07:00
Christopher Jones
c8b0da6ef7
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Update NEWS
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
2013-08-30 05:40:30 -07:00
Christopher Jones
bfb1fe10cb
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
2013-08-30 05:40:24 -07:00
Remi Collet
9e17094cf4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
2013-08-30 10:46:06 +02:00
Remi Collet
6fab1caa41
Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
2013-08-30 10:45:33 +02:00
Remi Collet
a5749eb0cb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
2013-08-30 10:43:12 +02:00
Remi Collet
d69513afec
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
2013-08-30 10:42:08 +02:00
Xinchen Hui
a607a08e09
Merge branch 'PHP-5.5'
2013-08-30 11:23:24 +08:00
Xinchen Hui
4e3de606b5
Update NEWS
2013-08-30 11:22:58 +08:00
Xinchen Hui
e4fe53e200
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-30 11:20:46 +08:00
Xinchen Hui
7da6498342
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
2013-08-30 11:20:24 +08:00
Yasuo Ohgaki
09ed50fa44
Remove ini dependency in test
2013-08-30 11:46:16 +09:00
Igor Wiedler
e14a769c56
Add test for conditional function declaration
2013-08-29 17:16:18 +02:00
Christopher Jones
598466e6d3
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed compatibility with php-5.2
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
2013-08-29 05:40:31 -07:00
Christopher Jones
a4ff610e1c
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed compatibility with php-5.2
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
2013-08-29 05:40:27 -07:00
Christopher Jones
5bff1286b6
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
2013-08-29 05:40:23 -07:00
Dmitry Stogov
ec173433da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
Conflicts:
NEWS
2013-08-29 11:57:19 +04:00
Dmitry Stogov
5015c4af6c
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
2013-08-29 11:56:01 +04:00
Dmitry Stogov
462f2167ae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Conflicts:
NEWS
2013-08-29 11:20:12 +04:00
Dmitry Stogov
0f3977bc0f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Conflicts:
NEWS
2013-08-29 11:19:02 +04:00
Dmitry Stogov
dfc6feb6e8
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
2013-08-29 11:16:56 +04:00
Dmitry Stogov
15694f66b2
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
2013-08-29 11:12:06 +04:00
Dmitry Stogov
c8673b64ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compatibility with php-5.2
2013-08-29 10:45:00 +04:00
Dmitry Stogov
94816ed9bf
Fixed compatibility with php-5.2
2013-08-29 10:44:07 +04:00
Dmitry Stogov
632f733ce4
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
2013-08-29 10:32:21 +04:00
Dmitry Stogov
6ff7dd05bf
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
2013-08-29 10:31:50 +04:00
Dmitry Stogov
b6864d978c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
Conflicts:
NEWS
2013-08-29 10:31:14 +04:00
Dmitry Stogov
790db9ff9b
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
2013-08-29 10:29:48 +04:00
Xinchen Hui
0ea00936be
Merge branch 'PHP-5.5'
2013-08-29 14:02:53 +08:00
Xinchen Hui
e356d790cc
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-29 14:02:34 +08:00
Xinchen Hui
747daa5354
Avoid compiler warning
2013-08-29 14:02:15 +08:00
Xinchen Hui
f0cb67402f
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-29 14:01:54 +08:00
Adam Harvey
72027cd084
Fix bug #65579 (Using traits with get_class_methods causes segfault).
...
Specifically, this checks if there are trait aliases defined in the class scope
before attempting to dereference the first trait alias. This handles the case
where a trait alias was used in a child trait but no aliases exist in the
concrete class.
2013-08-28 20:33:42 -07:00
Christopher Jones
6d66d613f6
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
removed the /Wp64 switch as we use true 64 bit compiler now
updated lib versions
updated lib versions, the vc11 ones only matter now
2013-08-28 11:14:51 -07:00
Christopher Jones
3697584e05
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
removed the /Wp64 switch as we use true 64 bit compiler now
updated lib versions
updated lib versions, the vc11 ones only matter now
2013-08-28 11:14:37 -07:00
Christopher Jones
1fdcc705a4
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
updated lib versions
2013-08-28 11:14:29 -07:00
Anatol Belski
82bb2a2535
Merge branch 'PHP-5.5'
...
* PHP-5.5:
removed the /Wp64 switch as we use true 64 bit compiler now
2013-08-28 15:10:42 +02:00
Anatol Belski
bd677b43a7
removed the /Wp64 switch as we use true 64 bit compiler now
2013-08-28 15:10:05 +02:00
Anatol Belski
29fa735dfc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated lib versions
2013-08-28 14:43:53 +02:00
Anatol Belski
5a525bc823
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated lib versions
2013-08-28 14:43:36 +02:00
Anatol Belski
3745bdadc0
updated lib versions
2013-08-28 14:43:00 +02:00
Anatol Belski
8cc1ee8c81
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated lib versions, the vc11 ones only matter now
2013-08-28 14:30:03 +02:00
Anatol Belski
51016262a7
updated lib versions, the vc11 ones only matter now
2013-08-28 14:25:39 +02:00
Christopher Jones
49cd21e71c
OCI8 2.0: add oci8-check-connection probe and do some renaming
2013-08-27 16:41:02 -07:00
Michael Wallner
d4b673a34c
fix ZTS build
2013-08-27 14:01:59 +02:00
Michael Wallner
bb1f9d3826
slim post data
2013-08-27 13:43:22 +02:00
Michael Wallner
2438490add
slim post data
2013-08-27 13:31:35 +02:00
Xinchen Hui
72f80b2997
Merge branch 'PHP-5.5'
2013-08-27 15:45:27 +08:00
Xinchen Hui
0119bbba6b
Fixed compiler warnings
...
warning: 'local_dval' may be used uninitialized in this function
[-Wmaybe-uninitialized]
warning: 'dval2' may be used uninitialized in this function
[-Wmaybe-uninitialized]
2013-08-27 15:44:30 +08:00
Christopher Jones
4b67c781f3
Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the probe name.
2013-08-26 15:42:57 -07:00
Christopher Jones
493ad87027
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Evaluate ZVAL_ZVAL arguments only once
2013-08-26 14:36:22 -07:00
Christopher Jones
8aca4e45bb
Leave it to DTrace FBT to trace underlying library calls
2013-08-26 14:20:58 -07:00
Nikita Popov
d18b969858
Evaluate ZVAL_ZVAL arguments only once
...
Also remove some isref/refcount assignments, which are no longer
necessary (as ZVAL_COPY_VALUE is used now).
2013-08-26 19:57:14 +02:00
Dmitry Stogov
a13c00cd14
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilation warning
2013-08-26 09:49:22 +04:00
Dmitry Stogov
1c67a9940a
Fixed compilation warning
2013-08-26 09:48:10 +04:00
Stanislav Malyshev
7c08ce243c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
2013-08-25 15:14:36 -07:00
Stanislav Malyshev
825a505494
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
2013-08-25 15:14:17 -07:00
gron1987
e6424d89e9
Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
2013-08-25 15:09:29 -07:00
Igor Wiedler
6263f221ff
Handle case sensivity of constants (nikic)
2013-08-25 16:21:51 +02:00
Igor Wiedler
28fa0896df
Comment nitpick (nikic)
2013-08-25 15:09:19 +02:00
Igor Wiedler
84c8aa3691
self and parent are valid function and const names (nikic)
2013-08-25 15:08:26 +02:00
Igor Wiedler
bc473228c8
Adjust some test names, remove obsolete and duplicate tests (nikic)
2013-08-25 14:03:07 +02:00
Stanislav Malyshev
60854d1d26
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix mysql tests & mark nextRowset problematic tests
fix mysql init
add openssl
add mysql settings
2013-08-25 00:30:00 -07:00
Stanislav Malyshev
e045cbaa14
Merge branch 'fix_travis' into PHP-5.5
...
* fix_travis:
fix mysql tests & mark nextRowset problematic tests
fix mysql init
add openssl
add mysql settings
2013-08-25 00:29:33 -07:00
Stanislav Malyshev
a2d8ae9a1f
fix mysql tests & mark nextRowset problematic tests
2013-08-24 23:56:48 -07:00
Stanislav Malyshev
a84bb6bf86
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:39:13 -07:00
Stanislav Malyshev
01c028a475
Merge branch 'pull-request/322'
...
* pull-request/322:
Remove semicolon
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:39:09 -07:00
Stanislav Malyshev
c0bfccafd2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:54 -07:00
Alexander Moskalev
b378b0b081
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:33 -07:00
Stanislav Malyshev
cbc848a555
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:45:26 -07:00
Stanislav Malyshev
26cd3425ee
Merge branch 'pull-request/419'
...
* pull-request/419:
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:45:21 -07:00
Stanislav Malyshev
a89e71397d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:45:14 -07:00
root
e22c139fe0
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:44:50 -07:00
Stanislav Malyshev
603098d73d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Stricter libc-client symlink check
2013-08-24 21:41:03 -07:00
Stanislav Malyshev
286c745d81
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Stricter libc-client symlink check
2013-08-24 21:40:52 -07:00
Stanislav Malyshev
fa26576932
Merge branch 'pull-request/417'
...
* pull-request/417:
Stricter libc-client symlink check
2013-08-24 21:40:38 -07:00
Ole Markus With
6b8dade6dc
Stricter libc-client symlink check
2013-08-24 21:40:26 -07:00
Stanislav Malyshev
524fab3e41
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Expose fputcsv's escape_char to userland
2013-08-24 20:46:03 -07:00
Joey Smith
2139d2702d
Expose fputcsv's escape_char to userland
...
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
2013-08-24 20:45:14 -07:00
Stanislav Malyshev
3e4f862076
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
Update NEWS
2013-08-24 19:50:11 -07:00
Stanislav Malyshev
8ee126f0bb
Merge branch 'pull-request/414'
...
* pull-request/414:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:49:59 -07:00
Stanislav Malyshev
bdccf0a61d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
Update NEWS
2013-08-24 19:49:27 -07:00
Michael M Slusarz
3f9af558e7
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:45:54 -07:00
Stanislav Malyshev
817eebc733
fix mysql init
2013-08-24 19:39:00 -07:00
Stanislav Malyshev
f57a722c85
add openssl
2013-08-24 19:38:46 -07:00
Stanislav Malyshev
f31d6bc0d9
add mysql settings
2013-08-24 19:38:30 -07:00
Igor Wiedler
115c5ec726
Compile error on const definition conflicting with import
2013-08-25 00:05:55 +02:00
Igor Wiedler
85d4cfb00d
Disallow using functions/consts defined in the same file
...
* Keep track of defined function and const filenames
* Prohibit use function foo if function foo exists
* Prohibit use const foo if const foo exists
2013-08-25 00:02:46 +02:00
Igor Wiedler
30f16c3540
Compile error on function definition conflicting with import
2013-08-23 23:39:42 +02:00
Igor Wiedler
5b18530e8c
Add test cases for conflicting use and definition in same ns (stas)
2013-08-23 23:31:17 +02:00
Anatol Belski
07fa043cc3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Suppress static analyzer warnings in specialized executor
Update NEWS
2013-08-23 17:45:45 +02:00
Anatol Belski
716fc80fda
Suppress static analyzer warnings in specialized executor
...
As things like if(0) will be removed by the compiler, no need
to see that tons of warnings with static analyzer enabled.
2013-08-23 17:41:07 +02:00
Christopher Jones
38f9c515cd
Update NEWS
2013-08-23 08:18:33 -07:00
Christopher Jones
768c34e7cd
Update NEWS
2013-08-23 08:13:59 -07:00
Anatol Belski
77303a3248
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ensure the test doesn't fail because of tz warning
2013-08-23 16:41:02 +02:00
Anatol Belski
a2b1546f3b
ensure the test doesn't fail because of tz warning
2013-08-23 16:40:28 +02:00
Nikita Popov
c0856a178f
Merge branch 'PHP-5.5'
2013-08-23 13:30:46 +02:00
Nikita Popov
686402a865
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-23 13:28:59 +02:00
Christopher Jones
5ab6d215fc
Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases
2013-08-23 13:27:42 +02:00
root
a4de9c0397
Test extension xmlrpc encode type double and string decode type string and int
2013-08-23 01:06:58 +00:00
Christopher Jones
27954a8b8a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
2013-08-22 09:07:07 -07:00
Christopher Jones
c1ecdfbf6e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
2013-08-22 09:06:43 -07:00
Christopher Jones
7109f369e8
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-22 09:05:52 -07:00
Christopher Jones
18282f42c5
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
...
This reverts commit f38bd22ed2 .
2013-08-22 08:58:35 -07:00
Christopher Jones
f2ceb4963e
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
...
This reverts commit f38bd22ed2 .
2013-08-22 08:58:24 -07:00
Christopher Jones
a61f5bf925
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
...
This reverts commit f38bd22ed2 .
2013-08-22 08:57:18 -07:00
Igor Wiedler
31d77053a1
More test cases for conflicting aliases
2013-08-22 15:51:26 +02:00
Danack
6b385ebc85
Removed assumption that \\ will be present
...
The function zend_add_ns_func_name_literal is called if the parser finds a function that is not in the global or current namespace. It assumes such a function will have a \\ in it, which is no longer true with the use function patch. The code change above removes that assumption and makes the test work:
PASS use and use function with the same alias [Zend/tests/use_function/conflicting_use_alias.phpt]
2013-08-22 15:51:26 +02:00
Igor Wiedler
2dbbb8ae4b
Add test case for conflicting use and use function alias (stas)
2013-08-22 15:51:26 +02:00
Igor Wiedler
4adf49eeaf
Import namespaced constants via new 'use const' sequence
2013-08-22 15:51:26 +02:00
Igor Wiedler
e1125a6a89
Correctly distinguish between functions and constants
...
So far 'use function' applied to both constants and functions. This
patch correctly separates the two.
2013-08-22 15:51:26 +02:00
Igor Wiedler
5dd41627be
Add new 'use function' sequence for importing namespaced functions
...
This is specified as the use_function RFC:
* https://wiki.php.net/rfc/use_function
2013-08-22 15:51:25 +02:00
Matteo Beccati
80917e5ca2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed other compiler warnings
2013-08-22 15:34:22 +02:00
Matteo Beccati
908da14bd1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed other compiler warnings
2013-08-22 15:34:11 +02:00
Matteo Beccati
d5987478a8
Fixed other compiler warnings
2013-08-22 15:33:54 +02:00
Nikita Popov
926987bdc7
Merge branch 'PHP-5.5'
2013-08-22 14:07:32 +02:00
Nikita Popov
c0d99fd76a
Apply pgsql notice test fixes to PHP-5.5
2013-08-22 14:02:55 +02:00
Nikita Popov
1a88fcc2d8
Remove trailing whitespace in test
...
Third try to make this work...
2013-08-22 13:09:53 +02:00
Nikita Popov
96045e1b33
Forgot newline in test
2013-08-22 12:26:34 +02:00
Nikita Popov
647059abc7
Merge branch 'PHP-5.5'
2013-08-22 11:47:55 +02:00
Nikita Popov
592677d810
Fix intl build
...
Turns out that you can't use implicit void pointer casts if intl
is compiled.
2013-08-22 11:46:51 +02:00
Nikita Popov
b668a26c2f
Fix pgsql notice test failure
2013-08-22 11:31:56 +02:00
Christopher Jones
e212320a0c
Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases
2013-08-22 11:23:07 +02:00
Nikita Popov
4db494a3ab
Merge branch 'PHP-5.5'
2013-08-22 11:01:19 +02:00
Nikita Popov
fc16b92313
Fix bug #46311 : Pointer aliasing issue results in miscompile on gcc4.4
...
The code violated the strict aliasing restriction, because it
dereferenced the same pointer as zval** once and as void**
afterwards. Now both occurances dereference void** and cast to
zval* in the former case.
2013-08-22 10:56:50 +02:00
Ole Markus With
e3619778c9
Stricter libc-client symlink check
2013-08-22 08:59:33 +02:00
Christopher Jones
9507fcfdc5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:43:33 -07:00
Christopher Jones
11087eece7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:43:19 -07:00
Christopher Jones
54d4a28003
Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:39:14 -07:00
Christopher Jones
1af111dd68
Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:37:02 -07:00
Christopher Jones
0b60f32247
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:23:50 -07:00
Christopher Jones
d2a2e949fe
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:23:48 -07:00
Christopher Jones
d0bede2efa
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:23:48 -07:00
Christopher Jones
71ba571e53
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:07:13 -07:00
Christopher Jones
9895e8bbe6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:07:03 -07:00
Christopher Jones
f38bd22ed2
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:06:23 -07:00
Christopher Jones
d9bfe06194
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce compilation noise during normal compilation: php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’ php-5.5/ext/session/session.c:836: warning: unused variable ‘num_key’ php-5.5/ext/session/session.c:836: warning: unused variable ‘key_length’ php-5.5/ext/session/session.c:836: warning: unused variable ‘key’ php-5.5/ext/session/session.c:835: warning: unused variable ‘key_type’ php-5.5/ext/session/session.c:834: warning: unused variable ‘_ht’ php-5.5/ext/session/session.c:857: warning: unused variable ‘has_value’ php-5.5/ext/session/session.c:856: warning: unused variable ‘namelen’ php-5.5/ext/session/session.c:853: warning: unused variable ‘name’ php-5.5/ext/session/session.c:852: warning: unused variable ‘p’
2013-08-21 10:35:07 -07:00
Christopher Jones
d85827fb7f
Reduce compilation noise during normal compilation:
...
php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’
php-5.5/ext/session/session.c:836: warning: unused variable ‘num_key’
php-5.5/ext/session/session.c:836: warning: unused variable ‘key_length’
php-5.5/ext/session/session.c:836: warning: unused variable ‘key’
php-5.5/ext/session/session.c:835: warning: unused variable ‘key_type’
php-5.5/ext/session/session.c:834: warning: unused variable ‘_ht’
php-5.5/ext/session/session.c:857: warning: unused variable ‘has_value’
php-5.5/ext/session/session.c:856: warning: unused variable ‘namelen’
php-5.5/ext/session/session.c:853: warning: unused variable ‘name’
php-5.5/ext/session/session.c:852: warning: unused variable ‘p’
php-5.5/ext/session/mod_user.c:191: warning: unused variable ‘ret’
2013-08-21 10:34:09 -07:00
Michael Wallner
4abee3730f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:29 +02:00
Michael Wallner
6181948592
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:11 +02:00
Michael Wallner
d8023d13eb
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:17:22 +02:00
Anthony Ferrara
90b489f826
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix return types of password API helper functions.
2013-08-21 12:11:10 -04:00
Anthony Ferrara
83e3466898
Fix return types of password API helper functions.
...
This fixes issues that were found during static analysis by cjones where failure was impossible to detect due to return type mangling (casting an int to a char, then comparing to an int).
2013-08-21 12:10:40 -04:00
Matteo Beccati
3ec28b1d1f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compiler warnings in ext/pgsql
Fixed other compiler warnings in PDO_PGSQL
Fixed compiler warning
Update NEWS
Conflicts:
ext/pdo_pgsql/pgsql_driver.c
2013-08-21 11:26:41 +02:00
Matteo Beccati
4283f75c34
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed compiler warnings in ext/pgsql
Fixed other compiler warnings in PDO_PGSQL
Fixed compiler warning
2013-08-21 11:24:27 +02:00
Matteo Beccati
540f325664
Fixed compiler warnings in ext/pgsql
2013-08-21 11:24:12 +02:00
Matteo Beccati
696852f2bd
Fixed other compiler warnings in PDO_PGSQL
2013-08-21 11:22:33 +02:00
Matteo Beccati
5c06e5c2e0
Fixed compiler warning
...
I moved the constant to the enum in order to avoid this:
ext/pgsql/pgsql.c:3491: warning: comparison is always false due to limited range of data type
Works in gcc 4.6, but I'm not sure about other compilers.
2013-08-21 11:22:32 +02:00
Yasuo Ohgaki
7be3c74339
Update NEWS
2013-08-21 11:19:06 +09:00
Yasuo Ohgaki
aaf95aa1b6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add php_serialize session.serialize_handler. This patch closes
2013-08-21 11:06:11 +09:00
Yasuo Ohgaki
c51f77fe83
Add php_serialize session.serialize_handler. This patch closes
...
Request #25630
Request #43980
Request #54383
Bug #65359
and many others similar to these that are closed as "wont fix" or
"not a bug".
Current serializers have limitations due to register_globals support
that are no longer supported. Changing existing serializer may cause
compatibility issue. Therefore, new handler is needed to remove
needless limitations.
php_serialize does not have special characters and allow numerical
index in $_SESSION. $_SESSION can be used as ordinary array.
2013-08-21 10:51:51 +09:00
Yasuo Ohgaki
7318b857aa
Update NEWS
2013-08-21 10:38:59 +09:00
Yasuo Ohgaki
d2a99a7c31
Fixed Bug #65475
2013-08-21 08:12:11 +09:00
Yasuo Ohgaki
1641158644
Fixed Bug #65475
2013-08-21 08:11:59 +09:00
Christopher Jones
89c4abab2b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Quash compile warning "warning: 'flags' may be used uninitialized in this function"
2013-08-20 13:37:22 -07:00
Christopher Jones
268c2884fa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Quash compile warning "warning: 'flags' may be used uninitialized in this function"
2013-08-20 13:37:02 -07:00
Christopher Jones
e9b12bedc3
Quash compile warning "warning: 'flags' may be used uninitialized in this function"
2013-08-20 13:36:18 -07:00
Christopher Jones
92b946bb9e
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 11:27:01 -07:00
Christopher Jones
9e1e0096d1
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 11:26:57 -07:00
Christopher Jones
9c9fee3f43
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 11:26:49 -07:00
Christopher Jones
77f5caae53
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove compilation warning "warning: no newline at end of file"
2013-08-20 11:04:51 -07:00
Christopher Jones
433225a929
Remove compilation warning "warning: no newline at end of file"
2013-08-20 11:04:26 -07:00
Christopher Jones
4883fc5365
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove compilation warnings: "warning: no newline at end of file"
2013-08-20 11:03:26 -07:00
Christopher Jones
ec3f8d2b1f
Remove compilation warnings: "warning: no newline at end of file"
2013-08-20 11:01:20 -07:00
Christopher Jones
8457636240
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix compile warning "intl_cppshims.h:34:7: warning: no newline at end of file"
2013-08-20 10:55:16 -07:00
Christopher Jones
dfb187752e
Fix compile warning "intl_cppshims.h:34:7: warning: no newline at end of file"
2013-08-20 10:55:10 -07:00
Christopher Jones
0e56277d35
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Tabify
Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
2013-08-20 10:47:00 -07:00
Christopher Jones
db0166af2f
Tabify
2013-08-20 10:46:15 -07:00
Christopher Jones
0ab8475db2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
2013-08-20 10:42:20 -07:00
Christopher Jones
d82f9339fe
Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
2013-08-20 10:41:29 -07:00
Christopher Jones
eba85f91d8
Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
2013-08-20 10:41:01 -07:00
Christopher Jones
8d614dcf54
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove some compilation warnings: 'unused variable' and 'enumeration value not handled in switch'
2013-08-20 10:34:47 -07:00
Christopher Jones
7160adf4ad
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove some compilation warnings: 'unused variable' and 'enumeration value not handled in switch'
2013-08-20 10:34:13 -07:00
Christopher Jones
b455ba971c
Remove some compilation warnings:
...
'unused variable' and
'enumeration value not handled in switch'
2013-08-20 10:33:00 -07:00
Michael Wallner
90218e8e7a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 19:22:31 +02:00
Michael Wallner
7f3e7eb958
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64953 (Postgres prepared statement positional parameter casting)
Conflicts:
ext/pdo/pdo_sql_parser.c
2013-08-20 19:21:53 +02:00
Michael Wallner
27c803aaed
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 19:19:02 +02:00
Christopher Jones
96d435f9ae
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
split the glob() test to test different basedir
Add session.use_strict_mode description to php.ini-*
Revert wrong description
bump version
Fixed test bug
Update NEWS
2013-08-20 05:40:48 -07:00
Christopher Jones
f32c0efc8f
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Add session.use_strict_mode description to php.ini-*
bump version
Update NEWS
2013-08-20 05:40:22 -07:00
Christopher Jones
72d1ec883e
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
bump version
2013-08-20 05:40:19 -07:00
Anatol Belski
827100df82
split the glob() test to test different basedir
2013-08-20 13:40:19 +02:00
Yasuo Ohgaki
8da7aa7e41
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add session.use_strict_mode description to php.ini-*
2013-08-20 18:30:46 +09:00
Yasuo Ohgaki
4cd9796be7
Add session.use_strict_mode description to php.ini-*
2013-08-20 18:30:30 +09:00
Yasuo Ohgaki
9789df7764
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
bump version
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
new for fix #65225
Fixed #65225 : PHP_BINARY incorrectly set
Use pkg-config to detect iodbc
Add -P option to use the current binary
Create test to the extension xmlrpc
Fixbug: phpize --clean will delete include/*.h
2013-08-20 17:48:47 +09:00
Yasuo Ohgaki
36122c74a2
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src: (27 commits)
bump version
Remove compile warning: warning: unused variable ‘j’ [-Wunused-variable]
Remove compile warnings: warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable] warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
Remove compile warnings: variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable] unused variable ‘last’ [-Wunused-variable] unused variable ‘j’ [-Wunused-variable]
Remove compile warning "variable ‘mekeylen’ set but not used"
Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Update NEWS
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
Use in preg_replace_callback() using variables by reference and test for bug #64979
https://bugs.php.net/bug.php?id=64979
add CVE-2011-4718
...
2013-08-20 17:48:24 +09:00
Yasuo Ohgaki
117bd0848a
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src: (37 commits)
Revert wrong description
bump version
Fixed test bug
Remove compile warning: warning: unused variable ‘j’ [-Wunused-variable]
Remove compile warnings: warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable] warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
Remove compile warnings: variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable] unused variable ‘last’ [-Wunused-variable] unused variable ‘j’ [-Wunused-variable]
Remove compile warning "variable ‘mekeylen’ set but not used"
Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Update NEWS
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
fixed glob() edge case on windows, ref bug #47358
modified the new glob() test for master
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
...
2013-08-20 17:46:40 +09:00
Yasuo Ohgaki
fdef0e38f7
Revert wrong description
2013-08-20 17:38:17 +09:00
Michael M Slusarz
5201a2d566
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-20 01:12:12 -06:00
Stanislav Malyshev
a52b8fe117
Merge branch 'PHP-5.5'
...
* PHP-5.5:
bump version
Update NEWS
Conflicts:
configure.in
main/php_version.h
2013-08-20 00:03:29 -07:00
Stanislav Malyshev
53d9643431
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
bump version
Update NEWS
Conflicts:
configure.in
main/php_version.h
2013-08-19 23:23:21 -07:00
Stanislav Malyshev
d487f5e9ac
bump version
2013-08-19 23:19:51 -07:00
Yasuo Ohgaki
7d538cf8dd
Fixed test bug
2013-08-20 14:25:12 +09:00
Christopher Jones
902c3025ed
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Remove compile warning: warning: unused variable ‘j’ [-Wunused-variable]
Remove compile warnings: warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable] warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
Remove compile warnings: variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable] unused variable ‘last’ [-Wunused-variable] unused variable ‘j’ [-Wunused-variable]
Remove compile warning "variable ‘mekeylen’ set but not used"
Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Update NEWS
2013-08-19 18:26:59 -07:00
Christopher Jones
ee7f6e7d0d
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Remove compile warning: warning: unused variable ‘j’ [-Wunused-variable]
Remove compile warnings: warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable] warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
Remove compile warnings: variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable] unused variable ‘last’ [-Wunused-variable] unused variable ‘j’ [-Wunused-variable]
Remove compile warning "variable ‘mekeylen’ set but not used"
Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-19 18:26:58 -07:00
Christopher Jones
24288eb4d1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove compile warning:
warning: unused variable ‘j’ [-Wunused-variable]
2013-08-19 17:58:53 -07:00
Christopher Jones
1a00b9bd26
Remove compile warning:
...
warning: unused variable ‘j’ [-Wunused-variable]
2013-08-19 17:58:42 -07:00
Christopher Jones
682c28c1f8
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 17:55:27 -07:00
Christopher Jones
33ff441996
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 17:55:26 -07:00
Christopher Jones
dc384a571d
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 17:55:25 -07:00
Christopher Jones
5697aa5728
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove compile warnings:
warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
Remove compile warnings:
variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
unused variable ‘last’ [-Wunused-variable]
unused variable ‘j’ [-Wunused-variable]
Remove compile warning "variable ‘mekeylen’ set but not used"
2013-08-19 17:51:04 -07:00
Christopher Jones
83469477e7
Remove compile warnings:
...
warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
2013-08-19 17:48:46 -07:00
Christopher Jones
f69a5c520f
Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
2013-08-19 17:46:50 -07:00
Christopher Jones
cf7f50748a
Remove compile warnings:
...
variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
unused variable ‘last’ [-Wunused-variable]
unused variable ‘j’ [-Wunused-variable]
2013-08-19 17:44:36 -07:00
Christopher Jones
279b4fe614
Remove compile warning "variable ‘mekeylen’ set but not used"
2013-08-19 17:40:15 -07:00
Christopher Jones
19476f51f2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Update NEWS
2013-08-19 17:18:28 -07:00
Christopher Jones
d5979c88ea
Reduce (some more) compile noise of 'unused variable' and 'may be used
...
uninitialized' warnings.
2013-08-19 17:17:54 -07:00
Christopher Jones
4ee1ec4bcf
Update NEWS
2013-08-19 17:14:38 -07:00
Christopher Jones
c60067c09a
Update NEWS
2013-08-19 17:14:15 -07:00
Michael Wallner
73cd2e0ab1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65481 (shutdown segfault due to serialize)
2013-08-20 00:09:26 +02:00
Michael Wallner
9d2cdacf4a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #65481 (shutdown segfault due to serialize)
Conflicts:
ext/standard/var_unserializer.c
2013-08-20 00:08:55 +02:00
Michael Wallner
1ac4d8f2c6
fix bug #65481 (shutdown segfault due to serialize)
2013-08-20 00:05:11 +02:00
Adam Harvey
2a46fc0470
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Track created curl_slist structs by option so they can be updated in situ.
Conflicts:
ext/curl/interface.c
2013-08-19 12:19:13 -07:00
Adam Harvey
69f12ad582
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Track created curl_slist structs by option so they can be updated in situ.
Conflicts:
ext/curl/interface.c
2013-08-19 12:16:36 -07:00
Adam Harvey
aa7d3d8e6d
Track created curl_slist structs by option so they can be updated in situ.
...
At present, when curl_setopt() is called with an option that requires the
creation of a curl_slist, we simply push the new curl_slist onto a list to be
freed when the curl handle is freed. This avoids a memory leak, but means that
repeated calls to curl_setopt() on the same handle with the same option wastes
previously allocated memory on curl_slist structs that will no longer be read.
This commit changes the zend_llist that was previously used to track the lists
to a HashTable keyed by the option number, which means that we can simply
update the hash table each time curl_setopt() is called.
Fixes bug #65458 (curl memory leak).
2013-08-19 12:01:04 -07:00
Stanislav Malyshev
d17ade127b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 11:19:43 -07:00
Stanislav Malyshev
d2c78c9e20
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 11:19:11 -07:00
Stanislav Malyshev
d0beb7daf9
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
added new glob() test
2013-08-19 11:18:57 -07:00
Xinchen Hui
a4862503d4
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 11:18:51 -07:00
Christopher Jones
bd7d7a2ba2
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src: (22 commits)
fixed glob() edge case on windows, ref bug #47358
modified the new glob() test for master
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
Use in preg_replace_callback() using variables by reference and test for bug #64979
https://bugs.php.net/bug.php?id=64979
add CVE-2011-4718
new for fix #65225
Fixed #65225 : PHP_BINARY incorrectly set
Use pkg-config to detect iodbc
Add -P option to use the current binary
Create test to the extension xmlrpc
Fixbug: phpize --clean will delete include/*.h
code related typo fixes
Create test to the extension xmlrpc
Revise pgsql tests
Use pkg-config to detect iodbc
Fix duplicated 5.5.2 NEWS in my tree
...
2013-08-19 10:53:59 -07:00
Christopher Jones
ca57ce5132
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
Use in preg_replace_callback() using variables by reference and test for bug #64979
https://bugs.php.net/bug.php?id=64979
add CVE-2011-4718
new for fix #65225
Fixed #65225 : PHP_BINARY incorrectly set
Use pkg-config to detect iodbc
Add -P option to use the current binary
Create test to the extension xmlrpc
Fixbug: phpize --clean will delete include/*.h
code related typo fixes
2013-08-19 10:53:47 -07:00
Christopher Jones
32873cd0dd
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
...
* 'PHP-5.3' of https://git.php.net/repository/php-src :
fix using wrong buffer pointer
2013-08-19 10:53:41 -07:00
Christopher Jones
71c24f4c2e
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
new for fix #65225
Fixed #65225 : PHP_BINARY incorrectly set
Use pkg-config to detect iodbc
Add -P option to use the current binary
Create test to the extension xmlrpc
Fixbug: phpize --clean will delete include/*.h
2013-08-19 10:53:41 -07:00
Stanislav Malyshev
4ea9729cd0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 10:53:08 -07:00
Xinchen Hui
7a79cf0206
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 10:42:47 -07:00
Anatol Belski
f4df40108b
fixed glob() edge case on windows, ref bug #47358
2013-08-19 14:21:16 +02:00
Anatol Belski
f61b648da4
modified the new glob() test for master
2013-08-19 11:22:18 +02:00
Anatol Belski
6c570ad322
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added new glob() test
2013-08-19 11:21:47 +02:00
Anatol Belski
cdc64f0345
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added new glob() test
2013-08-19 11:19:42 +02:00
Anatol Belski
4bad49e3bc
added new glob() test
2013-08-19 11:17:13 +02:00
Stanislav Malyshev
cfe5833579
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix using wrong buffer pointer
2013-08-19 01:07:50 -07:00
Stanislav Malyshev
8e0f110099
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix using wrong buffer pointer
2013-08-19 01:04:19 -07:00
Stanislav Malyshev
cf96aa155e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix using wrong buffer pointer
2013-08-19 01:03:18 -07:00
Stanislav Malyshev
c1c49d6e39
fix using wrong buffer pointer
2013-08-19 01:02:12 -07:00
Stanislav Malyshev
ecd67ed3e5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
2013-08-18 17:24:16 -07:00
Stanislav Malyshev
bcf785fb66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
2013-08-18 17:23:59 -07:00
Stanislav Malyshev
14f5732096
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
2013-08-18 17:22:25 -07:00
Stanislav Malyshev
12c2a8a5eb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix for php bug #64802 includes test case
2013-08-18 16:55:03 -07:00
Stanislav Malyshev
bd29ff7c38
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix for php bug #64802 includes test case
Conflicts:
ext/openssl/openssl.c
2013-08-18 15:45:17 -07:00
Mark Jones
9973658a44
Fix for php bug #64802 includes test case
2013-08-18 15:42:37 -07:00
Stanislav Malyshev
42214b6474
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use in preg_replace_callback() using variables by reference and test for bug #64979
https://bugs.php.net/bug.php?id=64979
2013-08-18 15:19:27 -07:00
Marcel Araujo
265224778b
Use in preg_replace_callback() using variables by reference and test for bug #64979
2013-08-18 15:18:30 -07:00
Marcel Araujo
47678c06c6
https://bugs.php.net/bug.php?id=64979
2013-08-18 15:09:43 -07:00
Stanislav Malyshev
33e9c02451
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add CVE-2011-4718
2013-08-18 14:42:59 -07:00
Stanislav Malyshev
b33a1a1397
add CVE-2011-4718
2013-08-18 14:42:06 -07:00
Stanislav Malyshev
4bc6e06037
Merge branch 'PHP-5.5'
...
* PHP-5.5:
new for fix #65225
Fixed #65225 : PHP_BINARY incorrectly set
2013-08-18 14:21:24 -07:00
Stanislav Malyshev
bf0c6f2858
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
new for fix #65225
Fixed #65225 : PHP_BINARY incorrectly set
2013-08-18 14:21:14 -07:00
Stanislav Malyshev
4fbce676bd
Merge branch 'pull-request/381'
...
* pull-request/381:
Fixed #65225 : PHP_BINARY incorrectly set
2013-08-18 14:20:46 -07:00
Stanislav Malyshev
0154db1c5f
new for fix #65225
2013-08-18 14:20:17 -07:00
Patrick Allaert
98d29d20a1
Fixed #65225 : PHP_BINARY incorrectly set
2013-08-18 14:18:33 -07:00
Stanislav Malyshev
756ce65b92
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use pkg-config to detect iodbc
2013-08-18 14:16:34 -07:00
Stanislav Malyshev
1794291ebe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use pkg-config to detect iodbc
2013-08-18 14:16:24 -07:00
Ole Markus With
a3fa25e857
Use pkg-config to detect iodbc
2013-08-18 14:16:17 -07:00
Stanislav Malyshev
8845262995
Merge branch 'pull-request/411'
...
* pull-request/411:
Use pkg-config to detect iodbc
2013-08-18 14:15:53 -07:00
Stanislav Malyshev
958ee39fc7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add -P option to use the current binary
Create test to the extension xmlrpc
2013-08-18 14:11:15 -07:00
Stanislav Malyshev
2ee7e122a7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add -P option to use the current binary
Create test to the extension xmlrpc
2013-08-18 14:09:19 -07:00
Stanislav Malyshev
f4da131328
Merge branch 'pull-request/412'
...
* pull-request/412:
Create test to the extension xmlrpc
2013-08-18 14:08:57 -07:00
Stanislav Malyshev
3da2fb335d
Add -P option to use the current binary
2013-08-18 14:08:03 -07:00
root
ac2d2b9b72
Create test to the extension xmlrpc
2013-08-18 13:59:39 -07:00
Stanislav Malyshev
5786e779fb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixbug: phpize --clean will delete include/*.h
2013-08-18 13:52:49 -07:00
Stanislav Malyshev
296a434d52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixbug: phpize --clean will delete include/*.h
2013-08-18 13:52:38 -07:00
Tianfeng
4a0e87e497
Fixbug: phpize --clean will delete include/*.h
2013-08-18 13:52:20 -07:00
Stanislav Malyshev
625152591b
Merge branch 'pull-request/405'
...
* pull-request/405:
Fixbug: phpize --clean will delete include/*.h
2013-08-18 13:50:33 -07:00
Stanislav Malyshev
03b2603ce0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
code related typo fixes
Fix duplicated 5.5.2 NEWS in my tree
2013-08-18 13:47:00 -07:00
Veres Lajos
144eab0889
code related typo fixes
2013-08-18 13:46:32 -07:00
root
acda3dab6c
Create test to the extension xmlrpc
2013-08-18 18:44:52 +00:00
Yasuo Ohgaki
e960eebfea
Revise pgsql tests
2013-08-18 18:24:34 +09:00
Yasuo Ohgaki
b6c14af3f7
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src: (22 commits)
fix typo
merge news for 5.5.2
Update NEWS
Update NEWS
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
fix cve number
New news section
Prepare news for PHP-5.5.2
Remove unused variable
Reduce compiler noise by removing unused variables and labels
Fixed #65431 in zend_exception.c by Sixd
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Skip test if SKIP_ONLINE_TESTS set
Fix to file uploads >2G with size overflow
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
Fix unused variable warning in OCI8 2.0
removed unused vars
fixed strndup usage in the pgsql ext
...
2013-08-18 12:30:25 +09:00
Yasuo Ohgaki
83e251a055
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src: (30 commits)
Fix duplicated 5.5.2 NEWS in my tree
fix typo
merge news for 5.5.2
Update NEWS
Update NEWS
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
fix cve number
New news section
Prepare news for PHP-5.5.2
Reduce compiler noise by removing unused variables and labels
Fixed #65431 in zend_exception.c by Sixd
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Skip test if SKIP_ONLINE_TESTS set
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
removed unused vars
fixed strndup usage in the pgsql ext
use mysqlnd, some tests fail otherwise
ensure notices are not ignored when tests need them
...
2013-08-18 12:29:36 +09:00
Ole Markus With
7e7a8f00c4
Use pkg-config to detect iodbc
2013-08-17 14:22:11 +02:00
Christopher Jones
803045e3c7
Fix duplicated 5.5.2 NEWS in my tree
2013-08-16 12:03:01 -07:00
Christopher Jones
0c4ba514be
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
fix typo
merge news for 5.5.2
2013-08-16 11:39:37 -07:00
Christopher Jones
a6f596f90f
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
fix typo
merge news for 5.5.2
2013-08-16 11:39:07 -07:00
Stanislav Malyshev
a42e87dadb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix typo
2013-08-16 11:34:27 -07:00
Stanislav Malyshev
466584f40b
fix typo
2013-08-16 11:34:16 -07:00
Stanislav Malyshev
94cd406b1e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
merge news for 5.5.2
2013-08-16 11:31:39 -07:00
Stanislav Malyshev
4734b31953
merge news for 5.5.2
2013-08-16 11:30:54 -07:00
Christopher Jones
c04d1406e9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update NEWS
Update NEWS
2013-08-16 11:16:27 -07:00
Christopher Jones
60c8d814e7
Update NEWS
2013-08-16 11:16:06 -07:00
Christopher Jones
7237c317d6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
2013-08-16 11:13:55 -07:00
Christopher Jones
cb539b3e96
Update NEWS
2013-08-16 11:13:27 -07:00
Christopher Jones
8807726be3
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
fix cve number
2013-08-16 11:10:10 -07:00
Christopher Jones
1eadd15607
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
fix cve number
2013-08-16 11:10:04 -07:00
Christopher Jones
6993ca5bd7
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
fix cve number
2013-08-16 11:07:25 -07:00
Christopher Jones
2251e4369a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
2013-08-16 10:57:55 -07:00
Christopher Jones
4b4ffaf703
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
2013-08-16 10:49:05 -07:00
Christopher Jones
0ebef462ce
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and
...
Linux are now used. DTrace is part of Oracle Linux. See
https://oss.oracle.com/projects/DTrace/
This patch does not change DTrace linking for non-Solaris/Linux
platforms.
For SystemTap users on Linux, this patch removes the compilation
warning:
Warning: Linking the shared library libphp5.la against the
non-libtool objects Zend/zend_dtrace.d.o is not portable!
2013-08-16 10:40:50 -07:00
Stanislav Malyshev
991f0113bf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix cve number
2013-08-16 10:39:15 -07:00
Stanislav Malyshev
5788797964
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix cve number
2013-08-16 10:23:31 -07:00
Stanislav Malyshev
060fadca31
fix cve number
2013-08-16 10:20:32 -07:00
David Soria Parra
30502dbc75
Merge branch 'PHP-5.5'
...
* PHP-5.5:
New news section
Prepare news for PHP-5.5.2
2013-08-15 22:47:28 +02:00
David Soria Parra
e8a4477a48
New news section
2013-08-15 22:41:18 +02:00
David Soria Parra
f12f3abe8e
Prepare news for PHP-5.5.2
2013-08-15 22:40:38 +02:00
Christopher Jones
77dea7898b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
2013-08-14 21:33:35 -07:00
Christopher Jones
82dd6b94f2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
2013-08-14 21:33:27 -07:00
Christopher Jones
de0a602ce1
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fixed #65431 in zend_exception.c by Sixd
2013-08-14 21:32:20 -07:00
Christopher Jones
5a186a3e0a
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed #65431 in zend_exception.c by Sixd
2013-08-14 21:32:13 -07:00
Christopher Jones
ba30c78d5c
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fixed #65431 in zend_exception.c by Sixd
2013-08-14 21:32:07 -07:00
Christopher Jones
ac03b67e6a
Remove unused variable
2013-08-14 21:21:17 -07:00
Christopher Jones
4824d0f43e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce compiler noise by removing unused variables and labels
2013-08-14 21:08:55 -07:00
Christopher Jones
cd14de94d2
Reduce compiler noise by removing unused variables and labels
2013-08-14 21:06:59 -07:00
Xinchen Hui
7d3ec0c3ca
Merge branch 'PHP-5.5'
2013-08-15 11:50:54 +08:00
Xinchen Hui
cb361ed27e
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-15 11:49:59 +08:00
Xinchen Hui
8280393828
Fixed #65431 in zend_exception.c by Sixd
2013-08-15 11:47:44 +08:00
Christopher Jones
3c166c4758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/gmp/gmp.c
2013-08-14 20:47:00 -07:00
Christopher Jones
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
Christopher Jones
759517651e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:47:42 -07:00
Christopher Jones
8c61758dc7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:46 -07:00
Christopher Jones
9d62807190
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:06 -07:00
Anatol Belski
9d4e5b0dba
Fix to file uploads >2G with size overflow
...
Represent the file size as string when the total size would overflow
LONG_MAX. Otherwise while file itself were uploaded, the size would
be shown wrong. This mostly applies to systems with 32 bit long.
2013-08-14 18:59:46 +02:00
Stanislav Malyshev
4da6273092
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:26:32 -07:00
Stanislav Malyshev
2b9f5ac252
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:25:47 -07:00
Stanislav Malyshev
7f69f07fc1
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:24:29 -07:00
Stanislav Malyshev
dcea4ec698
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:24:11 -07:00
Stanislav Malyshev
2874696a5a
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:20:33 -07:00
Xinchen Hui
b6fa0b40f7
Merge branch 'PHP-5.5'
2013-08-14 11:44:53 +08:00
Xinchen Hui
f3d18add08
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-14 11:44:37 +08:00
Xinchen Hui
f4dc2240a0
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
2013-08-14 11:42:39 +08:00
Christopher Jones
f95cd93408
Fix unused variable warning in OCI8 2.0
2013-08-13 15:15:57 -07:00
Michael Wallner
fddc82dd0e
Merge branch 'master' into slim-postdata
...
* master: (62 commits)
removed unused vars
fixed strndup usage in the pgsql ext
Fixes to unified stdint usage
Fixed bug #65382 (Segfault in closure_030.phpt)
Revise pgsql test files
Revise pgsql test for Travis CI
Add 00version.phpt to get server/protocol/client version. Revise test script description
use mysqlnd, some tests fail otherwise
ensure notices are not ignored when tests need them
Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
Adds 2 new xml files which include the dtd path relative to the base directory for the php source code. It fixs the fail on the load of the dtd in the tests modified by this commit.
Adds files: error 1 to 5 and variation 1 to 4
Fix #61345 : fix install of CGI binary
Fix #61345 : fix install of CGI binary
php.ini-development/production: remove php_zip.dll
Update NEWS
Update NEWS
Fixed possible buffer overflow under Windows. Note: Not a security fix.
Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
Implemented Request #20421 (session_abort() and session_reset() function
...
Conflicts:
sapi/cli/tests/upload_2G.phpt
2013-08-13 17:08:01 +02:00
Anatol Belski
c5674bb502
Merge branch 'PHP-5.5'
...
* PHP-5.5:
removed unused vars
2013-08-12 15:53:34 +02:00
Anatol Belski
bab33f7e05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed unused vars
2013-08-12 15:52:50 +02:00
Anatol Belski
72aacbf735
removed unused vars
2013-08-12 15:52:15 +02:00
Anatol Belski
42171b13f4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed strndup usage in the pgsql ext
2013-08-12 15:45:43 +02:00
Anatol Belski
87198989cd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed strndup usage in the pgsql ext
2013-08-12 15:45:26 +02:00
Anatol Belski
4134ebec8e
fixed strndup usage in the pgsql ext
2013-08-12 15:44:47 +02:00
Anatol Belski
acea91b18c
Fixes to unified stdint usage
...
This recalls 14caf174ff
2013-08-12 13:39:17 +02:00
Dmitry Stogov
52dac3e8cd
Fixed bug #65382 (Segfault in closure_030.phpt)
2013-08-12 10:53:20 +04:00
Tianfeng
19312fa8f6
Fixbug: phpize --clean will delete include/*.h
2013-08-12 13:55:23 +08:00
Yasuo Ohgaki
3ada3aaea6
Revise pgsql test files
2013-08-12 05:14:43 +09:00
Yasuo Ohgaki
727318546d
Revise pgsql test for Travis CI
2013-08-11 18:57:39 +09:00
Yasuo Ohgaki
713aedfe65
Add 00version.phpt to get server/protocol/client version. Revise test script description
2013-08-11 18:33:33 +09:00
Stanislav Malyshev
6e92f07926
Merge branch 'PHP-5.5'
...
* PHP-5.5:
use mysqlnd, some tests fail otherwise
2013-08-11 01:37:44 -07:00
Stanislav Malyshev
76fd13f742
use mysqlnd, some tests fail otherwise
2013-08-11 01:36:59 -07:00
Stanislav Malyshev
6c494edfb7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ensure notices are not ignored when tests need them
2013-08-10 23:13:09 -07:00
Stanislav Malyshev
29f1aa2618
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
ensure notices are not ignored when tests need them
2013-08-10 23:12:51 -07:00
Stanislav Malyshev
cf39c3d638
ensure notices are not ignored when tests need them
2013-08-10 23:12:04 -07:00
Stanislav Malyshev
d8a2779456
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
Adds 2 new xml files which include the dtd path relative to the base directory for the php source code. It fixs the fail on the load of the dtd in the tests modified by this commit.
Adds files: error 1 to 5 and variation 1 to 4
2013-08-10 18:03:07 -07:00
Antonio Diaz Ruiz
1a5c460ea2
Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
2013-08-10 18:02:08 -07:00
Antonio Diaz Ruiz
5f5ff92bc0
Adds 2 new xml files which include the dtd path relative to the base directory for the php source code.
...
It fixs the fail on the load of the dtd in the tests modified by this commit.
2013-08-10 18:02:00 -07:00
Antonio Diaz Ruiz
24f36934ad
Adds files: error 1 to 5 and variation 1 to 4
...
tests for error1: not well formed xml
tests for error2: not well formed xml attribute without colon
tests for error2: not well formed xml, typo
tests for error4: wrong xml version
tests for error5: extra content at the end of the doc
tests libxml_dtd_load
tests libxml_dtd_valid
tests for libdtd_noerror
tests for LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT and LIBXML_NOBLANKS
the basic behavior
fix comments
2013-08-10 18:01:54 -07:00
Stanislav Malyshev
3db907b803
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add schema default/fixed value support
2013-08-10 17:56:46 -07:00
Stanislav Malyshev
473d66553d
Merge branch 'pull-request/325' into PHP-5.5
...
* pull-request/325:
Add schema default/fixed value support
2013-08-10 17:56:23 -07:00
Stanislav Malyshev
871e937df7
Merge branch 'pull-request/402'
...
* pull-request/402:
bison upgrading notes
use $YACC instead of 'bison' as suggested by Yasuo
improve comments and messages as suggested
add excluded version exmaple
make the bison version check a blacklist
2013-08-10 17:39:06 -07:00
Stanislav Malyshev
3c349cfa50
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #61345 : fix install of CGI binary
Fix #61345 : fix install of CGI binary
2013-08-10 17:36:17 -07:00
Stanislav Malyshev
6b4971a29b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #61345 : fix install of CGI binary
2013-08-10 17:35:52 -07:00
Michael Heimpold
36b759d1dd
Fix #61345 : fix install of CGI binary
...
When CLI was not built but only CGI binary, then a sequence of
$ ./buildconf
$ ./configure --prefix=/usr/local/phpcgi --disable-cli
$ make -j8
$ sudo rm -rf /usr/local/phpcgi
$ sudo make install
results in the following error:
/bin/bash /srv/smb/php-src.test/libtool --silent --preserve-dup-deps --mode=install cp ext/opcache/opcache.la /srv/smb/php-src.test/modules
Installing shared extensions: /usr/local/phpcgi/lib/php/extensions/no-debug-non-zts-20121212/
Installing PHP CGI binary: /usr/local/phpcgi/bin/
cp: cannot create regular file `/usr/local/phpcgi/bin/#INST@28245#': No such file or directory
make: *** [install-cgi] Fehler 1
The solution is to create the binary directory before copying the
CGI binary as e.g. CLI does.
Signed-off-by: Oliver Metz <oliver.metz@gmx.de >
[extensive commit message]
Signed-off-by: Michael Heimpold <mhei@heimpold.de >
2013-08-10 17:35:09 -07:00
Stanislav Malyshev
3f99ba6351
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #61345 : fix install of CGI binary
2013-08-10 17:33:28 -07:00
Michael Heimpold
cdedee3fa1
Fix #61345 : fix install of CGI binary
...
When CLI was not built but only CGI binary, then a sequence of
$ ./buildconf
$ ./configure --prefix=/usr/local/phpcgi --disable-cli
$ make -j8
$ sudo rm -rf /usr/local/phpcgi
$ sudo make install
results in the following error:
/bin/bash /srv/smb/php-src.test/libtool --silent --preserve-dup-deps --mode=install cp ext/opcache/opcache.la /srv/smb/php-src.test/modules
Installing shared extensions: /usr/local/phpcgi/lib/php/extensions/no-debug-non-zts-20121212/
Installing PHP CGI binary: /usr/local/phpcgi/bin/
cp: cannot create regular file `/usr/local/phpcgi/bin/#INST@28245#': No such file or directory
make: *** [install-cgi] Fehler 1
The solution is to create the binary directory before copying the
CGI binary as e.g. CLI does.
Signed-off-by: Oliver Metz <oliver.metz@gmx.de >
[extensive commit message]
Signed-off-by: Michael Heimpold <mhei@heimpold.de >
2013-08-10 17:33:24 -07:00
Stanislav Malyshev
0f09b978cc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
php.ini-development/production: remove php_zip.dll
Update NEWS
Update NEWS
2013-08-10 17:31:59 -07:00
Stanislav Malyshev
143ec70638
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
php.ini-development/production: remove php_zip.dll
Update NEWS
2013-08-10 17:31:48 -07:00
Jan Ehrhardt
503d39d925
php.ini-development/production: remove php_zip.dll
...
Remove the reference to php_zip.dll in php.ini-production and
php.ini-development, because php_zip.dll does not exist anymore since
PHP 5.3
2013-08-10 17:31:40 -07:00
Yasuo Ohgaki
ac538e5e16
Update NEWS
2013-08-11 07:15:55 +09:00
Yasuo Ohgaki
bff1a96a0f
Update NEWS
2013-08-11 07:15:01 +09:00
Yasuo Ohgaki
0959475e11
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:44:01 +09:00
Yasuo Ohgaki
2df95b1354
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:43:37 +09:00
Yasuo Ohgaki
0ad81ac18a
Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:43:01 +09:00
Yasuo Ohgaki
771b06f585
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
2013-08-10 18:30:05 +09:00
Yasuo Ohgaki
9d95a1a7d1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
2013-08-10 18:29:29 +09:00
Yasuo Ohgaki
e9b128c1bf
Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
2013-08-10 18:29:13 +09:00
Yasuo Ohgaki
6941ce3583
Implemented Request #20421 (session_abort() and session_reset() function
2013-08-10 16:57:56 +09:00
Yasuo Ohgaki
54a42f0d0c
Implemented Request #11100 (session_gc() function).
2013-08-10 15:20:24 +09:00
Yasuo Ohgaki
f2b5725115
Remove compile warning of commit 554021d21e
2013-08-10 14:35:30 +09:00
Yasuo Ohgaki
554021d21e
Implemented Bug #17860 Suggestion: auto detect whether session changed
2013-08-10 13:56:32 +09:00
Yasuo Ohgaki
678ec30655
Implement Bug #54649 Create session_serializer_name()
2013-08-10 09:26:10 +09:00
Michael Wallner
3419ee9547
bison upgrading notes
2013-08-09 22:23:35 +02:00
Michael Wallner
2d403f0c1d
haha, a bit too optimistic; not merged yet
2013-08-09 21:33:48 +02:00
Michael Wallner
867b6c05e7
add upgrading notes about bison and 2Guploads
2013-08-09 21:16:47 +02:00
Dmitry Stogov
2bc886abed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Replce ZEND_FETCH_* instructions with IS_CV if possible
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2013-08-09 17:52:22 +04:00
Dmitry Stogov
b27f6826d4
Replce ZEND_FETCH_* instructions with IS_CV if possible
2013-08-09 17:47:47 +04:00
Michael Wallner
7c3afd31f9
fix test
2013-08-09 13:30:29 +02:00
Michael Wallner
611122c22e
Merge branch '2Guploads'
...
* 2Guploads:
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
unify stdint type usage
2013-08-09 11:47:25 +02:00
Michael Wallner
5acdcbc0bc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65391
Update NEWS
Update NEWS
Conflicts:
ext/zlib/tests/bug65391.phpt
2013-08-09 11:39:41 +02:00
Michael Wallner
5cea7a9047
fix bug #65391
...
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
2013-08-09 11:25:54 +02:00
Michael Wallner
b33824bfea
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #65391
Update NEWS
2013-08-09 11:21:50 +02:00
Michael Wallner
ac28283beb
fix bug #65391
...
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
2013-08-09 11:14:04 +02:00
Yasuo Ohgaki
b6b425d2cf
Fixed Bug #65315 session.hash_function silently fallback to default md5
2013-08-09 18:05:24 +09:00
Michael Wallner
742a0106fe
use $YACC instead of 'bison' as suggested by Yasuo
2013-08-09 08:32:39 +02:00
Michael Wallner
1e30987a53
improve comments and messages as suggested
2013-08-09 08:31:40 +02:00
Yasuo Ohgaki
22d7002462
Update NEWS
2013-08-09 11:21:54 +09:00
Yasuo Ohgaki
fc7fe62e3b
Update NEWS
2013-08-09 11:19:56 +09:00
Michael Wallner
3903c182da
add excluded version exmaple
2013-08-08 21:45:08 +02:00
Michael Wallner
3e41201a6f
make the bison version check a blacklist
...
Let the bison version be checked by a blacklist (where no version
is blacklisted yet) and require at least bison 2.4
2013-08-08 14:27:32 +02:00
Andrey Hristov
c53b425763
Merge branch 'PHP-5.5'
2013-08-08 14:05:18 +02:00
Andrey Hristov
c9243344a0
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-08 14:05:08 +02:00
Andrey Hristov
a188693a27
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2013-08-08 14:04:19 +02:00
Andrey Hristov
f4f255016a
Merge branch 'PHP-5.5'
2013-08-08 14:03:22 +02:00
Andrey Hristov
d3dae9a616
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-08 14:03:11 +02:00
Andrey Hristov
80fe5461a9
Merge branch 'PHP-5.3' into PHP-5.4
2013-08-08 14:03:00 +02:00
Andrey Hristov
42dbc598dd
Merge branch 'PHP-5.5'
2013-08-08 13:53:08 +02:00
Andrey Hristov
1e2f72d6b6
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-08-08 13:52:09 +02:00
Andrey Hristov
82a7ec72de
add some tracing
2013-08-08 13:51:55 +02:00
Christopher Jones
ae4f8b2ab0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
2013-08-07 13:14:46 -07:00
Christopher Jones
4ed133c4e2
Remove tabs on blanklines in Makefile sources. This prevents a
...
'suspicious line' warning when editing & saving Makefile using Emacs.
2013-08-07 13:14:00 -07:00
Michael Wallner
4a9d7c1f00
add NEWS entry; add simple test
2013-08-06 22:51:58 +02:00
Ralf Lang
8a7ea474a4
more precise condition
2013-08-06 22:51:58 +02:00
Ralf Lang
679fa1fc68
make this work in vc11 too
2013-08-06 22:51:58 +02:00
Ralf Lang
cb4c195f0b
Use int64_t and atoll() after discussion with johannes
2013-08-06 22:51:57 +02:00
Ralf Lang
de3527002a
ws
2013-08-06 22:51:57 +02:00
Ralf Lang
84f9213e00
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files
...
above 2G.
This is essentially the same as the patch
"uploads_larger_than_2g_HEAD_v2 (last revision 2012-03-26 03:59 UTC) by
jason at infininull dot com)" but using off_t instead of signed long
(originally: uint)
I tested this on 64bit linux and succeeded uploading a file of 4.8 G.
The File did not get corrupted or truncated in any way.
I did not yet test this under windows or 32 bit linux
Note that there are still limitations:
* Did not test for files > 8 G
* php does not yet reject absurdly high values
* Still limited by underlying file system specific limits and free space
* in upload
* tmp dir and destination dir
2013-08-06 22:51:57 +02:00
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Christopher Jones
d8344c18a8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
One more './configure --help' alignment fix
2013-08-06 11:23:21 -07:00
Christopher Jones
c932d532c8
One more './configure --help' alignment fix
2013-08-06 11:23:02 -07:00
Christopher Jones
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Christopher Jones
db610ba050
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Christopher Jones (2) and Xinchen Hui (1)
# Via Xinchen Hui
* 'master' of https://git.php.net/repository/php-src :
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
PHP 5.5.2 has already branched
Doh. PHP 5.5 NEWS needs own commit.
2013-08-06 10:01:47 -07:00
Christopher Jones
930183f961
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-06 10:01:43 -07:00
Christopher Jones
2743c3aac8
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-06 10:01:41 -07:00
Xinchen Hui
9b38673776
Merge branch 'PHP-5.5'
2013-08-06 15:39:46 +08:00
Xinchen Hui
aa042d0c35
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-06 15:39:33 +08:00
Xinchen Hui
a831499b4a
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
...
Missed a zval_copy_ctor there
2013-08-06 15:37:20 +08:00
Christopher Jones
6184753fab
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
PHP 5.5.2 has already branched
Doh. PHP 5.5 NEWS needs own commit.
2013-08-05 16:10:06 -07:00
Christopher Jones
6e505f4969
PHP 5.5.2 has already branched
2013-08-05 16:03:22 -07:00
Christopher Jones
4f87f26d06
Doh. PHP 5.5 NEWS needs own commit.
2013-08-05 15:56:46 -07:00
Christopher Jones
0cd77475e0
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Rasmus Lerdorf (6) and others
# Via Christopher Jones (5) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (26 commits)
NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
Enable dtrace probes on linux as they are compatible with systemtap
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
Merge branch 'PHP-5.4'
Merge branch 'PHP-5.5'
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
add news about session fix
First fixes for a 64bit compatible ftp extension
fix compiler warning, use longs for hashes
fix crash, enable session_id and fix test
Strict session. Detect session id collision
Strict session
non living code related typo fixes
fix typo
This doesn't fail in 5.5 anymore
We shouldn't load any local ini files for these tests
pcre_quote? No such thing. How did this ever pass?
This test needs local infile enabled
...
2013-08-05 15:53:00 -07:00
Christopher Jones
ca0497bba2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
Enable dtrace probes on linux as they are compatible with systemtap
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
2013-08-05 15:46:54 -07:00
Christopher Jones
18f17818a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
2013-08-05 15:40:56 -07:00
Christopher Jones
47d66a0b4e
NEWS for recent DTrace merges.
...
Remove redundant 'cp' during DTrace install.
2013-08-05 15:38:36 -07:00
Christopher Jones
6e89818f2f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
Enable dtrace probes on linux as they are compatible with systemtap
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
Conflicts:
Makefile.global
2013-08-05 15:35:46 -07:00
Christopher Jones
3bbe5931bc
Fixed bug #62691 (solaris sed has no -i switch)
...
Make 'make distclean' remove generated DTrace .h file
2013-08-05 15:18:12 -07:00
David Soria Parra
a5c524f1be
Enable dtrace probes on linux as they are compatible with systemtap
...
You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.
2013-08-05 15:07:04 -07:00
Remi Collet
3c5e229212
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
2013-08-05 14:52:12 -07:00
Christopher Jones
8fdf1ad32d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
Merge branch 'PHP-5.4'
2013-08-05 14:28:24 -07:00
Christopher Jones
b90b551228
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
Merge branch 'PHP-5.4'
Conflicts:
ext/mysqlnd/mysqlnd.c
2013-08-05 14:27:54 -07:00
Christopher Jones
85cc3b3240
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'PHP-5.5'
2013-08-05 14:25:43 -07:00
Christopher Jones
ec4019e8f6
Add an empty make command for DTrace .d files to stop an implicit
...
circular dependency in GNU Make which causes .d files to be
overwritten (Bug 61268)
2013-08-05 14:21:06 -07:00
Kalle Sommer Nielsen
cabf38af6d
Merge branch 'PHP-5.4'
2013-08-05 17:23:00 +02:00
Kalle Sommer Nielsen
963c1be38d
Merge branch 'PHP-5.5'
2013-08-05 17:16:05 +02:00
Kalle Sommer Nielsen
85b7e9f046
Check for NULL ptr from get_stream() before passing it on to php_stream_cast()
2013-08-05 16:58:37 +02:00
Michael Wallner
15c351cc52
add NEWS entry; add simple test
2013-08-05 13:53:35 +02:00
Michael Wallner
69aed1b61f
Merge branch 'master' of github.com:/ralflang/php-src
...
merged pull request #372 :
>2G uploads by Ralf Lang
https://github.com/php/php-src/pull/372
2013-08-05 12:02:10 +02:00
Yasuo Ohgaki
8f74384947
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:27:19 +09:00
Yasuo Ohgaki
cb8d1fc7f9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:24:07 +09:00
Yasuo Ohgaki
f718684a6c
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:23:15 +09:00
Stanislav Malyshev
7ca7ea85cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add news about session fix
2013-08-04 20:07:00 -07:00
Stanislav Malyshev
e59143e896
add news about session fix
2013-08-04 20:06:48 -07:00
Stanislav Malyshev
eb20966f75
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add news about session fix
fix crash, enable session_id and fix test
Strict session. Detect session id collision
Strict session
2013-08-04 20:05:17 -07:00
Stanislav Malyshev
169b78eb79
add news about session fix
2013-08-04 20:04:42 -07:00
Stanislav Malyshev
6f73a0c00f
Merge branch 'pr368' into PHP-5.5
...
* pr368:
fix crash, enable session_id and fix test
Strict session. Detect session id collision
Strict session
2013-08-04 20:00:28 -07:00
Stanislav Malyshev
c9c53e0763
Merge branch 'PHP-5.5'
...
* PHP-5.5:
First fixes for a 64bit compatible ftp extension
2013-08-04 19:36:29 -07:00
Stanislav Malyshev
7d3fa7d8b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
First fixes for a 64bit compatible ftp extension
2013-08-04 19:36:01 -07:00
Andreas Streichardt
a93a462dce
First fixes for a 64bit compatible ftp extension
2013-08-04 19:31:30 -07:00
Stanislav Malyshev
f20d28a6b1
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
...
The exists test should has covered this bug
Conflicts:
ext/pdo_dblib/dblib_driver.c
2013-08-04 19:19:37 -07:00
Stanislav Malyshev
1d6a136051
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix compiler warning, use longs for hashes
2013-08-04 18:05:18 -07:00
Stanislav Malyshev
e4f9619fad
fix compiler warning, use longs for hashes
2013-08-04 18:04:45 -07:00
Stanislav Malyshev
b80d73ce15
fix crash, enable session_id and fix test
2013-08-04 17:43:20 -07:00
Yasuo Ohgaki
82b0e8be99
Strict session. Detect session id collision
2013-08-04 16:36:53 -07:00
Yasuo Ohgaki
25e8fcc88f
Strict session
2013-08-04 16:36:45 -07:00
Stanislav Malyshev
68e8326e0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
non living code related typo fixes
2013-08-04 16:07:13 -07:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Stanislav Malyshev
c620a51a32
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix typo
2013-08-04 16:03:02 -07:00
Stanislav Malyshev
3626db6142
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo
2013-08-04 16:02:53 -07:00
Stanislav Malyshev
5f137d080a
fix typo
2013-08-04 16:02:27 -07:00
Rasmus Lerdorf
b48f7e0c79
Merge commit '626d96a'
...
* commit '626d96a':
This doesn't fail in 5.5 anymore
2013-08-03 12:15:28 -04:00
Rasmus Lerdorf
cadbec2fa0
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fix phar phpinfo test after markup changes
2013-08-03 12:15:16 -04:00
Rasmus Lerdorf
626d96ab6d
This doesn't fail in 5.5 anymore
2013-08-03 12:14:47 -04:00
Nikita Popov
43cbec0fa9
Fix phar phpinfo test after markup changes
2013-08-03 16:32:02 +02:00
Rasmus Lerdorf
9fa7e8932d
Merge commit 'a03f094'
...
* commit 'a03f094':
We shouldn't load any local ini files for these tests
2013-08-02 16:23:52 -04:00
Rasmus Lerdorf
f17f596b27
Merge commit 'a03f094' into PHP-5.5
...
* commit 'a03f094':
We shouldn't load any local ini files for these tests
2013-08-02 16:23:44 -04:00
Rasmus Lerdorf
a03f0943ca
We shouldn't load any local ini files for these tests
2013-08-02 16:23:18 -04:00
Rasmus Lerdorf
4e90145932
Merge commit 'd60e168'
...
* commit 'd60e168':
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:13:12 -04:00
Rasmus Lerdorf
d24f31c65e
Merge commit 'd60e168' into PHP-5.5
...
* commit 'd60e168':
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:13:03 -04:00
Rasmus Lerdorf
d60e168a7a
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:12:21 -04:00
Rasmus Lerdorf
c682f2f68a
Merge commit 'ea75b1b'
...
* commit 'ea75b1b':
This test needs local infile enabled
2013-08-02 15:33:49 -04:00
Rasmus Lerdorf
9ca7910661
Merge commit 'ea75b1b' into PHP-5.5
...
* commit 'ea75b1b':
This test needs local infile enabled
2013-08-02 15:33:40 -04:00
Rasmus Lerdorf
ea75b1b5db
This test needs local infile enabled
2013-08-02 15:33:18 -04:00
Rasmus Lerdorf
d69ec93428
Merge commit 'e55f08a'
...
* commit 'e55f08a':
This test will only work if gc is enabled
2013-08-02 12:01:20 -04:00
Rasmus Lerdorf
3d0aca80f2
Merge commit 'e55f08a' into PHP-5.5
...
* commit 'e55f08a':
This test will only work if gc is enabled
2013-08-02 12:01:12 -04:00
Rasmus Lerdorf
e55f08a5ae
This test will only work if gc is enabled
2013-08-02 12:00:48 -04:00
Rasmus Lerdorf
0fce1b4f72
Merge commit '5753b74'
...
* commit '5753b74':
Make sure test.php isn't coming in from the include_path
2013-08-02 11:48:07 -04:00
Rasmus Lerdorf
a85e71e655
Merge commit '5753b74' into PHP-5.5
...
* commit '5753b74':
Make sure test.php isn't coming in from the include_path
2013-08-02 11:47:52 -04:00
Rasmus Lerdorf
5753b74fab
Make sure test.php isn't coming in from the include_path
2013-08-02 11:47:12 -04:00
Michael Wallner
a8bc184207
fix generating config.nice
...
Configure runs like:
$./configure -C CFLAGS="-ggdb" --enable-debug --prefix=$(pwd)/usr
did result in an empty config.nice
* allow single dash flags like -C, -s etc.
* allow passing evnironment variables as arguments
2013-08-02 13:15:55 +02:00
Xinchen Hui
55d335fa95
Merge branch 'PHP-5.5'
2013-08-02 18:43:17 +08:00
Xinchen Hui
47ac4f8670
Fixed tests (inet_pton behaves differently on Darwin)
2013-08-02 18:43:08 +08:00
Xinchen Hui
78673d1bad
Merge branch 'PHP-5.5'
2013-08-02 18:39:58 +08:00
Xinchen Hui
6f1a762fab
Update NEWS
2013-08-02 18:39:41 +08:00
Xinchen Hui
1e942dde24
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-02 18:39:18 +08:00
Xinchen Hui
ce9169e360
Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-02 18:37:15 +08:00
Yasuo Ohgaki
fbd01eaecf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add user contributed test. Bug #61748
2013-08-02 09:54:51 +09:00
Yasuo Ohgaki
1c32b97bc3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add user contributed test. Bug #61748
2013-08-02 09:52:50 +09:00
Yasuo Ohgaki
cb13f8318b
Add user contributed test. Bug #61748
2013-08-02 09:52:08 +09:00
Christopher Jones
48ea95188e
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
Use PHP's major version when cleaning up Apache .module files
Allow 'make distclean' to clean up the 'generated' phar.inc
Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.
2013-08-01 10:39:38 -07:00
Christopher Jones
9cd1ac7b61
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.
2013-08-01 09:22:47 -07:00
Christopher Jones
d884ec15e9
Clean up the 'generated' phar.inc file.
...
When building outside the source tree the copied phar.inc needs to be removed,
but when building in the tree, the file must remain since it is part of the source.
See the copying logic in ext/phar/Makefile.frag.
2013-08-01 09:19:53 -07:00
Christopher Jones
1c91ca990f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
2013-08-01 08:49:19 -07:00
Christopher Jones
146b933ab4
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
...
This reverts commit 017145bc57 .
2013-08-01 08:47:13 -07:00
Christopher Jones
1f6b940dd1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use PHP's major version when cleaning up Apache .module files
Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:36:20 -07:00
Christopher Jones
c069b5f571
Use PHP's major version when cleaning up Apache .module files
2013-07-31 12:35:10 -07:00
Christopher Jones
2ab080da2d
Merge branch 'phardistclean' into PHP-5.5
...
* phardistclean:
Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:34:28 -07:00
Christopher Jones
017145bc57
Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:31:50 -07:00
Christopher Jones
8bff800f6a
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Constify streams API and a few other calls down the rabbit hole. (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.
2013-07-31 12:02:23 -07:00
Christopher Jones
7caea7d182
Clean generated OCI8 DTrace files in 'make distclean'
2013-07-31 12:01:35 -07:00
Christopher Jones
d84fa9731a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.
2013-07-31 11:50:57 -07:00
Christopher Jones
4ed18d5955
Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.
2013-07-31 11:49:29 -07:00
Christopher Jones
3b4d2647f9
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Dmitry Stogov (3) and others
# Via Christopher Jones (6) and Dmitry Stogov (2)
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Fixed bug #65018 (SoapHeader problems with SoapServer)
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Fixed bug #65336
2013-07-31 10:08:50 -07:00
Christopher Jones
f5521a357a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
2013-07-31 10:00:05 -07:00
Christopher Jones
e3a4b87e89
Fixed bug #62691 (solaris sed has no -i switch)
...
Make 'make distclean' remove generated DTrace .h file
2013-07-31 09:58:28 -07:00
Christopher Jones
f3c3aa8a67
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Fixed bug #65018 (SoapHeader problems with SoapServer)
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Fixed php-5.2 support
added test script for bug65045.
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Added support for glob symbols in blacklist entries (?, *, **)
Fixed bug #65336
2013-07-31 09:02:06 -07:00
Christopher Jones
0625d5ce67
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Fixed bug #65018 (SoapHeader problems with SoapServer)
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Fixed php-5.2 support
added test script for bug65045.
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Added support for glob symbols in blacklist entries (?, *, **)
Fixed bug #65336
2013-07-31 09:01:56 -07:00
Christopher Jones
4590070f31
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Fixed bug #65018 (SoapHeader problems with SoapServer)
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 09:01:54 -07:00
Dmitry Stogov
e8b1739949
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
2013-07-31 17:37:27 +04:00
Dmitry Stogov
5129892788
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
2013-07-31 17:37:08 +04:00
Dmitry Stogov
4395f70207
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
2013-07-31 17:36:06 +04:00
Dmitry Stogov
380e5d5d03
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65018 (SoapHeader problems with SoapServer)
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Fixed bug #65336
Conflicts:
NEWS
2013-07-31 16:35:09 +04:00
Dmitry Stogov
35872e101b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65018 (SoapHeader problems with SoapServer)
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Fixed bug #65336
Conflicts:
NEWS
2013-07-31 16:34:26 +04:00
Dmitry Stogov
fd8f454520
Fixed bug #65018 (SoapHeader problems with SoapServer)
2013-07-31 16:32:26 +04:00
Dmitry Stogov
e2a433fc5d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
added test script for bug65045.
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Conflicts:
NEWS
2013-07-31 14:24:30 +04:00
Dmitry Stogov
d69b3d8f59
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
2013-07-31 14:20:56 +04:00
Sara Golemon
2141f394d8
Merge branch 'pull-request/399'
2013-07-31 00:49:30 -07:00
Christopher Jones
f7c87fcc8c
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Dmitry Stogov (5) and Rui Hirokawa (2)
# Via Dmitry Stogov (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed php-5.2 support
added test script for bug65045.
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Added support for glob symbols in blacklist entries (?, *, **)
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
A minor fix for configure outpu (Tony)
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
2013-07-30 16:53:05 -07:00
Rui Hirokawa
0a974f14d1
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 08:46:54 +09:00
Dmitry Stogov
d9e2dc8084
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
added test script for bug65045.
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 03:24:04 +04:00
Dmitry Stogov
a0fece5201
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed php-5.2 support
2013-07-31 03:23:10 +04:00
Dmitry Stogov
f3aca8bc4d
Fixed php-5.2 support
2013-07-31 03:22:34 +04:00
Rui Hirokawa
f14ed5bce0
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-07-31 08:18:51 +09:00
Rui Hirokawa
7da3315015
added test script for bug65045.
2013-07-31 08:18:39 +09:00
Rui Hirokawa
c10d7e1afc
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 08:17:15 +09:00
Dmitry Stogov
2bd23530d8
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
2013-07-31 03:04:48 +04:00
Dmitry Stogov
fa041cb2f0
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
2013-07-31 03:04:22 +04:00
Dmitry Stogov
5338bbbf38
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added support for glob symbols in blacklist entries (?, *, **)
Conflicts:
NEWS
2013-07-31 03:04:00 +04:00
Dmitry Stogov
02409669e4
Added support for glob symbols in blacklist entries (?, *, **)
2013-07-31 03:01:19 +04:00
Christopher Jones
3af80d7df3
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
A minor fix for configure outpu (Tony)
2013-07-30 13:39:29 -07:00
Christopher Jones
8ca04e51aa
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
A minor fix for configure outpu (Tony)
2013-07-30 13:39:20 -07:00
Christopher Jones
6af7526c77
Remove tabs on blanklines in Makefile sources. This prevents a
...
'suspicious line' warning when editing & saving Makefile using Emacs.
2013-07-30 13:36:10 -07:00
Dmitry Stogov
147d5241dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:33:46 +04:00
Dmitry Stogov
cb17c99511
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:31:37 +04:00
Dmitry Stogov
e831041c5a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
A minor fix for configure outpu (Tony)
2013-07-30 22:04:55 +04:00
Dmitry Stogov
e2aba1cf9e
A minor fix for configure outpu (Tony)
2013-07-30 22:03:21 +04:00
Dmitry Stogov
0aa342e903
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Conflicts:
NEWS
2013-07-30 17:36:47 +04:00
Dmitry Stogov
3550f3d0aa
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
2013-07-30 17:35:19 +04:00
Andrey Hristov
92d27ccb05
Constify streams API and a few other calls down the rabbit hole.
...
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
Anatol Belski
5e1ac558c3
make simplexml headers available to the outta world
2013-07-29 22:18:55 +02:00
Christopher Jones
e37fdbb2f2
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Dmitry Stogov
# Via Dmitry Stogov
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Merge from GitHub
2013-07-29 09:43:42 -07:00
Dmitry Stogov
294335761b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge from GitHub
Update NEWS
Fixed bug #65336
Conflicts:
NEWS
2013-07-28 13:50:13 +04:00
Dmitry Stogov
ae5e70afac
Merge from GitHub
2013-07-28 13:47:13 +04:00
Yasuo Ohgaki
d4aee1021e
Fixed bug #65336
2013-07-27 05:55:02 +09:00
Yasuo Ohgaki
bafe0e5399
Update NEWS
2013-07-27 05:54:33 +09:00
Yasuo Ohgaki
ef3d813d2c
Fixed bug #65336
2013-07-27 05:54:33 +09:00
Yasuo Ohgaki
1d7b6970f2
Fixed bug #65336
2013-07-27 05:54:09 +09:00
Christopher Jones
85b66e9e21
OCI8 extension: Allow Implicit Result Set statement resources to inherit the parent's current prefetch count
2013-07-26 13:34:45 -07:00
Christopher Jones
fc410f6ece
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix --enable-maintainer-zts mode in OCI8 2.0
2013-07-26 11:34:21 -07:00
Christopher Jones
586fc4909e
Fix --enable-maintainer-zts mode in OCI8 2.0
2013-07-25 16:15:32 -07:00
Christopher Jones
c67714b782
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Update UPGRADING and make typo fixes to OCI8 package.xml
2013-07-25 10:57:53 -07:00
Christopher Jones
8e79724c6f
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
2013-07-25 10:57:47 -07:00
Christopher Jones
fd616ba50f
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
2013-07-25 10:57:46 -07:00
Christopher Jones
fe98ffc227
Update UPGRADING and make typo fixes to OCI8 package.xml
2013-07-25 10:54:03 -07:00
Christopher Jones
1224e6cccd
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Upper section name
Update NEWs
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 10:42:47 -07:00
Christopher Jones
4cab45946c
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Upper section name
Update NEWs
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 10:42:45 -07:00
Christopher Jones
29b2522df1
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Upper section name
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 10:42:43 -07:00
Christopher Jones
b39f973c63
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Johannes Schlüter (3) and others
# Via Johannes Schlüter (4) and others
* 'master' of https://git.php.net/repository/php-src :
Upper section name
Update NEWs
Fixed bug #65328 (Segfault when getting SplStack object Value)
Initial PHP OCI8 2.0.0-dev commit.
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
fix missing include
Fix bug 65299
Fix compiler warning on redefined constant
Fix comment
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-25 08:53:33 -07:00
Christopher Jones
42e8f3ca28
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Johannes Schlüter (3) and others
# Via Xinchen Hui (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Upper section name
Update NEWs
Fixed bug #65328 (Segfault when getting SplStack object Value)
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
fix missing include
Fix bug 65299
Fix compiler warning on redefined constant
Fix comment
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-25 08:53:29 -07:00
Christopher Jones
979194351d
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Xinchen Hui (2) and others
# Via Stanislav Malyshev (1) and Xinchen Hui (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Upper section name
Fixed bug #65328 (Segfault when getting SplStack object Value)
Fix compiler warning on redefined constant
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-25 08:53:26 -07:00
Xinchen Hui
c49de17fe5
Merge branch 'PHP-5.5'
2013-07-25 22:46:21 +08:00
Xinchen Hui
9776504c5b
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-25 22:45:44 +08:00
Xinchen Hui
515092917d
Upper section name
2013-07-25 22:45:15 +08:00
Xinchen Hui
1fbcfc9bdb
Update NEWs
2013-07-25 22:44:59 +08:00
Xinchen Hui
9126909c08
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-25 22:44:19 +08:00
Xinchen Hui
9909c4d4c4
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 22:43:41 +08:00
Christopher Jones
4a9d0e1579
Merge branch 'oci8_20'
...
* oci8_20:
Initial PHP OCI8 2.0.0-dev commit.
2013-07-24 15:36:57 -07:00
Christopher Jones
bfc3c223da
Initial PHP OCI8 2.0.0-dev commit.
...
Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.
See package.xml for details.
2013-07-24 15:33:22 -07:00
Stanislav Malyshev
86064e0701
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:46:23 -07:00
Stanislav Malyshev
b8c8a04a85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:45:35 -07:00
Stanislav Malyshev
96a53f6715
Merge branch 'bug65028' into PHP-5.4
...
* bug65028:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:44:06 -07:00
Adam Harvey
7fa841c888
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
2013-07-23 11:19:02 -07:00
Adam Harvey
f9000fde98
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
...
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.
Fixes the fix for bug #61697 .
2013-07-23 11:15:43 -07:00
Anatol Belski
678ef6a133
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix missing include
2013-07-23 18:07:16 +02:00
Anatol Belski
f00d796b7e
fix missing include
2013-07-23 18:06:51 +02:00
Johannes Schlüter
416e270835
Merge branch 'PHP-5.5'
2013-07-23 14:14:18 +02:00
Johannes Schlüter
7b92a22772
Fix bug 65299
2013-07-23 14:13:22 +02:00
Johannes Schlüter
6b4742582f
Merge branch 'PHP-5.5'
2013-07-23 13:15:15 +02:00
Johannes Schlüter
5a8b0ca8fa
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-23 12:57:08 +02:00
Johannes Schlüter
c28ab73d73
Fix compiler warning on redefined constant
2013-07-23 12:50:37 +02:00
Johannes Schlüter
004163a914
Merge branch 'PHP-5.5'
2013-07-23 12:42:20 +02:00
Johannes Schlüter
063e10b275
Fix comment
2013-07-23 12:41:24 +02:00
Anatol Belski
94e15ff387
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:24 +02:00
Anatol Belski
8aebe0f1e7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:07 +02:00
Anatol Belski
9b6aa268a3
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 09:59:08 +02:00
Ralf Lang
d80a91018d
more precise condition
2013-07-23 07:39:36 +02:00
Ralf Lang
b07e55fdeb
make this work in vc11 too
2013-07-22 21:26:38 +02:00
Christopher Jones
99f7b72025
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Veres Lajos (15) and others
# Via Stanislav Malyshev (31) and others
* 'master' of https://git.php.net/repository/php-src: (99 commits)
fixed possible null deref
Disable a flag
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Added recursivetreeiterator::setPostfix() method
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
backward compatibility
HASH_KEY_NON_EXISTANT fix
Update NEWS
Fixed bug #65304 (Use of max int in array_sum)
Updaet NEWS
Reorder NEWS
intl: remove extra quotes from arginfo params
updated test script for bug #65045 .
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
...
2013-07-22 10:59:10 -07:00
Christopher Jones
024972e3b9
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Anatol Belski (12) and others
# Via Stanislav Malyshev (12) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (74 commits)
fixed possible null deref
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Added recursivetreeiterator::setPostfix() method
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
backward compatibility
HASH_KEY_NON_EXISTANT fix
Update NEWS
Fixed bug #65304 (Use of max int in array_sum)
Updaet NEWS
Reorder NEWS
intl: remove extra quotes from arginfo params
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Properly fixed bug #63186 on NetBSD == 6.0
...
2013-07-22 10:59:01 -07:00
Christopher Jones
a1bf38e075
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Anatol Belski (8) and others
# Via Anatol Belski (2) and others
* 'PHP-5.4' of https://git.php.net/repository/php-src: (44 commits)
fixed possible null deref
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Fixed bug #65304 (Use of max int in array_sum)
Reorder NEWS
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Properly fixed bug #63186 on NetBSD == 6.0
Improve php.ini-* documentation
5.4.19 is next
Fixed bug #50308 - session id not appended properly for empty anchor tags
Fix bug #62129 - rfc1867 crashes php even though turned off
add news for xml fix
fix TS build
added sapi check for dl() test
Make zval2myslqnd implementations aware of inheritance
Fixed typo ensuring header str is \0 terminated
fix buffer overrun
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
...
2013-07-22 10:58:57 -07:00
Christopher Jones
7c9bb87edd
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
...
# By Johannes Schlüter
# Via Christopher Jones (1) and Johannes Schlüter (1)
* 'PHP-5.3' of https://git.php.net/repository/php-src :
Merge PHP 5.3.27 NEWS
add test for bug #65236
2013-07-22 10:58:52 -07:00
Ralf Lang
a2394df90e
Use int64_t and atoll() after discussion with johannes
2013-07-22 18:03:11 +02:00
Anatol Belski
b966a0bf46
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed possible null deref
2013-07-22 14:51:27 +02:00
Anatol Belski
bd20c79423
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed possible null deref
2013-07-22 14:51:11 +02:00
Anatol Belski
25f924abf6
fixed possible null deref
2013-07-22 14:50:18 +02:00
Andrey Hristov
a48e2bad62
Merge branch 'master' of ssh://git.php.net/php-src
2013-07-22 11:03:10 +02:00
Andrey Hristov
a047ece2e0
Disable a flag
2013-07-22 11:02:48 +02:00
Stanislav Malyshev
f8efdc2b4b
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-22 00:57:33 -07:00
Stanislav Malyshev
4467ada680
Merge branch 'pull-request/326'
...
* pull-request/326:
zend_register_null_constant fixed zend_register_bool_constant usage in macros use REGISTER_MAIN_* in zend_register_standard_constants
zend_API.h included ZVAL_* family in use
use Z_* family macros
zend_register_bool_constant patch
2013-07-21 23:19:33 -07:00
Stanislav Malyshev
8d2651d8fc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
2013-07-21 23:15:03 -07:00
Stanislav Malyshev
b8d4a6939e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
2013-07-21 23:14:42 -07:00
Yoshinari Takaoka
1b4103c09d
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
2013-07-21 23:12:54 -07:00
Stanislav Malyshev
46cc826770
Merge branch 'pull-request/231'
...
* pull-request/231:
update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
fix for scrolling, other minor tweaks
Bump up table width a bit more and make columns consistent
Bringing CSS up to this decade's standards.
2013-07-21 22:49:26 -07:00
Stanislav Malyshev
e68cd521dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
2013-07-21 22:48:03 -07:00
Stanislav Malyshev
83ced9124e
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
2013-07-21 22:47:10 -07:00
Stanislav Malyshev
3cbb48f055
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:31:37 -07:00
Stanislav Malyshev
476924ec3d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:31:19 -07:00
Stanislav Malyshev
ba984582db
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
2013-07-21 22:28:02 -07:00
Andrey
da3886de6d
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:25:21 -07:00
Stanislav Malyshev
10c547018f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added recursivetreeiterator::setPostfix() method
2013-07-21 22:22:02 -07:00
Joshua Thijssen
5027fa79d7
Added recursivetreeiterator::setPostfix() method
2013-07-21 22:20:58 -07:00
Stanislav Malyshev
1a05648e6d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
Conflicts:
configure.in
main/php_version.h
2013-07-21 21:17:59 -07:00
Stanislav Malyshev
2c23004a1e
next is 5.5.2
2013-07-21 21:16:39 -07:00
Veres Lajos
e7a00a2566
add a few comment
2013-07-21 21:14:38 -07:00
Lajos Veres
f51b8d8820
allow both the old and new cfg argument to work. (the old of course should contain the typo)
2013-07-21 21:12:19 -07:00
Veres Lajos
b8941a73cc
mssql.compatability_mode fix
2013-07-21 21:12:16 -07:00
Stanislav Malyshev
02457554a3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
backward compatibility
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:10:31 -07:00
Lajos Veres
97637b2a4c
backward compatibility
2013-07-21 20:09:59 -07:00
Veres Lajos
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
Xinchen Hui
a522f2d1c9
Merge branch 'PHP-5.5'
2013-07-21 21:07:50 +08:00
Xinchen Hui
29281dee49
Update NEWS
2013-07-21 21:07:38 +08:00
Xinchen Hui
c7b58e4967
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 21:07:27 +08:00
Xinchen Hui
3380de9774
Fixed bug #65304 (Use of max int in array_sum)
2013-07-21 21:07:19 +08:00
Xinchen Hui
25eb44fcc1
Merge branch 'PHP-5.5'
2013-07-21 16:20:00 +08:00
Xinchen Hui
3cd13204bb
Updaet NEWS
2013-07-21 16:19:40 +08:00
Xinchen Hui
629965abe2
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 16:19:13 +08:00
Xinchen Hui
cc91fbe986
Reorder NEWS
2013-07-21 15:58:10 +08:00
Gustavo André dos Santos Lopes
cbd1faf077
Merge branch 'PHP-5.5'
...
* PHP-5.5:
intl: remove extra quotes from arginfo params
2013-07-21 03:30:42 +02:00
Gustavo André dos Santos Lopes
3363e04fb4
intl: remove extra quotes from arginfo params
2013-07-21 03:30:28 +02:00
Rui Hirokawa
cb607d4f78
updated test script for bug #65045 .
2013-07-21 10:18:33 +09:00
Arpad Ray
b963249456
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
...
Also fix and test for get_defined_constants(true)
2013-07-20 11:05:13 +01:00
Johannes Schlüter
7daf1a6c14
Mention git and suggest PECL for new things
2013-07-19 22:05:52 +02:00
Johannes Schlüter
b278aba429
Update patch submitting instructions
...
- we use git
- pecl bugs were merged into bugs.php.net
- A bit less on PEAR
2013-07-19 22:00:01 +02:00
Johannes Schlüter
17361b9707
Remove README about PHP 4.0 -> 4.1 API changes
2013-07-19 21:45:26 +02:00
Arpad Ray
a015fa83a7
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
2013-07-19 19:19:48 +01:00
Matteo Beccati
85bbc8fa9d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Properly fixed bug #63186 on NetBSD == 6.0
2013-07-19 09:40:15 +02:00
Matteo Beccati
1dc7d0da08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Properly fixed bug #63186 on NetBSD == 6.0
2013-07-19 09:39:53 +02:00
Matteo Beccati
2b9d42433f
Properly fixed bug #63186 on NetBSD == 6.0
2013-07-19 09:37:39 +02:00
Anatol Belski
1673e8f67e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65268 select() implementation uses outdated tick API
2013-07-18 18:02:26 +02:00
Anatol Belski
99afc6dc11
Fixed bug #65268 select() implementation uses outdated tick API
2013-07-18 18:01:51 +02:00
Anatol Belski
c6651942ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix header include
new NEWS for next release
2013-07-18 15:29:17 +02:00
Anatol Belski
d8dd4d9b02
fix header include
...
stddef.h is needed to have offsetof macros on windows (at least)
2013-07-18 15:28:20 +02:00
Julien Pauli
cbdf9edebd
new NEWS for next release
2013-07-18 11:54:09 +02:00
Julien Pauli
c8befa4f7c
Merge branch 'PHP-5.5'
2013-07-18 11:12:01 +02:00
Julien Pauli
53a7e00911
New NEWS
2013-07-18 10:22:57 +02:00
Yasuo Ohgaki
0a7c88884e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improve php.ini-* documentation
2013-07-18 14:10:34 +09:00
Yasuo Ohgaki
d6692514f8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improve php.ini-* documentation
2013-07-18 14:10:05 +09:00
Yasuo Ohgaki
445dffa75a
Improve php.ini-* documentation
2013-07-18 14:08:28 +09:00
Johannes Schlüter
2a13fb106d
Remove PHP3 conversion scripts
2013-07-17 23:32:23 +02:00
Johannes Schlüter
57c50f8fed
Drop PHP 4 related README
2013-07-17 23:25:44 +02:00
Johannes Schlüter
f7e204d7ed
Slightly modernize ext_skel and sekelton/
...
- .svnignore ->.gitignore
- Add .gitignore entries for DSO stand-alone builds stuff
- Docs don't use CVS but SVN
- reorder extname.c file so it needs less forward declarations
- take forward declarations out of php_extname.h
- Drop #if for 12 years old PHP version compatibility
2013-07-17 23:18:13 +02:00
Stanislav Malyshev
a5d177cbc8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.4.19 is next
2013-07-17 13:52:39 -07:00
Stanislav Malyshev
fec93992de
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.19 is next
Conflicts:
configure.in
main/php_version.h
2013-07-17 13:52:25 -07:00
Stanislav Malyshev
b9e3f737d9
5.4.19 is next
2013-07-17 13:51:15 -07:00
Arpad Ray
b594949144
Merge branch 'PHP-5.5'
...
* PHP-5.5:
regenerate url scanner
Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:28:12 +01:00
Arpad Ray
31edf4df56
regenerate url scanner
2013-07-17 16:28:01 +01:00
Arpad Ray
94ab37f06a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:19:53 +01:00
Arpad Ray
e6ae977082
Fixed bug #50308 - session id not appended properly for empty anchor tags
...
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
2013-07-17 16:07:26 +01:00
Arpad Ray
fb53871d94
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #62129 - rfc1867 crashes php even though turned off
2013-07-17 11:09:37 +01:00
Arpad Ray
0d3d739bf7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #62129 - rfc1867 crashes php even though turned off
2013-07-17 11:05:23 +01:00
Arpad Ray
ba3234888d
Fix bug #62129 - rfc1867 crashes php even though turned off
...
Patch by gxd305 at gmail dot com
2013-07-17 11:02:48 +01:00
Stanislav Malyshev
5c0ad4c72c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add news for xml fix
2013-07-16 15:40:20 -07:00
Stanislav Malyshev
c855f44737
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add news for xml fix
2013-07-16 15:39:16 -07:00
Stanislav Malyshev
eb8c15b573
add news for xml fix
2013-07-16 15:38:37 -07:00
Anatol Belski
be721d5d8b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix TS build
2013-07-16 18:06:05 +02:00
Anatol Belski
fd5cdf89a8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TS build
2013-07-16 18:05:45 +02:00
Anatol Belski
bb6d74918e
fix TS build
2013-07-16 18:05:14 +02:00
Anatol Belski
12aec9ec8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added sapi check for dl() test
2013-07-16 15:43:59 +02:00
Anatol Belski
f37ac6f591
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added sapi check for dl() test
2013-07-16 15:43:37 +02:00
Anatol Belski
135f81c5ae
added sapi check for dl() test
2013-07-16 15:42:38 +02:00
Johannes Schlüter
dc489c30f0
Merge branch 'PHP-5.5'
2013-07-16 13:56:06 +02:00
Johannes Schlüter
e1a0c90b8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-16 13:55:32 +02:00
Johannes Schlüter
d3a4af4db8
Make zval2myslqnd implementations aware of inheritance
2013-07-16 13:52:57 +02:00
Anatol Belski
83a60d45f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed typo ensuring header str is \0 terminated
2013-07-16 00:15:54 +02:00
Anatol Belski
54b740a7e1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed typo ensuring header str is \0 terminated
2013-07-16 00:15:29 +02:00
Anatol Belski
bcb39d9c6a
Fixed typo ensuring header str is \0 terminated
...
This was obviously intended to send an empty header if
php_gmtime_r() fails. Currently it could send garbage.
2013-07-16 00:14:05 +02:00
Gustavo Lopes
2443df37fd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for 710150c and e2744f1
socket: support unix paths in the abstract namespace
socket: fix bug #65260 (SCM_RIGHTS)
2013-07-16 00:03:00 +02:00
Gustavo Lopes
ceecfaff5a
NEWS for 710150c and e2744f1
2013-07-16 00:02:43 +02:00
Gustavo Lopes
710150ccb7
socket: support unix paths in the abstract namespace
...
Those starting with '\0'.
2013-07-15 23:57:51 +02:00
Gustavo Lopes
e2744f1aa3
socket: fix bug #65260 (SCM_RIGHTS)
...
The data for messages of type SOL_SOCKET/SCM_RIGHTS was not being
passed correctly. There were actually two bugs: (1) the number of file
descriptors being passed was being read incorrectly (the length of the
cmsg array was being read instead of that of its 'data' element), as a
result it was generally being reported as always three elements
('level', 'type' and 'data') and (2) the allocated block for writing
the file descriptors was being acessed incorrectly because a 1-based
counter was being used as if it was 0-based.
Any of these two bugs would probably be enough to cause heap
corruption.
2013-07-15 23:57:49 +02:00
Anatol Belski
fb91fc6e2c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix buffer overrun
2013-07-15 17:35:52 +02:00
Anatol Belski
e7a4cf8d7e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix buffer overrun
2013-07-15 17:35:29 +02:00
Anatol Belski
9561e598a0
fix buffer overrun
2013-07-15 17:34:36 +02:00
Anatol Belski
af377da60a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
kick unused var
2013-07-15 17:23:48 +02:00
Anatol Belski
904c5d7ba8
kick unused var
2013-07-15 17:23:16 +02:00
Stanislav Malyshev
e92a63c9ee
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove PWS (Personal Web Server) references
2013-07-15 00:38:50 -07:00
Bruno CHALOPIN
2ec7b1c388
Remove PWS (Personal Web Server) references
2013-07-15 00:38:29 -07:00
Stanislav Malyshev
6aa694a8d8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:43 -07:00
Stanislav Malyshev
68e630b72f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:35 -07:00
sasezaki
e617679c0b
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
2013-07-15 00:36:29 -07:00
kazusuke sasezaki
76775a3aa7
fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:19 -07:00
Stanislav Malyshev
7bd8dfae63
Merge branch 'PHP-5.5'
...
* PHP-5.5:
revert false fix
typo fixes
less serious compatAbility fixes
typos (orig)
revert false fix
typo fixes
typos (orig)
less serious compatAbility fixes
2013-07-15 00:28:21 -07:00
Stanislav Malyshev
0aadbf7578
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
revert false fix
typo fixes
less serious compatAbility fixes
typos (orig)
Conflicts:
ext/mysql/php_mysql.c
2013-07-15 00:27:57 -07:00
Veres Lajos
2c73ce4363
revert false fix
2013-07-15 00:23:17 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
b79b13b4ef
less serious compatAbility fixes
2013-07-15 00:21:39 -07:00
Veres Lajos
bb64106f64
typos (orig)
2013-07-15 00:20:49 -07:00
Veres Lajos
c2088f8b81
revert false fix
2013-07-15 00:19:56 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
d17e8ac32f
less serious compatAbility fixes
2013-07-15 00:19:39 -07:00
Veres Lajos
6c4af15d6c
typos (orig)
2013-07-15 00:19:32 -07:00
Veres Lajos
f23a5fbc8e
revert false fix
2013-07-15 00:19:07 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Veres Lajos
b8a2b254a1
typos (orig)
2013-07-15 00:18:32 -07:00
Veres Lajos
227556c6a2
less serious compatAbility fixes
2013-07-15 00:17:35 -07:00
Stanislav Malyshev
2c8a4af892
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #62665 : add curl.cainfo to php.ini
2013-07-14 23:57:16 -07:00
Stanislav Malyshev
8c663fd4cc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #62665 : add curl.cainfo to php.ini
Conflicts:
php.ini-development
php.ini-production
2013-07-14 23:56:59 -07:00
Stanislav Malyshev
2bad01e61b
Fix bug #62665 : add curl.cainfo to php.ini
...
Conflicts:
php.ini-development
php.ini-production
2013-07-14 23:56:03 -07:00
Stanislav Malyshev
50f15bb921
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add news for bug #65219
Add built-in web server to invocation list
Terminology: change embedded web server to built-in web server to align with cli usage
Align -B and -E parameter names with cli usage (begin_code and end_code)
Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
2013-07-14 17:07:33 -07:00
Stanislav Malyshev
07ab23655a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add news for bug #65219
2013-07-14 17:07:24 -07:00
Stanislav Malyshev
a51b50000d
add news for bug #65219
2013-07-14 17:07:06 -07:00
Stanislav Malyshev
9cc9d32e6a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add built-in web server to invocation list
Terminology: change embedded web server to built-in web server to align with cli usage
Align -B and -E parameter names with cli usage (begin_code and end_code)
Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
2013-07-14 17:01:43 -07:00
Lior Kaplan
f4b9b20b35
Add built-in web server to invocation list
2013-07-14 17:00:56 -07:00
Lior Kaplan
bcef0ebc2d
Terminology: change embedded web server to built-in web server to align with cli usage
2013-07-14 16:42:23 -07:00
Lior Kaplan
07501dc1a2
Align -B and -E parameter names with cli usage (begin_code and end_code)
2013-07-14 16:42:09 -07:00
Anatol Belski
6e3134610c
Merge branch 'PHP-5.4' of https://github.com/php/php-src into PHP-5.4
2013-07-14 20:48:26 +02:00
Anatol Belski
14b67ed6da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix uninitialized memory usage
2013-07-14 20:46:48 +02:00
Anatol Belski
168a5bb6df
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix uninitialized memory usage
2013-07-14 20:46:19 +02:00
Anatol Belski
add0833681
fix uninitialized memory usage
2013-07-14 20:44:29 +02:00
Stanley Sufficool
67c03eac62
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
2013-07-14 11:18:11 -07:00
Stanley Sufficool
d012bdca03
Fix Bug #65219
...
DBSETLDBNAME should be called before login to set DBNAME in login record
2013-07-14 11:16:42 -07:00
Stanley Sufficool
6e32a871a4
Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3
...
* 'PHP-5.3' of https://git.php.net/push/php-src: (23 commits)
Merge PHP 5.3.27 NEWS
add test for bug #65236
truncate results at depth of 255 to prevent corruption
fix assembly of safe_address() for x86 and x86_64
Add bison 2.6.4 to the list of supported versions
Update git rules (5.5 is stable, 5.3 sec only)
This will be PHP 5.3.28
Fixed bug #63186 (compile failure on netbsd)
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
missing colon
Backported the fix for bug #53437
Fixed test script
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
Fixed bug #64934 Apache2 TS crash with get_browser()
Add NEWS for PHP 5.3.26
Fixed bug #64960 (Segfault in gc_zval_possible_root)
fix CVE-2013-2110 - use correct formula to calculate string size
...
2013-07-14 11:10:36 -07:00
Xinchen Hui
75808151e3
Merge branch 'PHP-5.5'
...
Conflicts:
Zend/zend_vm_execute.h
2013-07-14 12:01:50 +08:00
Xinchen Hui
e20fc85454
Update NEWS
2013-07-14 11:56:37 +08:00
Xinchen Hui
2c4f823437
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-07-14 11:53:56 +08:00
Xinchen Hui
ebad5178c4
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).
2013-07-14 11:47:06 +08:00
Felipe Pena
eab076020d
- BFN
2013-07-13 17:55:50 -03:00
Felipe Pena
b64e2218f2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
2013-07-13 17:54:52 -03:00
Felipe Pena
efc89368dd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
2013-07-13 17:54:41 -03:00
Felipe Pena
0863a0d6a0
- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
2013-07-13 17:54:31 -03:00
Stanislav Malyshev
b98f346587
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix version - not -dev anymore since 5.5.0 release
- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
Fixed meta data retrieve when OID is larger than 2^31
Fixed meta data retrieve when OID is larger than 2^31
Inprove pg_unescape_bytea() error message
Conflicts:
Zend/zend.h
ext/gmp/gmp.c
2013-07-12 17:32:15 -07:00
Stanislav Malyshev
184dea7033
fix version - not -dev anymore since 5.5.0 release
2013-07-12 17:23:22 -07:00
Felipe Pena
4bd2f755ba
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
Fixed meta data retrieve when OID is larger than 2^31
2013-07-12 20:23:31 -03:00
Felipe Pena
281936b295
- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
2013-07-12 20:23:00 -03:00
Yasuo Ohgaki
0ddb3d97de
Fixed meta data retrieve when OID is larger than 2^31
2013-07-13 06:06:23 +09:00
Yasuo Ohgaki
bccc3e2ec0
Fixed meta data retrieve when OID is larger than 2^31
2013-07-13 06:05:18 +09:00
Yasuo Ohgaki
002f3ff4dc
Inprove pg_unescape_bytea() error message
2013-07-13 06:05:17 +09:00
Stanislav Malyshev
732989c352
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix the date for 5.4.17
2013-07-12 10:58:32 -07:00
Stanislav Malyshev
657116f12e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix the date for 5.4.17
2013-07-12 10:58:24 -07:00
Stanislav Malyshev
d2a83efe5b
fix the date for 5.4.17
2013-07-12 10:57:59 -07:00
Stanislav Malyshev
e885dac150
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update 5.4.17 date
2013-07-12 10:55:43 -07:00
Stanislav Malyshev
64b11f8918
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update 5.4.17 date
2013-07-12 10:55:37 -07:00
Stanislav Malyshev
b2fbb4cc40
update 5.4.17 date
2013-07-12 10:55:24 -07:00
Stanislav Malyshev
f4dab70faf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update 5.4.17 date
2013-07-12 10:54:02 -07:00
Stanislav Malyshev
20e9ca5c9f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update 5.4.17 date
2013-07-12 10:53:47 -07:00
Stanislav Malyshev
5b01b0904f
update 5.4.17 date
2013-07-12 10:53:23 -07:00
Anatol Belski
4f4fa32ca5
updated NEWS
2013-07-11 00:51:10 +02:00
Anatol Belski
ecf057d197
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:49:41 +02:00
Anatol Belski
2acc386270
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:48:12 +02:00
Christopher Jones
2d77bbdf64
Merge branch 'spl_tempfile_clean' into PHP-5.5
...
* spl_tempfile_clean:
Cleanup temp test file
2013-07-10 11:18:58 -07:00
Christopher Jones
3478ddc1f0
Cleanup temp test file
2013-07-10 11:17:52 -07:00
Christopher Jones
c0bfc57ba8
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Merge PHP 5.3.27 NEWS
add test for bug #65236
fix possible resource leak and make sure there's something to qsort()
Cleanup temp file
- Updated to version 2013.4 (2013d)
2013-07-10 11:13:19 -07:00
Christopher Jones
96f77f845a
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Merge PHP 5.3.27 NEWS
add test for bug #65236
fix possible resource leak and make sure there's something to qsort()
- Updated to version 2013.4 (2013d)
2013-07-10 11:13:18 -07:00
Christopher Jones
e2e002d4ea
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
...
* 'PHP-5.3' of https://git.php.net/repository/php-src :
Merge PHP 5.3.27 NEWS
add test for bug #65236
2013-07-10 11:13:15 -07:00
Johannes Schlüter
1891577d04
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-10 19:47:15 +02:00
Johannes Schlüter
4c6c048e3e
Merge branch 'PHP-5.3' into PHP-5.4
2013-07-10 19:46:37 +02:00
Johannes Schlüter
9c4ef50146
Merge PHP 5.3.27 NEWS
2013-07-10 19:45:45 +02:00
Johannes Schlüter
26019d2022
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-10 19:38:00 +02:00
Johannes Schlüter
4204e2cb5b
Merge branch 'PHP-5.3' into PHP-5.4
2013-07-10 19:36:12 +02:00
Johannes Schlüter
710eee5555
add test for bug #65236
2013-07-10 19:35:18 +02:00
Sara Golemon
95017c0522
Add a couple more test cases to parse_url() tests
...
http://::# (valid but silly)
http://# (invalid)
2013-07-10 08:26:47 -07:00
Yasuo Ohgaki
914f8fd304
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed meta data retrieve when OID is larger than 2^31
Conflicts:
ext/pdo_pgsql/pgsql_statement.c
2013-07-11 12:25:24 +09:00
Yasuo Ohgaki
0ed36d4478
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed meta data retrieve when OID is larger than 2^31
2013-07-11 12:23:23 +09:00
Yasuo Ohgaki
8679bffaca
Fixed meta data retrieve when OID is larger than 2^31
2013-07-11 12:23:11 +09:00
Yasuo Ohgaki
c4f241ef88
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Inprove pg_unescape_bytea() error message
2013-07-11 12:13:22 +09:00
Yasuo Ohgaki
ed00dc8f82
Inprove pg_unescape_bytea() error message
2013-07-11 12:13:09 +09:00
Anatol Belski
ecb55dd9f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:52:08 +02:00
Christopher Jones
56b2b74409
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Cleanup temp test file
2013-07-10 11:22:16 -07:00
Johannes Schlüter
479174c21c
Merge branch 'PHP-5.5'
2013-07-10 19:47:26 +02:00
Johannes Schlüter
9c0cd00b44
Merge branch 'PHP-5.5'
2013-07-10 19:38:29 +02:00
Anatol Belski
c7490a6edd
add usleep() to the header, already exported to dll
2013-07-10 16:16:33 +02:00
Anatol Belski
638f1c3b79
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:32:13 +02:00
Anatol Belski
f5b9d87fb9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:31:22 +02:00
Anatol Belski
29ac511b8a
fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:00:47 +02:00
Christopher Jones
3fd987f493
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Cleanup temp file
2013-07-09 14:53:05 -07:00
Christopher Jones
73b54b4a5b
Merge branch 'gd_clean' into PHP-5.5
...
* gd_clean:
Cleanup temp file
2013-07-09 14:52:35 -07:00
Christopher Jones
cd7e56e536
Cleanup temp file
2013-07-09 14:51:47 -07:00
Patrick Allaert
b980e4fedc
Fixed #65225 : PHP_BINARY incorrectly set
2013-07-09 15:05:10 +02:00
Derick Rethans
3cdd09a76e
Merge branch 'PHP-5.5'
2013-07-09 09:07:21 +01:00
Derick Rethans
06cef326fd
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-09 09:07:17 +01:00
Derick Rethans
c7ee677f2f
- Updated to version 2013.4 (2013d)
2013-07-09 09:07:16 +01:00
Yasuo Ohgaki
baac810eb8
Improve pg_unescape_bytea() error message
2013-07-09 14:54:03 +09:00
Yasuo Ohgaki
84e6576203
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed pgsql_stmt_get_column_meta() OID signedness
2013-07-09 07:02:09 +09:00
Yasuo Ohgaki
98e6473f98
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed pgsql_stmt_get_column_meta() OID signedness
2013-07-09 07:00:47 +09:00
Yasuo Ohgaki
24037fd3d9
Fixed pgsql_stmt_get_column_meta() OID signedness
2013-07-09 06:59:50 +09:00
Christopher Jones
0cf978c92e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Bump PECL package info version check to allow PECL installs with PHP 5.5+
2013-07-08 13:39:26 -07:00
Christopher Jones
7045bd5c4a
Merge branch 'bump_pecl_check' into PHP-5.5
...
* bump_pecl_check:
Bump PECL package info version check to allow PECL installs with PHP 5.5+
2013-07-08 13:38:45 -07:00
Christopher Jones
fbebe431b4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update NEWS
2013-07-08 13:35:21 -07:00
Christopher Jones
6ac7c9d0a7
Bump PECL package info version check to allow PECL installs with PHP 5.5+
2013-07-08 13:32:04 -07:00
Christopher Jones
ac26d0e655
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 13:31:12 -07:00
Christopher Jones
79df8cf9c2
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 13:30:54 -07:00
Andrey Hristov
2c3f6dcdb6
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
...
Conflicts:
NEWS
2013-07-08 20:28:51 +02:00
Andrey Hristov
dd71f1f173
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-07-08 20:27:14 +02:00
Andrey Hristov
e78ca0b634
Merge branch 'master' of ssh://git.php.net/php-src
2013-07-08 20:26:38 +02:00
Andrey Hristov
a5d2854bdc
Merge branch 'PHP-5.5'
2013-07-08 20:26:04 +02:00
Andrey Hristov
3dd5f4ae4c
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 20:23:32 +02:00
Yasuo Ohgaki
204137693c
Update NEWS
2013-07-08 19:21:52 +09:00
Yasuo Ohgaki
870d238b06
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added warning for hex2bin() when input is invalid string
Update NEWS
2013-07-08 19:15:04 +09:00
Yasuo Ohgaki
bde0f1318a
Added warning for hex2bin() when input is invalid string
2013-07-08 19:14:45 +09:00
Yasuo Ohgaki
bdfe70ab34
Update NEWS
2013-07-08 19:02:42 +09:00
Yasuo Ohgaki
4fd1e24ee5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add warning to pg_unescape_bytea() when invalid parameter is passed
2013-07-08 18:53:12 +09:00
Yasuo Ohgaki
2bc8271b29
Add warning to pg_unescape_bytea() when invalid parameter is passed
2013-07-08 18:51:37 +09:00
Xinchen Hui
11b757d53e
Merge branch 'PHP-5.5'
2013-07-08 11:21:54 +08:00
Ben Ramsey
d1c261d7f8
array_column: Changing integer in test output to use %d
2013-07-06 20:50:34 +00:00
Rob Richards
b955dbecfb
Merge branch 'PHP-5.5'
...
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.5:
truncate results at depth of 255 to prevent corruption
fix assembly of safe_address() for x86 and x86_64
fix assembly of safe_address() for x86 and x86_64
2013-07-06 08:01:31 -04:00
Rob Richards
eed492ce84
Merge branch 'PHP-5.4' into PHP-5.5
...
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.4:
truncate results at depth of 255 to prevent corruption
fix assembly of safe_address() for x86 and x86_64
fix assembly of safe_address() for x86 and x86_64
2013-07-06 08:00:58 -04:00
Rob Richards
e4a28b7b7b
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Rob Richards (1)
* PHP-5.3:
truncate results at depth of 255 to prevent corruption
2013-07-06 07:59:20 -04:00
Rob Richards
7d163e8a08
truncate results at depth of 255 to prevent corruption
2013-07-06 07:53:07 -04:00
Ard Biesheuvel
e4192e4cb4
Merge branch 'PHP-5.5'
2013-07-04 10:32:55 +02:00
Ard Biesheuvel
47e21a2c40
Fix assembly of safe_address() for aarch64
2013-07-04 10:25:38 +02:00
Nuno Lopes
e964817b24
fix assembly of safe_address() for x86 and x86_64
2013-07-03 18:02:28 -04:00
Nuno Lopes
c652cc93ec
fix assembly of safe_address() for x86 and x86_64
2013-07-03 17:56:02 -04:00
Nuno Lopes
40cbceaf71
fix assembly of safe_address() for x86 and x86_64
2013-07-03 17:55:18 -04:00
Nuno Lopes
97e9d01dc7
fix assembly of safe_address() for x86 and x86_64
2013-07-03 17:53:46 -04:00
Anatol Belski
675beb06a6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Extended the test for bug #65184
2013-07-03 22:53:34 +02:00
Anatol Belski
332e46b3aa
Extended the test for bug #65184
2013-07-03 22:52:51 +02:00
Felipe Pena
0107b2afe8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed build on FreeTDS 0.82
2013-07-03 15:04:30 -03:00
Felipe Pena
00293fec05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed build on FreeTDS 0.82
2013-07-03 15:02:39 -03:00
Felipe Pena
7549beb102
- Fixed build on FreeTDS 0.82
2013-07-03 15:02:03 -03:00
Johannes Schlüter
d7a59d7dac
Merge branch 'PHP-5.5'
2013-07-03 17:11:20 +02:00
Johannes Schlüter
9aa7343ae0
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-03 17:10:58 +02:00
Johannes Schlüter
5bc7e597d9
Make sure return value is initialised in case transaction startup fails
2013-07-03 17:08:14 +02:00
Johannes Schlüter
ebd94fa30d
Merge branch 'PHP-5.5'
2013-07-03 16:59:17 +02:00
Johannes Schlüter
631bb27dca
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/acinclude.m4
2013-07-03 16:58:20 +02:00
Johannes Schlüter
0265c2d961
Make sure result is initilized
...
Practically this could only be an issue when overriding mysqlnd from
an extension, but makes static analysis happy
2013-07-03 16:53:09 +02:00
Anatol Belski
9365967dfd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65184 strftime() returns insufficient-length
NEWS for two lst intl changes
2013-07-03 11:25:09 +02:00
Anatol Belski
5324416b65
Fixed bug #65184 strftime() returns insufficient-length
...
string under multibyte locales
The msdn doc states 'strftime returns the number of characters', but prior
to VS2012 it seems to have returned the number of bytes. Locale independent.
The return is however \0-terminated, so strlen is just fine. The behaivor
seems to be persisting in the later VC++ versions as the corresponding
MSDN ticket is closed 'by design'.
See http://connect.microsoft.com/VisualStudio/feedback/details/766205/vs2012-strftime-has-incorrect-return-value-in-vc-11-with-multibyte-codepages#details
2013-07-03 11:12:46 +02:00
Sebastian Bergmann
9f5fc5c0ee
Sync list of supported bison version with PHP-5.5
2013-07-03 06:52:44 +02:00
Sebastian Bergmann
74d434c091
Merge branch 'PHP-5.3' into PHP-5.4
2013-07-03 06:37:04 +02:00
Sebastian Bergmann
50ac53e1b1
Add bison 2.6.4 to the list of supported versions
2013-07-03 06:36:54 +02:00
Gustavo André dos Santos Lopes
b52fea6f35
NEWS for two lst intl changes
2013-07-03 05:22:33 +01:00
Gustavo André dos Santos Lopes
c1db6f8bdd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
intl: fix extra space in constant name
intl: add intlcal_set_minimal_days_in_first_week()
2013-07-03 05:17:04 +01:00
Gustavo André dos Santos Lopes
9487f0b4bb
intl: fix extra space in constant name
2013-07-03 05:15:56 +01:00
Gustavo André dos Santos Lopes
a4538a4ca2
intl: add intlcal_set_minimal_days_in_first_week()
...
and IntlCalendar::setMinimalDaysInFirstWeek(). This one had slipped.
we had a ::getMinimalDaysInFirstWeek() but no way to change the value.
2013-07-03 05:06:32 +01:00
Remi Collet
c28e77cbbc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix typo in php man page
2013-07-02 12:19:43 +02:00
Remi Collet
1aeb2514fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo in php man page
2013-07-02 12:19:37 +02:00
Remi Collet
67817a199c
fix typo in php man page
2013-07-02 12:19:09 +02:00
Remi Collet
0ecf03ff38
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Fixed Bug #65142 Missing phar man page
NEWS
Fixed Bug #65143 Missing php-cgi man page
2013-07-02 10:48:38 +02:00
Remi Collet
4d5a2fba16
NEWS
2013-07-02 10:48:19 +02:00
Remi Collet
8f0567581e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #65142 Missing phar man page
NEWS
Fixed Bug #65143 Missing php-cgi man page
2013-07-02 10:47:38 +02:00
Remi Collet
f4ce5e7fb6
Fixed Bug #65142 Missing phar man page
...
Simple man page from phar help output.
2013-07-02 10:46:50 +02:00
Remi Collet
4bc11af193
NEWS
2013-07-02 10:46:21 +02:00
Remi Collet
c940aab789
Fixed Bug #65143 Missing php-cgi man page
...
Currently php-cgi man page is a simple redirect to
php (CLI) man page.
Could be splited / improved in the future.
2013-07-02 10:42:47 +02:00
Anatol Belski
a1c2dbb466
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed mysql tests parsing phpinfo()
Add a few links
Update NEWS
Fixed bug #35703 : when session_name("123") consist only digits, should warning
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-07-02 08:25:01 +02:00
Anatol Belski
1968fac697
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed mysql tests parsing phpinfo()
Update NEWS
Fixed bug #35703 : when session_name("123") consist only digits, should warning
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-07-02 08:24:37 +02:00
Anatol Belski
743c4864eb
Fixed mysql tests parsing phpinfo()
2013-07-02 08:23:33 +02:00
Christopher Jones
bf8ed4708e
Add a few links
2013-07-01 16:48:18 -07:00
Christopher Jones
7a331856df
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Yasuo Ohgaki (5) and others
# Via Stanislav Malyshev (5) and others
* 'master' of https://git.php.net/repository/php-src :
added test code for #65045 .
fixed #65045 : mb_convert_encoding breaks well-formed character.
Don't try to clean up generator stack on unclean shutdown
NEWS
Added PHP_FCGI_BACKLOG, overrides the default listen backlog
Merge branch 'PHP-5.5' into master
Fixed bug #49175 : mod_files.sh does not support hash bits
Fixed bug #35703 : when session_name("123") consist only digits, should warning
Fixed bug #49175 : mod_files.sh does not support hash bits
Fixed bug #49175 : mod_files.sh does not support hash bits
add fix for #60560 into upgrading
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
Update NEWS
small optimization
fix bug #61860 : use USearch for searches, it does the right thing
2013-07-01 13:46:01 -07:00
Christopher Jones
49a2cd93d6
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (3) and Nikita Popov (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Don't try to clean up generator stack on unclean shutdown
NEWS
Added PHP_FCGI_BACKLOG, overrides the default listen backlog
Fixed bug #49175 : mod_files.sh does not support hash bits
add fix for #60560 into upgrading
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
Update NEWS
small optimization
fix bug #61860 : use USearch for searches, it does the right thing
2013-07-01 13:45:44 -07:00
Christopher Jones
06418aca28
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (1) and Yasuo Ohgaki (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Update NEWS
Fixed bug #35703 : when session_name("123") consist only digits, should warning
Fixed bug #49175 : mod_files.sh does not support hash bits
add fix for #60560 into upgrading
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
small optimization
fix bug #61860 : use USearch for searches, it does the right thing
2013-07-01 13:45:41 -07:00
Rui Hirokawa
1db66942e1
added test code for #65045 .
2013-06-30 15:31:36 +09:00
Rui Hirokawa
c6a7549efc
fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-06-30 15:30:45 +09:00
Nikita Popov
4d606cf01e
Merge branch 'PHP-5.5'
2013-06-29 21:57:36 +02:00
Nikita Popov
0f36224beb
Don't try to clean up generator stack on unclean shutdown
...
This fixes bugs #65035 and #65161 . In one of the bugs the issue is
that function_state.arguments is NULL, but the arg count is pushed
to the stack and the code tries to free it. In the other bug the
stack of the generator is freed twice, once in generator_close and
later during shutdown.
It's rather hard (if at all possible) to do a proper stack cleanup
on an unclean shutdown, so I'm just disabling it in this case.
2013-06-29 21:51:54 +02:00
Arnaud Le Blanc
4cf20656ba
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Added PHP_FCGI_BACKLOG, overrides the default listen backlog
2013-06-29 17:55:39 +02:00
Arnaud Le Blanc
5904da9948
NEWS
2013-06-29 17:54:55 +02:00
Arnaud Le Blanc
18f45c535b
Added PHP_FCGI_BACKLOG, overrides the default listen backlog
2013-06-29 17:52:04 +02:00
Yasuo Ohgaki
46214a23b8
Update NEWS
2013-06-29 11:38:23 +09:00
Yasuo Ohgaki
87dda666c7
Fixed bug #35703 : when session_name("123") consist only digits, should warning
2013-06-29 11:35:55 +09:00
Yasuo Ohgaki
ef63334fa6
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-06-29 11:35:55 +09:00
Yasuo Ohgaki
bedadf2bb2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #35703 : when session_name("123") consist only digits, should warning
2013-06-29 09:44:45 +09:00
Yasuo Ohgaki
cfa667846f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #35703 : when session_name("123") consist only digits, should warning
2013-06-29 09:43:06 +09:00
Yasuo Ohgaki
f1c8d0b4e3
Merge branch 'PHP-5.5' into master
...
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-06-29 09:23:37 +09:00
Yasuo Ohgaki
27b01cfcd7
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-06-29 09:09:23 +09:00
Yasuo Ohgaki
bfb4c3156f
Fixed bug #35703 : when session_name("123") consist only digits, should warning
2013-06-29 08:07:44 +09:00
Yasuo Ohgaki
5f0656b89d
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-06-29 06:50:07 +09:00
Yasuo Ohgaki
520c08adf0
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-06-29 06:45:18 +09:00
Stanislav Malyshev
66667dda47
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add fix for #60560 into upgrading
2013-06-28 14:02:12 -07:00
Stanislav Malyshev
657d486013
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add fix for #60560 into upgrading
2013-06-28 14:01:53 -07:00
Stanislav Malyshev
103cf4c060
add fix for #60560 into upgrading
2013-06-28 14:01:25 -07:00
Stanislav Malyshev
d231111972
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
Update NEWS
small optimization
fix bug #61860 : use USearch for searches, it does the right thing
2013-06-28 13:56:31 -07:00
Stanislav Malyshev
4020ef8980
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
Update NEWS
small optimization
fix bug #61860 : use USearch for searches, it does the right thing
2013-06-28 13:56:11 -07:00
Stanislav Malyshev
e46beabe8f
Merge branch 'bug61860' into PHP-5.4
...
* bug61860:
small optimization
fix bug #61860 : use USearch for searches, it does the right thing
2013-06-28 13:54:57 -07:00
Adam Harvey
3becd3879f
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
...
SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).
2013-06-28 13:50:33 -07:00
Ralf Lang
f978f11e2e
ws
2013-06-28 08:38:34 +02:00
Ralf Lang
da04b2e28c
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files
...
above 2G.
This is essentially the same as the patch
"uploads_larger_than_2g_HEAD_v2 (last revision 2012-03-26 03:59 UTC) by
jason at infininull dot com)" but using off_t instead of signed long
(originally: uint)
I tested this on 64bit linux and succeeded uploading a file of 4.8 G.
The File did not get corrupted or truncated in any way.
I did not yet test this under windows or 32 bit linux
Note that there are still limitations:
* Did not test for files > 8 G
* php does not yet reject absurdly high values
* Still limited by underlying file system specific limits and free space
* in upload
* tmp dir and destination dir
2013-06-28 08:32:10 +02:00
Christopher Jones
8d9fcbba9e
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Felipe Pena (11) and others
# Via Felipe Pena (14) and others
* 'master' of https://git.php.net/repository/php-src: (27 commits)
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
BC fix for PR 109 merge - create_sid() method in SessionHandler
Tests, fixes and optimisations
Add create_sid to session_set_save_handler and SessionHandler
Fixed symbol export
Update NEWS
BC fix for PR 109 merge - create_sid() method in SessionHandler
Update NEWS:w
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
- Fixed test
add new test
Update NEWS
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
- Fixed typo on condition
...
2013-06-27 16:48:42 -07:00
Christopher Jones
2c73f61a1c
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Felipe Pena (11) and others
# Via Felipe Pena (7) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (22 commits)
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Update NEWS
BC fix for PR 109 merge - create_sid() method in SessionHandler
Update NEWS:w
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
- Fixed test
add new test
Update NEWS
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
- Fixed typo on condition
- BFN
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Update NEWS
- BFN
...
2013-06-27 16:48:26 -07:00
Christopher Jones
8cb782bbce
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Felipe Pena (9) and others
# Via Arpad Ray (1) and Felipe Pena (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Update NEWS
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
- Fixed test
add new test
Update NEWS
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
- BFN
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
2013-06-27 16:48:25 -07:00
Arpad Ray
da31bef9cb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Update NEWS
BC fix for PR 109 merge - create_sid() method in SessionHandler
Tests, fixes and optimisations
Add create_sid to session_set_save_handler and SessionHandler
2013-06-27 19:25:11 +01:00
Arpad Ray
e00ed6bc3f
Update NEWS
2013-06-27 19:23:58 +01:00
Arpad Ray
70ae67b5da
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
2013-06-27 19:12:46 +01:00
Arpad Ray
ce8c023910
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
...
When uploading multiple files, the array in the session where the progress
data is stored (and cancel_upload key is set) was overwritten whenever the
progress data was updated, so pending uploads would proceed anyway.
2013-06-27 19:05:23 +01:00
Arpad Ray
ada46c75f4
BC fix for PR 109 merge - create_sid() method in SessionHandler
...
Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.
Also added several more tests for this feature.
2013-06-27 13:06:22 +01:00
Leigh
b794cce4fd
Tests, fixes and optimisations
...
* Amended existing tests to cater for new functionality.
* Implemented fixes and optimisations recommended by NikiC
* Added create_sid to the registered interface. This was breaking
tests. It also now breaks BC for people implementing the interface
directly instead of extending the class.
2013-06-27 13:06:22 +01:00
Leigh
074c26a68b
Add create_sid to session_set_save_handler and SessionHandler
...
A lot of code already existed to allow a custom create_sid handler, but
lacked a specific implementation.
Therefore I have added a 7th (optional) argument
session_set_save_handler, to allow a user function to be supplied for
session id generation.
If a create_sid function is not supplied, the default function is
called in its absence to preserve backwards compatibility.
Likewise create_sid only added to SessionHandler class, and not the
interface to maintain backwards compatibility. If the result is not
overridden, the default is called.
2013-06-27 13:06:22 +01:00
Anatol Belski
eb190bb571
Fixed symbol export
...
That's needed for baabd11929 to link
properly.
2013-06-27 14:00:56 +02:00
Arpad Ray
41565a239f
Update NEWS
2013-06-27 12:49:16 +01:00
Arpad Ray
1e836cdd64
BC fix for PR 109 merge - create_sid() method in SessionHandler
...
Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.
Also added several more tests for this feature.
2013-06-27 12:33:56 +01:00
Arpad Ray
b66c14b0c8
Merge PR 109 - Add create_sid to session_set_save_handler and SessionHandler
...
Allows user session handlers to create session IDs by adding an optional
7th argument to session_set_save_handler() and a create_sid() method
to SessionHandler.
2013-06-27 12:29:44 +01:00
Xinchen Hui
a441d9274b
Merge branch 'PHP-5.5'
2013-06-27 12:38:52 +08:00
Xinchen Hui
60bbc78bde
Update NEWS:w
2013-06-27 12:38:35 +08:00
Xinchen Hui
c2cfc242c4
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-27 12:38:13 +08:00
Xinchen Hui
fa8611c81e
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
2013-06-27 12:37:57 +08:00
Felipe Pena
86a54638ed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
2013-06-26 19:16:37 -03:00
Felipe Pena
402b3aaf56
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
2013-06-26 19:16:26 -03:00
Felipe Pena
76866e0a2e
- BFN
2013-06-26 19:16:13 -03:00
Felipe Pena
60dcc5851f
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
2013-06-26 19:15:19 -03:00
Felipe Pena
02682f4169
- Reclassify bug
2013-06-26 15:15:37 -03:00
Felipe Pena
4113b5aee3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
2013-06-26 15:08:57 -03:00
Felipe Pena
efbf573e9f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
2013-06-26 15:08:51 -03:00
Felipe Pena
891bd46f3d
- BFN
2013-06-26 15:08:33 -03:00
Felipe Pena
cd176e0452
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
2013-06-26 15:06:27 -03:00
Felipe Pena
c6a218c76b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
2013-06-26 13:50:47 -03:00
Felipe Pena
aa31d7e1ef
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
2013-06-26 13:50:43 -03:00
Felipe Pena
7e33b5d2fa
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
2013-06-26 13:50:37 -03:00
Felipe Pena
c743d0c9dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed test
2013-06-26 13:36:50 -03:00
Felipe Pena
32f11e4ee6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed test
2013-06-26 13:36:41 -03:00
Felipe Pena
f477ad22c2
- Fixed test
2013-06-26 13:36:36 -03:00
Andrey Hristov
793694b9d8
Merge branch 'PHP-5.5'
2013-06-26 16:51:42 +02:00
Andrey Hristov
781be5f1d7
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-06-26 16:50:08 +02:00
Andrey Hristov
b34e8d2e3e
add new test
2013-06-26 16:44:26 +02:00
Yasuo Ohgaki
8922c50ca4
Update NEWS
2013-06-26 16:31:34 +09:00
Yasuo Ohgaki
eeeb7a281a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
2013-06-26 16:23:25 +09:00
Yasuo Ohgaki
6be36cc381
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
2013-06-26 16:19:31 +09:00
Yasuo Ohgaki
6c8cef3ca4
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
2013-06-26 16:17:57 +09:00
Felipe Pena
802a25e0c9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed typo on condition
2013-06-25 21:53:42 -03:00
Felipe Pena
623386d799
- Fixed typo on condition
2013-06-25 21:53:20 -03:00
Felipe Pena
0c7cf58092
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- BFN
2013-06-25 21:44:17 -03:00
Felipe Pena
b68c496175
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- BFN
2013-06-25 21:44:03 -03:00
Felipe Pena
12b75e3d3e
- BFN
2013-06-25 21:43:23 -03:00
Felipe Pena
509e89448e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Update NEWS
Update NEWS
- BFN
2013-06-25 21:40:30 -03:00
Felipe Pena
fba44be828
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Update NEWS
- BFN
2013-06-25 21:40:24 -03:00
Felipe Pena
e15ca39708
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-06-25 21:39:17 -03:00
Felipe Pena
4289696828
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
2013-06-25 21:36:50 -03:00
Christopher Jones
91bd2de85c
Update NEWS
2013-06-25 17:31:13 -07:00
Christopher Jones
12fdf8fb95
Update NEWS
2013-06-25 17:30:21 -07:00
Christopher Jones
d1bed34b76
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Felipe Pena
# Via Felipe Pena (8) and Christopher Jones (3)
* 'master' of https://git.php.net/repository/php-src :
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
2013-06-25 17:28:27 -07:00
Christopher Jones
99ab8a83af
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.5' of https://git.php.net/repository/php-src :
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
2013-06-25 17:28:12 -07:00
Christopher Jones
111b385afe
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src :
- BFN
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
2013-06-25 17:28:11 -07:00
Felipe Pena
a689fde2bf
- BFN
2013-06-25 21:19:56 -03:00
Felipe Pena
83bc4fb40a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
2013-06-25 21:19:06 -03:00
Felipe Pena
f5bf90ef34
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
2013-06-25 21:18:34 -03:00
Felipe Pena
04db57066d
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
2013-06-25 21:18:09 -03:00
Felipe Pena
40c3601947
- BFN
2013-06-25 18:04:25 -03:00
Felipe Pena
2ab53f4b5e
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-06-25 18:01:46 -03:00
Felipe Pena
b78f129a4a
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2013-06-25 18:01:40 -03:00
Felipe Pena
bce86874f6
Merge branch 'master' of git.php.net:/php-src
2013-06-25 18:01:32 -03:00
Felipe Pena
f0823ac493
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
- BFN
2013-06-25 18:00:47 -03:00
Felipe Pena
adb116dd48
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
- BFN
2013-06-25 18:00:42 -03:00
Felipe Pena
41b73e4cee
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
2013-06-25 18:00:33 -03:00
Christopher Jones
92c87b02a9
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- BFN
2013-06-25 13:25:19 -07:00
Christopher Jones
c3f4cc2e40
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- BFN
2013-06-25 13:25:04 -07:00
Christopher Jones
2d654dc337
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 13:23:58 -07:00
Christopher Jones
3675b953f6
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 13:23:50 -07:00
Christopher Jones
5d0094e5f9
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
- BFN
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 13:23:25 -07:00
Felipe Pena
5ae1983b33
- BFN
2013-06-25 16:27:30 -03:00
Felipe Pena
5c71d4d785
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 16:26:48 -03:00
Felipe Pena
d01ca1342c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 16:26:36 -03:00
Felipe Pena
6ba93a4bae
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 16:26:26 -03:00
Christopher Jones
53ec065077
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
2013-06-25 12:00:56 -07:00
Christopher Jones
ec7ac71b52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
2013-06-25 12:00:24 -07:00
Christopher Jones
a52258ae17
Merge branch 'configure12c' into PHP-5.4
...
* configure12c:
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
2013-06-25 12:00:08 -07:00
Christopher Jones
423b132a7a
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries.
...
(note OCI8 already builds with Oracle Database 12c)
2013-06-25 11:55:41 -07:00
Xinchen Hui
d99a76ca96
Merge branch 'PHP-5.5'
2013-06-25 13:48:54 +08:00
Xinchen Hui
157ccaf507
Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)
...
I can not get a reproduce script since the context is very strict.
Of course I will try to make one, but for now, I just commit this first.
2013-06-25 13:47:50 +08:00
Xinchen Hui
d8374c5590
Merge branch 'PHP-5.5'
2013-06-25 13:40:19 +08:00
Xinchen Hui
efd3c72de3
Update NEWS
2013-06-25 13:39:31 +08:00
Xinchen Hui
9d9ec2a90e
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-25 13:38:50 +08:00
Xinchen Hui
38eb909d06
Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice)
2013-06-25 13:38:27 +08:00
Christopher Jones
0093980fe0
Some tidy-ups: Don't mention Logo GUIDs in three places; mention
...
password_hash functionality; add some doc URLs for new features;
grammar & typos; formatting changes.
2013-06-24 17:12:35 -07:00
Felipe Pena
ba3278d9e6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
- BFN
2013-06-24 16:50:19 -03:00
Felipe Pena
ff292d619c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
- BFN
2013-06-24 16:49:22 -03:00
Felipe Pena
982c11573d
- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
2013-06-24 16:49:15 -03:00
Felipe Pena
d43a2f0ffb
- BFN
2013-06-24 14:50:14 -03:00
Felipe Pena
33472f78f9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
2013-06-24 14:48:28 -03:00
Felipe Pena
4b41959f9e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
2013-06-24 14:47:40 -03:00
Felipe Pena
8776555d7a
- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
2013-06-24 14:43:35 -03:00
Xinchen Hui
83673eaf1d
Merge branch 'PHP-5.5'
2013-06-24 23:53:54 +08:00
Xinchen Hui
47035ba5c9
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-06-24 23:49:45 +08:00
Xinchen Hui
a6a3aa5d49
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_API.c
2013-06-24 23:49:30 +08:00
Xinchen Hui
9cf3e65391
Fixed bug (is_callable() triggers Fatal Error)
...
This bug is also exists in 5.4, and previous fix by dsp is not complete
for __callStatic stituation, see test script
2013-06-24 23:45:08 +08:00
David Soria Parra
e972b54b30
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Notify doc team BEFORE we release
2013-06-24 17:44:04 +02:00
David Soria Parra
0ddfafe489
Notify doc team BEFORE we release
2013-06-24 17:44:00 +02:00
David Soria Parra
a496e62f13
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #65108 (is_callable() triggers Fatal Error)
2013-06-24 17:22:02 +02:00
David Soria Parra
ecd9d76250
Fix #65108 (is_callable() triggers Fatal Error)
...
We have to check if the fcall info cache contains a pointer if we
use __call, otherwise we endup in a static lookup.
2013-06-24 15:55:10 +02:00
Remi Collet
8e4e38aaee
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix imagecreatefromwebp and imagewebp protos
2013-06-24 11:15:56 +02:00
Remi Collet
9da4985bf2
fix imagecreatefromwebp and imagewebp protos
2013-06-24 11:15:50 +02:00
Remi Collet
8c694401bb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use same logic to load WebP image that other formats
2013-06-24 11:11:02 +02:00
Remi Collet
8075f1f4a3
Use same logic to load WebP image that other formats
2013-06-24 11:10:52 +02:00
Remi Collet
6c56d785ae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
2013-06-24 11:04:10 +02:00
Remi Collet
b4632d0c12
Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
2013-06-24 11:03:12 +02:00
Dmitry Stogov
0c9de2d94b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
OPcache must be compatible with LiteSpeed SAPI
Conflicts:
NEWS
2013-06-24 12:01:58 +04:00
Dmitry Stogov
f49b27e166
OPcache must be compatible with LiteSpeed SAPI
2013-06-24 11:59:50 +04:00
Stanislav Malyshev
e3d625bc4e
small optimization
2013-06-23 23:52:28 -07:00
Stanislav Malyshev
91cc70c430
Merge branch 'PHP-5.5'
...
* PHP-5.5:
seems to be working fine for me on 32-bit
2013-06-23 23:38:15 -07:00
Stanislav Malyshev
ae5a09b47d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
seems to be working fine for me on 32-bit
2013-06-23 23:37:10 -07:00
Stanislav Malyshev
a0d48e01ed
seems to be working fine for me on 32-bit
2013-06-23 23:36:43 -07:00
Stanislav Malyshev
8aba119f55
fix bug #61860 : use USearch for searches, it does the right thing
2013-06-23 23:24:12 -07:00
Stanislav Malyshev
30227f7a59
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #62759 : Buggy grapheme_substr() on edge case
2013-06-23 21:27:20 -07:00
Stanislav Malyshev
9872835cf3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #62759 : Buggy grapheme_substr() on edge case
2013-06-23 21:27:08 -07:00
Stanislav Malyshev
860a5c4b01
Fix bug #62759 : Buggy grapheme_substr() on edge case
2013-06-23 21:26:16 -07:00
Stanislav Malyshev
46c46921b1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Require second parameter of imagecrop()
2013-06-23 20:30:03 -07:00
Jakub Vrana
e1acaea4f1
Require second parameter of imagecrop()
2013-06-23 20:29:54 -07:00
Stanislav Malyshev
e02b41d25c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
2013-06-23 15:26:30 -07:00
Stanislav Malyshev
1beb24bd6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
Conflicts:
ext/sockets/sockets.c
2013-06-23 15:26:14 -07:00
Damjan Cvetko
a0b4348abc
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
2013-06-23 15:20:54 -07:00
Stanislav Malyshev
c593b42a0c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Adding test to verify that __sleep can handle parent classes' private members
Adding test to stabelize keys used when converting objects to arrays
2013-06-23 13:55:03 -07:00
Stanislav Malyshev
7272e3e722
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Adding test to verify that __sleep can handle parent classes' private members
Adding test to stabelize keys used when converting objects to arrays
2013-06-23 13:54:50 -07:00
Marco Pivetta
f1e37d03c1
Adding test to verify that __sleep can handle parent classes' private members
2013-06-23 13:53:46 -07:00
Marco Pivetta
61fb822d1a
Adding test to stabelize keys used when converting objects to arrays
2013-06-23 13:53:37 -07:00
Adam Harvey
f94f17397e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #65088 (Generated configure script is malformed on OpenBSD).
2013-06-23 11:04:36 -07:00
Adam Harvey
296a12efbb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65088 (Generated configure script is malformed on OpenBSD).
2013-06-23 11:04:10 -07:00
Adam Harvey
2531307be6
Fix bug #65088 (Generated configure script is malformed on OpenBSD).
...
We fell foul of a "common urban legend"[0], which resulted in us backslash
escaping double quotes that we didn't need to in acinclude.m4. This worked fine
on most shells, but OpenBSD's ksh implementation really didn't like it.
[0] http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Shell-Substitutions.html
2013-06-23 11:02:00 -07:00
Remi Collet
20dbd27108
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL
2013-06-21 14:11:33 +02:00
Remi Collet
fc898ee0f9
Fixed Bug #65060 imagecreatefrom... crashes with user streams
...
Fixed Bug #65084 imagecreatefromjpeg fails with URL
Regression introduced in 8a90aad (drop of USE_GD_IOCTX)
Secure with php_stream_can_cast to avoid segfault in php_stream_cast.
(encountered when imagecreatefromxpm with URL)
2013-06-21 14:11:04 +02:00
Ard Biesheuvel
9b22faa5b8
Merge branch 'PHP-5.5'
2013-06-21 11:27:23 +02:00
Ard Biesheuvel
162726241c
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
2013-06-21 11:26:37 +02:00
Ard Biesheuvel
8623562b02
Fix non-specialized executor build
...
Removed a couple of calls to FREE_OP2() that were left behind in
the handlers for break and continue opcodes after commit 7628da98
2013-06-21 11:25:23 +02:00
Pierre Joye
4718f892cb
Merge branch 'master' of git.php.net:php-src
2013-06-20 22:34:04 +02:00
Pierre Joye
a1d0a869be
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix #65070 , bgcolor does not use the same format as the input image with imagerotate
fix #65070 , bgcolor does not use the same format as the input image with imagerotate
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Change the search in get_status_string() to correctly handle unknown codes.
Update git rules (5.5 is stable, 5.3 sec only)
skip test for bug #64936 when tokenizer not built
Bump version
Update credits
Merge NEWS from PHP 5.4 branch
Reorder NEWS for PHP 5.5.0 final
Conflicts:
configure.in
ext/gd/libgd/gd_interpolation.c
main/php_version.h
2013-06-20 22:32:52 +02:00
Pierre Joye
c65d663aef
fix #65070 , bgcolor does not use the same format as the input image with imagerotate
2013-06-20 22:22:07 +02:00
Pierre Joye
876b474c7d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-06-20 22:19:53 +02:00
Pierre Joye
07e52857b5
fix #65070 , bgcolor does not use the same format as the input image with imagerotate
2013-06-20 22:19:33 +02:00
Adam Harvey
e41eb5272f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Change the search in get_status_string() to correctly handle unknown codes.
2013-06-20 09:43:00 -07:00
Adam Harvey
77c46ba516
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Change the search in get_status_string() to correctly handle unknown codes.
2013-06-20 09:39:37 -07:00
Adam Harvey
f5c7fe9202
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
...
Specifically: php_cli_server_http_reponse_status_code_pair →
php_cli_server_http_response_status_code_pair.
2013-06-20 09:34:21 -07:00
Adam Harvey
283f56af66
Change the search in get_status_string() to correctly handle unknown codes.
...
This previously used a buggy implementation of binary search that would loop
infinitely for unknown codes when searching in reason arrays of particular
sizes (such as the one we have at the moment). Since C provides bsearch(),
we'll just use that instead, since libc authors hopefully get this right.
There was also an additional bug that was masked by the first one: the design
was that an unknown code would result in get_status_string() returning NULL,
which would then result in a segfault in append_http_status_line(), since it
assumed that it would always receive a valid string pointer that could be
handed off to smart_str_appends_ex(). We'll now return a placeholder in that
case.
Fixes bug #65066 (Cli server not responsive when responding with 422 http
status code).
2013-06-20 09:31:57 -07:00
Ard Biesheuvel
4cd2b7212f
Fix non-specialized executor build
...
Removed a couple of calls to FREE_OP2() that were left behind in
the handlers for break and continue opcodes after commit 7628da98
2013-06-20 17:26:05 +02:00
Johannes Schlüter
3e6b312b55
Merge branch 'PHP-5.5'
2013-06-20 11:57:56 +02:00
Johannes Schlüter
94e7549719
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-20 11:57:10 +02:00
Johannes Schlüter
b5978e239e
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-20 11:52:29 +02:00
Johannes Schlüter
e4ee921b7e
Update git rules (5.5 is stable, 5.3 sec only)
2013-06-20 11:51:21 +02:00
Remi Collet
a964c5def8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
skip test for bug #64936 when tokenizer not built
2013-06-20 08:43:11 +02:00
Remi Collet
60afd3fce4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
skip test for bug #64936 when tokenizer not built
2013-06-20 08:42:30 +02:00
Remi Collet
9be591bdb5
skip test for bug #64936 when tokenizer not built
2013-06-20 08:42:07 +02:00
David Soria Parra
f77e3be102
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Bump version
Update credits
Merge NEWS from PHP 5.4 branch
Reorder NEWS for PHP 5.5.0 final
2013-06-19 22:14:08 +02:00
David Soria Parra
83fc53acb9
Bump version
2013-06-19 22:11:52 +02:00
David Soria Parra
c1b8fbc112
Update credits
2013-06-19 22:03:18 +02:00
David Soria Parra
8547628fec
Merge NEWS from PHP 5.4 branch
2013-06-19 21:54:34 +02:00
David Soria Parra
2bac1ff137
Reorder NEWS for PHP 5.5.0 final
2013-06-19 21:50:05 +02:00
Pierre Joye
d5b1111fb0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add notes about opcache windows issue and migration from APC
2013-06-19 17:59:30 +02:00
Pierre Joye
0a6ec7a2c9
add notes about opcache windows issue and migration from APC
2013-06-19 17:57:08 +02:00
Anatol Belski
d9f538bc68
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added some tests based on bug #64395
2013-06-19 16:25:08 +02:00
Anatol Belski
2873b5b6eb
added some tests based on bug #64395
2013-06-19 16:24:30 +02:00
Johannes Schlüter
96c1e0440b
Merge branch 'PHP-5.5'
2013-06-19 15:09:45 +02:00
Johannes Schlüter
c6b8d992ba
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-19 15:09:33 +02:00
Johannes Schlüter
0e55d3a12a
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-19 15:09:04 +02:00
Johannes Schlüter
f0eaa02f6f
This will be PHP 5.3.28
2013-06-19 15:08:02 +02:00
Remi Collet
04b2f8d53e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Related to bug #65047 (Test skip on client / server version)
2013-06-19 12:27:12 +02:00
Remi Collet
fb68e0fe63
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Related to bug #65047 (Test skip on client / server version)
2013-06-19 12:26:53 +02:00
Remi Collet
67bde2f8ac
Related to bug #65047 (Test skip on client / server version)
...
bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)
bug_49985.phpt
Make result "locale" independent
2013-06-19 12:26:21 +02:00
Matteo Beccati
77032bcd9c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65047 (Test skip on client / server version)
Remove broken client version checking
Clean up leftover file after the test
2013-06-19 11:53:21 +02:00
Matteo Beccati
9b8259cdfa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65047 (Test skip on client / server version)
Remove broken client version checking
Clean up leftover file after the test
2013-06-19 11:53:05 +02:00
Matteo Beccati
c666239265
Fixed bug #65047 (Test skip on client / server version)
2013-06-19 11:48:03 +02:00
Matteo Beccati
25e9aa6b0a
Remove broken client version checking
2013-06-19 11:48:03 +02:00
Matteo Beccati
5edd530511
Clean up leftover file after the test
2013-06-19 11:48:03 +02:00
Stanislav Malyshev
07a38ea80c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
sync NEWS
2013-06-18 23:09:36 -07:00
Stanislav Malyshev
7b08c7f4e7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
sync NEWS
2013-06-18 23:09:29 -07:00
Stanislav Malyshev
e2bb74ab4f
sync NEWS
2013-06-18 23:06:20 -07:00
Stanislav Malyshev
a984dd4eb4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.4.18 next
2013-06-18 22:59:34 -07:00
Stanislav Malyshev
59d4d41efb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.18 next
Conflicts:
configure.in
main/php_version.h
2013-06-18 22:59:26 -07:00
Stanislav Malyshev
dda3f404ec
5.4.18 next
2013-06-18 22:58:11 -07:00
Xinchen Hui
ce1cb1f7a6
Merge branch 'PHP-5.5'
2013-06-19 11:17:55 +08:00
Xinchen Hui
bb9928c343
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-19 11:17:44 +08:00
Xinchen Hui
2ce4bd7f2d
Fix test typo
2013-06-19 11:15:52 +08:00
Nikita Popov
42729c1baf
Merge branch 'PHP-5.5'
2013-06-17 23:49:08 +02:00
Nikita Popov
86434be946
Fix bug #65051 : count() off by one inside unset()
...
nNumOfElements was incremented after the pDestructor code, so any
code in the dtor would get a wrong number of elements.
Right now the bucket deletion code is replicated in four places,
it should probably be moved off into one function (or rather,
zend_hash_apply_deleter should be used everywhere). The codes are
subtly different though in that the HANDLE_UNBLOCK_INTERRUPTIONS()
happens in different places. In particular it seems odd that in
some cases interruptions stay blocked during the destructor call.
2013-06-17 23:44:13 +02:00
Nikita Popov
ae91084067
Remove unnecessary NULL checks from zend_hash
...
Our memory allocation functions (including the persistent ones)
are infallible, so no need to check for NULL.
2013-06-17 18:51:59 +02:00
Nikita Popov
ca660c2f77
Update NEWS, UPGRADING and UPGRADING.INTERNALS
2013-06-17 18:27:22 +02:00
Nikita Popov
7713b8c2ac
GMP improvements
...
As per RFC https://wiki.php.net/rfc/operator_overloading_gmp
2013-06-17 17:59:12 +02:00
Nikita Popov
3823321c5c
Implement internal operator overloading
...
As pre RFC https://wiki.php.net/rfc/operator_overloading_gmp
2013-06-17 17:48:13 +02:00
Stanislav Malyshev
1143f58a70
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/320'
Merge branch 'pull-request/320'
2013-06-17 01:07:28 -07:00
Stanislav Malyshev
d587efb7ee
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Merge branch 'pull-request/320'
2013-06-17 01:06:28 -07:00
Stanislav Malyshev
af5e2eaf8d
Merge branch 'pull-request/320'
...
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572 : Clean up after the test
Fix #64572 : Clean up after the test
2013-06-17 01:06:20 -07:00
Stanislav Malyshev
6b896fa57f
Merge branch 'pull-request/320'
...
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572 : Clean up after the test
Fix #64572 : Clean up after the test
2013-06-17 01:06:01 -07:00
Stanislav Malyshev
a434251322
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724
2013-06-17 00:42:36 -07:00
Stanislav Malyshev
a080611e48
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724
2013-06-17 00:42:21 -07:00
Daniel Beardsley
5ac0ee30ce
Tests: PDO Mysql - update for fixed getColumnMeta()
...
The test has always been disabled... so it's never run anyway. Oh well.
2013-06-17 00:41:21 -07:00
Antony Dovgal
95cc763a14
fix bug #48724
...
PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
2013-06-17 00:27:21 -07:00
Stanislav Malyshev
a72fc256f4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
readline can output control codes
Bug #55694 : Update readline test to support attempted_completion_over variable
Bug #55694 : Expose attempted_completion_over variable from readline library
2013-06-17 00:17:28 -07:00
Stanislav Malyshev
69d187de02
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
readline can output control codes
Bug #55694 : Update readline test to support attempted_completion_over variable
Bug #55694 : Expose attempted_completion_over variable from readline library
2013-06-17 00:17:06 -07:00
Stanislav Malyshev
248414f132
readline can output control codes
2013-06-17 00:15:31 -07:00
Hartmel
272c5edea4
Bug #55694 : Update readline test to support attempted_completion_over variable
2013-06-16 23:44:44 -07:00
Hartmel
ca3e0862db
Bug #55694 : Expose attempted_completion_over variable from readline library
2013-06-16 23:42:43 -07:00
Xinchen Hui
875df12c0b
Merge branch 'PHP-5.5'
2013-06-17 13:25:04 +08:00
Xinchen Hui
aa2369f85a
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-17 13:23:24 +08:00
Xinchen Hui
cfb1ffb4fa
Fix typo in test
2013-06-17 13:22:20 +08:00
Stanislav Malyshev
dea16af29a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Identation Fixed
Identation Fixed
2013-06-16 18:14:32 -07:00
Stanislav Malyshev
9bfb28c793
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Identation Fixed
2013-06-16 18:14:16 -07:00
Jefersson Nathan
ebef8c4176
Identation Fixed
2013-06-16 18:13:49 -07:00
Stanislav Malyshev
59280d910a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Identation Fixed
2013-06-16 18:13:26 -07:00
Jefersson Nathan
1498b8260b
Identation Fixed
2013-06-16 18:13:14 -07:00
Stanislav Malyshev
8b3d31c1c3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64764 : Add status option to fpm init.d script
2013-06-16 16:56:38 -07:00
Stanislav Malyshev
a770ae36c2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64764 : Add status option to fpm init.d script
2013-06-16 16:56:29 -07:00
Lior Kaplan
ee01af7df1
Fix bug #64764 : Add status option to fpm init.d script
2013-06-16 16:54:49 -07:00
Stanislav Malyshev
7978e44f08
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update NEWS
2013-06-16 16:41:37 -07:00
Stanislav Malyshev
44822a7166
update NEWS
2013-06-16 16:41:23 -07:00
Stanislav Malyshev
97c56e1eb1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
news for #64166
2013-06-16 16:40:56 -07:00
Stanislav Malyshev
d44daff4d0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
news for #64166
2013-06-16 16:40:52 -07:00
Stanislav Malyshev
2a93fd1347
news for #64166
2013-06-16 16:40:39 -07:00
Stanislav Malyshev
e3cd0d1417
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add more tests for bug #64166
Move unsigned char declaration to top of block
trailing ws
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
2013-06-16 16:39:06 -07:00
Stanislav Malyshev
7d1fef15cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add more tests for bug #64166
Move unsigned char declaration to top of block
trailing ws
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
2013-06-16 16:38:49 -07:00
Stanislav Malyshev
7bb052ee3e
add more tests for bug #64166
2013-06-16 16:34:34 -07:00
Michael M Slusarz
0dc98208ee
Move unsigned char declaration to top of block
2013-06-16 16:04:29 -07:00
Michael M Slusarz
d9c034ee5e
trailing ws
2013-06-16 16:04:24 -07:00
Michael M Slusarz
b5b0a53b09
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
Second attempt: need to use lookaheadto determine whether to encode ws
2013-06-16 16:04:19 -07:00
Michael M Slusarz
600d6deef9
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.
2013-06-16 16:04:14 -07:00
Stanislav Malyshev
6db7e31fa6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix
2013-06-16 15:30:44 -07:00
Stanislav Malyshev
ac343d5c1f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h
2013-06-16 15:29:25 -07:00
Stanislav Malyshev
2208447d42
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
2013-06-16 15:22:23 -07:00
Stanislav Malyshev
088c183639
ws fix
2013-06-16 15:22:23 -07:00
Anatol Belski
fd706595d4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix test
2013-06-17 00:11:05 +02:00
Anatol Belski
3625b83aaa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2013-06-17 00:10:32 +02:00
Anatol Belski
b6dd1ec60d
fix test
...
breach introduced in ac40c0b562
2013-06-17 00:09:05 +02:00
Xinchen Hui
0842d5c06e
Merge branch 'PHP-5.5'
2013-06-16 22:57:01 +08:00
Xinchen Hui
e3e4ec3f55
Update NEWS
2013-06-16 22:56:47 +08:00
Xinchen Hui
6cd6349ff8
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-16 22:56:22 +08:00
Xinchen Hui
49e57a3165
Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)
2013-06-16 22:55:59 +08:00
Boris Lytochkin
3457096758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix typo in test
2013-06-16 00:10:06 +04:00
Boris Lytochkin
3dd2de3f45
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo in test
2013-06-16 00:09:55 +04:00
Boris Lytochkin
7457867ba8
fix typo in test
2013-06-16 00:09:18 +04:00
Boris Lytochkin
6ab78c9fde
Merge branch 'master' of https://git.php.net/push/php-src
...
* 'master' of https://git.php.net/push/php-src: (171 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fixed EOL
added closing ?>
fix double entry
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
split the test for 32 and 64 bit
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
fixed the test
Fix a BC breach related to bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
...
2013-06-16 00:04:22 +04:00
Boris Lytochkin
0741697107
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/push/php-src: (147 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fixed EOL
added closing ?>
fix double entry
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
split the test for 32 and 64 bit
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
fixed the test
Fix a BC breach related to bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
...
2013-06-16 00:04:00 +04:00
Boris Lytochkin
8acfa0b3f8
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/push/php-src: (76 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fix double entry
Merge branch 'pull-request/341'
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
Fixed test script
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Callback has to be restored in MSHUTDOWN
Update NEWs
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
Fixed merge wrongly
...
2013-06-16 00:03:30 +04:00
Matteo Beccati
55656d616c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:56:04 +02:00
Matteo Beccati
6f594514b0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:55:12 +02:00
Matteo Beccati
02f552ceca
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:54:32 +02:00
Matteo Beccati
6238dd6f32
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:51:54 +02:00
Stanislav Malyshev
3716599502
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix test for bug #60322
2013-06-13 10:31:31 -07:00
Stanislav Malyshev
e74776266f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test for bug #60322
2013-06-13 10:30:18 -07:00
Stanislav Malyshev
10b9579395
fix test for bug #60322
2013-06-13 10:30:00 -07:00
Anatol Belski
c1772cc3df
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ensure the error_reporting level to get expected notice
2013-06-12 13:15:32 +02:00
Anatol Belski
a0cb61b292
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
ensure the error_reporting level to get expected notice
2013-06-12 13:15:18 +02:00
Anatol Belski
ed2690477c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
ensure the error_reporting level to get expected notice
2013-06-12 13:14:53 +02:00
Anatol Belski
cd1b44c4b6
ensure the error_reporting level to get expected notice
2013-06-12 13:13:48 +02:00
Anatol Belski
00ba7d416f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed tests
2013-06-11 12:40:30 +02:00
Anatol Belski
cb542d3c83
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed tests
2013-06-11 12:39:50 +02:00
Anatol Belski
1cc750493f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed tests
2013-06-11 12:39:28 +02:00
Anatol Belski
eccc05fc44
fixed tests
2013-06-11 12:38:49 +02:00
Anatol Belski
da094040fb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
missing tests for bug #53437
2013-06-11 11:24:33 +02:00
Anatol Belski
7704e40d8f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
missing tests for bug #53437
2013-06-11 11:24:16 +02:00
Anatol Belski
251ec84a97
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
missing tests for bug #53437
2013-06-11 11:22:55 +02:00
Anatol Belski
f16143f5ac
missing tests for bug #53437
2013-06-11 11:19:57 +02:00
Anatol Belski
8b74d46026
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed EOL
2013-06-11 08:33:19 +02:00
Anatol Belski
bd4f6ad8a0
fixed EOL
2013-06-11 08:32:54 +02:00
Anatol Belski
c90e95baf6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added closing ?>
2013-06-11 08:26:07 +02:00
Anatol Belski
28e264db2a
added closing ?>
2013-06-11 08:25:38 +02:00
Stanislav Malyshev
4e56ac50e5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix double entry
Merge branch 'pull-request/341'
2013-06-10 18:16:23 -07:00
Stanislav Malyshev
8acf9a4fe6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix double entry
Merge branch 'pull-request/341'
2013-06-10 18:16:09 -07:00
Stanislav Malyshev
760b7d00c3
fix double entry
2013-06-10 18:15:03 -07:00
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
4427d1dcfd
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Anatol Belski
d7c943e2a1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
split the test for 32 and 64 bit
2013-06-10 22:49:56 +02:00
Anatol Belski
ec79075394
split the test for 32 and 64 bit
2013-06-10 22:49:30 +02:00
Stanislav Malyshev
09bc6d7cf6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:37:56 -07:00
Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239
typo fixes (accommodate, parameter)
2013-06-10 13:36:03 -07:00
Anatol Belski
00495d160b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
missing colon
2013-06-10 19:55:51 +02:00
Anatol Belski
cf5b3fb166
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
missing colon
2013-06-10 19:55:30 +02:00
Anatol Belski
7a1e670d76
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
missing colon
2013-06-10 19:55:06 +02:00
Anatol Belski
18403e496d
missing colon
2013-06-10 19:54:29 +02:00
Anatol Belski
464ad59a3b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Backported the fix for bug #53437
Backported the fix for bug #53437
2013-06-10 19:53:27 +02:00
Anatol Belski
3a92c1beeb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Backported the fix for bug #53437
Backported the fix for bug #53437
2013-06-10 19:53:03 +02:00
Anatol Belski
0f9cf35315
Backported the fix for bug #53437
2013-06-10 19:52:29 +02:00
Anatol Belski
e1e07cb431
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Backported the fix for bug #53437
2013-06-10 19:49:31 +02:00
Anatol Belski
88c2dbe5fc
Backported the fix for bug #53437
2013-06-10 19:48:18 +02:00
Anatol Belski
b80b8373af
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed the test
2013-06-10 18:31:40 +02:00
Anatol Belski
760c85a70a
fixed the test
2013-06-10 18:31:18 +02:00
Anatol Belski
44d9060648
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix a BC breach related to bug #53437
2013-06-10 17:50:13 +02:00
Anatol Belski
02f3922047
Fix a BC breach related to bug #53437
...
days and special_amount properties are exported as int again
2013-06-10 17:48:13 +02:00
Xinchen Hui
1689a7fe98
Merge branch 'PHP-5.5'
2013-06-10 21:33:47 +08:00
Xinchen Hui
a9d005c04e
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_compile.c
2013-06-10 21:31:25 +08:00
Xinchen Hui
d8792d87cf
Fixed bug #64988 (Class loading order affects E_STRICT warning)
2013-06-10 21:26:11 +08:00
Stanislav Malyshev
9069d4081d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix image method signatures
2013-06-10 02:24:10 -07:00
Jakub Vrana
46d3738d0a
Fix image method signatures
2013-06-10 02:24:03 -07:00
Jakub Vrana
b787fdebba
Fix image method signatures
2013-06-10 02:13:13 -07:00
Dmitry Stogov
53c39e2b4e
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
2013-06-10 12:59:28 +04:00
Dmitry Stogov
ed0767f5d4
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Fix spelling and correct typo.
2013-06-10 12:59:09 +04:00
Dmitry Stogov
36dc1ed4b0
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Fix spelling and correct typo.
2013-06-10 12:57:36 +04:00
Dmitry Stogov
56c9a2f4f6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed test script
2013-06-10 12:56:33 +04:00
Dmitry Stogov
ef20fdb338
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test script
2013-06-10 12:55:51 +04:00
Dmitry Stogov
f68b8a5e74
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed test script
2013-06-10 12:54:54 +04:00
Stanislav Malyshev
1355908149
Merge branch 'PHP-5.5'
...
* PHP-5.5:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
2013-06-10 01:53:36 -07:00
Stanislav Malyshev
7a2d9690fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
2013-06-10 01:53:29 -07:00
Dmitry Stogov
f5f6404260
Fixed test script
2013-06-10 12:53:19 +04:00
Antonio Diaz Ruiz
8a8bef1b73
PHPTests for the DOMDocument::loadHTMLfile method.
...
They cover
- The basic behaviour
- When the method receives as argument a file which doesn't exist
- When the argument is an empty string
- When an empty file is loaded
- When a not-well formed html file is loaded
It also includes 2 auxilary files
- An empty html file
- A not well formed html file
2013-06-10 01:50:00 -07:00
Stanislav Malyshev
f9822bd099
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix spelling and correct typo.
2013-06-10 01:42:41 -07:00
Stanislav Malyshev
20df5f8f24
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix spelling and correct typo.
2013-06-10 01:42:32 -07:00
Carson McDonald
f4e3c7ab7c
Fix spelling and correct typo.
2013-06-10 01:42:27 -07:00
Stanislav Malyshev
8697c27000
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix spelling and correct typo.
2013-06-10 01:41:26 -07:00
Stanislav Malyshev
de1688d16e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix spelling and correct typo.
2013-06-10 01:41:16 -07:00
Carson McDonald
b8cf17635e
Fix spelling and correct typo.
2013-06-10 01:40:41 -07:00
Dmitry Stogov
14a943ae86
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Callback has to be restored in MSHUTDOWN
2013-06-10 12:34:34 +04:00
Dmitry Stogov
731b4a3fa4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Callback has to be restored in MSHUTDOWN
2013-06-10 12:34:08 +04:00
Dmitry Stogov
336a8e1943
Callback has to be restored in MSHUTDOWN
2013-06-10 12:32:53 +04:00
Dmitry Stogov
738dfc69e7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed comments
2013-06-10 12:06:14 +04:00
Dmitry Stogov
53e6529203
Fixed comments
2013-06-10 12:05:20 +04:00
Dmitry Stogov
95d88cc66a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Avoid multiple allocations of the same key in different processes
2013-06-10 11:44:54 +04:00
Dmitry Stogov
23a9bb09ba
Avoid multiple allocations of the same key in different processes
2013-06-10 11:43:03 +04:00
Dmitry Stogov
456ef2ebfa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Compact HashTables before storing them in shared memory
Conflicts:
ext/opcache/ZendAccelerator.c
2013-06-10 11:25:41 +04:00
Dmitry Stogov
540488bf55
Compact HashTables before storing them in shared memory
2013-06-10 11:22:19 +04:00
Dmitry Stogov
841e1f0364
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use size_t instead of int
2013-06-10 10:37:53 +04:00
Dmitry Stogov
2e9d3e8b39
Use size_t instead of int
2013-06-10 10:36:35 +04:00
Xinchen Hui
00c7440b81
Merge branch 'PHP-5.5'
2013-06-09 22:26:18 +08:00
Xinchen Hui
8ae43caeee
Update NEWS
2013-06-09 22:26:07 +08:00
Xinchen Hui
3f229f4364
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-09 22:25:49 +08:00
Xinchen Hui
fdd7379686
Update NEWs
2013-06-09 22:25:28 +08:00
Xinchen Hui
f338510c94
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-09 22:25:07 +08:00
Xinchen Hui
75c57122e3
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
2013-06-09 22:24:48 +08:00
Xinchen Hui
afe547d335
Merge branch 'PHP-5.5'
2013-06-09 14:26:16 +08:00
Xinchen Hui
b839e6921d
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
2013-06-09 14:25:53 +08:00
Xinchen Hui
e14800dd46
Fixed merge wrongly
2013-06-09 14:24:05 +08:00
Xinchen Hui
4600578830
Merge branch 'PHP-5.5'
2013-06-09 13:50:06 +08:00
Xinchen Hui
6139358804
Update NEWS
2013-06-09 13:49:43 +08:00
Xinchen Hui
f372e00332
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
2013-06-09 13:49:26 +08:00
Xinchen Hui
3cc891bf3a
Update NEWS
2013-06-09 13:39:40 +08:00
Xinchen Hui
ab22fda7e5
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-09 13:35:45 +08:00
Xinchen Hui
e8f004d542
Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
2013-06-09 13:20:40 +08:00
Matteo Beccati
2c0f09540e
Fixed signedness warning
2013-06-07 09:38:58 +02:00
Matteo Beccati
a649f42b20
NEWS
2013-06-07 09:36:54 +02:00
Matteo Beccati
19ead23e8e
Fixed bug #63657 (pgsqlCopyFrom/To methods use Postgres < 7.3 syntax)
...
Although still supported (for now), I've replaced with pre-9.0 syntax.
Still not cutting edge, but it works with any version PDO_pgsql is
compatible with (7.4+) and will possibly keep working for longer than
what we already had.
2013-06-07 09:36:54 +02:00
Matteo Beccati
2f7f34374c
NEWS
2013-06-07 09:36:53 +02:00
Stanislav Malyshev
fbf1dff674
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix 5.4.16 date
2013-06-06 13:27:39 -07:00
Stanislav Malyshev
bccacb6308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix 5.4.16 date
2013-06-06 13:27:25 -07:00
Stanislav Malyshev
a7e25bdd48
fix 5.4.16 date
2013-06-06 13:27:04 -07:00
Anatol Belski
73c627ccd5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix NEWS
2013-06-06 18:58:23 +02:00
Anatol Belski
25980d4db5
fix NEWS
2013-06-06 18:57:20 +02:00
Anatol Belski
c6b569011a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:53:41 +02:00
Anatol Belski
f47e879235
updated NEWS
2013-06-06 18:53:22 +02:00
Anatol Belski
bbdbef40db
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:52:39 +02:00
Anatol Belski
4b96b8f909
updated NEWS
2013-06-06 18:52:05 +02:00
Anatol Belski
25cae37b13
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:51:32 +02:00
Anatol Belski
1aee7ad636
Fixed bug #64934 Apache2 TS crash with get_browser()
...
In favour of reading the browscap.ini into a true global var
only once in MINIT, the price for that is to deep copy the
any data from it.
2013-06-06 18:49:04 +02:00
David Soria Parra
83580ea956
Merge branch 'PHP-5.5'
...
* PHP-5.5:
News update
PHP 5.5.0RC3 NEWS
2013-06-05 23:09:27 +02:00
David Soria Parra
c649186c31
News update
2013-06-05 23:08:48 +02:00
David Soria Parra
aef5295756
PHP 5.5.0RC3 NEWS
2013-06-05 23:06:51 +02:00
Johannes Schlüter
9a9f42767d
Merge branch 'PHP-5.5'
2013-06-05 16:35:27 +02:00
Johannes Schlüter
fdeefc466e
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-05 16:35:14 +02:00
Johannes Schlüter
5ee047b486
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-05 16:34:54 +02:00
Johannes Schlüter
ec3bcbcb5a
Add NEWS for PHP 5.3.26
2013-06-05 16:34:18 +02:00
Xinchen Hui
ecfc3599a7
Merge branch 'PHP-5.5'
2013-06-05 17:32:09 +08:00
Xinchen Hui
7da648ff2f
Update NEWS
2013-06-05 17:30:57 +08:00
Xinchen Hui
e89537f2a3
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-05 17:30:09 +08:00
Xinchen Hui
3c93402f86
Update NEWS
2013-06-05 17:29:04 +08:00
Xinchen Hui
f597f5561e
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-05 17:26:10 +08:00
Xinchen Hui
3c87945c95
Fixed bug #64960 (Segfault in gc_zval_possible_root)
2013-06-05 17:25:00 +08:00
Stanislav Malyshev
3c8c200d0a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 22:01:02 -07:00
Stanislav Malyshev
785f4c5fc6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 22:00:45 -07:00
Stanislav Malyshev
efdeec3c0e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 21:58:44 -07:00
Stanislav Malyshev
93e0d78ec6
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 21:56:33 -07:00
Matteo Beccati
b62b8b4528
Fixed Bug #42614 (PDO_pgsql: add pg_get_notify support)
2013-06-05 01:58:55 +02:00
Matteo Beccati
baabd11929
Refactored custom PDO_pgsql methods to trigger errors/exceptions
...
BC Break: the custom methods were previously just return false on
failure. Now they throw an exception with a proper error message.
An hopefully welcome improvement, but some application might be
depending on the old behaviour. FWIW the PDO::pgsqlCopy* methods
are not documented, even though they are available since 5.3.x.
2013-06-05 01:58:37 +02:00
Matteo Beccati
1e36e45d97
Allow PDO drivers custom methods to trigger errors/exceptions
...
Moved a few definitions from php_pdo_int.h to a new php_pdo_error.h
header file that can be included if drivers need PDO's own error
handling to be triggered within custom methods (e.g. PDO::pgsqlLOBOpen).
2013-06-04 16:49:16 +02:00
Stanislav Malyshev
b144c26319
Merge branch 'PHP-5.5'
...
* PHP-5.5:
news for dblib fixes
FIX BUG #55647 , #60512 , #60512 , #61900 , #64338 , #64808 , #63638
Fix PDO_DBLIB bugs: #64338 , #64808 , #63638
Conflicts:
ext/pdo_dblib/dblib_driver.c
ext/pdo_dblib/dblib_stmt.c
2013-06-03 22:03:25 -07:00
Stanislav Malyshev
74e52eaea9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
news for dblib fixes
Fix PDO_DBLIB bugs: #64338 , #64808 , #63638
Conflicts:
ext/pdo_dblib/dblib_driver.c
ext/pdo_dblib/dblib_stmt.c
2013-06-03 22:00:51 -07:00
Stanislav Malyshev
90bb28726b
news for dblib fixes
2013-06-03 21:54:50 -07:00
Stanley Sufficool
d8f938c784
FIX BUG #55647 , #60512 , #60512 , #61900 , #64338 , #64808 , #63638
...
Return an error on passwords longer than 30 chars instead of segfault.
Set error and message handlers properly.
Do not segfault in out of bound colnums in getColumnMeta()
Fix DBSETOPT to use a blank string instead of NULL to stop FreeTDS complaints.
Use DBSETLDBNAME for compatibillity with SQL Azure.
2013-06-03 20:34:47 -07:00
Stanley Sufficool
5a04ab9a54
Fix PDO_DBLIB bugs: #64338 , #64808 , #63638
...
Synchronize with master
2013-06-03 20:02:08 -07:00
Remi Collet
57dd91be82
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #64962 imagerotate produce corrupted image
2013-06-03 15:02:43 +02:00
Remi Collet
3579e81200
Fixed Bug #64962 imagerotate produce corrupted image
...
See https://bitbucket.org/libgd/gd-libgd/issue/67/problem-with-gdrotate
This computation need to be done in signed range.
2013-06-03 15:01:48 +02:00
Remi Collet
809b13d67b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Fixed Bug #64961 segfault in imagesetinterpolation
2013-06-03 14:17:22 +02:00
Remi Collet
245e103ed3
NEWS
2013-06-03 14:17:00 +02:00
Remi Collet
99ea60c2dd
Fixed Bug #64961 segfault in imagesetinterpolation
...
enum type are not long ;) so cannot be used as zend_parse_parameters arg.
2013-06-03 14:15:18 +02:00
Matteo Beccati
760099c2e6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Clean up leftover test files
Improved test portability so that it doesn't fail with pdo_pgsql
Fix PDO::inTransaction() test for pgsql
2013-06-02 13:39:45 +02:00
Matteo Beccati
ad135fc69f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Clean up leftover test files
Improved test portability so that it doesn't fail with pdo_pgsql
Fix PDO::inTransaction() test for pgsql
2013-06-02 13:39:38 +02:00
Matteo Beccati
7360f0f1e6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Clean up leftover test files
2013-06-02 13:39:19 +02:00
Matteo Beccati
2463e89794
Clean up leftover test files
2013-06-02 13:38:43 +02:00
Matteo Beccati
a98359b7b9
Improved test portability so that it doesn't fail with pdo_pgsql
2013-06-02 13:32:48 +02:00
Nikita Popov
cbf90b1a90
Fix PDO::inTransaction() test for pgsql
...
inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.
2013-06-02 13:28:30 +02:00
Matteo Beccati
ab25fcb2a1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:34:14 +02:00
Matteo Beccati
d5a1c0cae2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:34:05 +02:00
Matteo Beccati
51c065f611
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:33:54 +02:00
Matteo Beccati
25aae37229
Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:29:35 +02:00
Matteo Beccati
924605eeb4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #62857 (bytea test failures)
2013-06-01 23:23:31 +02:00
Matteo Beccati
d9c2eecec0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62857 (bytea test failures)
2013-06-01 23:23:14 +02:00
Matteo Beccati
de42833115
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62857 (bytea test failures)
2013-06-01 23:22:50 +02:00
Matteo Beccati
79803bebde
Fixed bug #62857 (bytea test failures)
...
Postgres 9.1+ test fixes. Tests were failing due to the default
standard_conforming_strings GUC being changed to on. Also the
pg_escape_bytea test was encoding the data before estabilishing
a connection, thus falling back to the old escaping type which
isn't properly handled by the backend when using a default
configuration.
I haven't updated the NEWS file as it's just test fixes.
2013-06-01 23:15:48 +02:00
Stanley Sufficool
c34a2757db
FIX BUG #55647
...
PDO DBLIB was returning false if there were no results after a
statement was executed. This should be the fetch methods response
not the execute method response.
2013-06-01 00:38:09 -07:00
Stanley Sufficool
d9be9e0231
FIX BUG #60512 (the correct way this time)
...
Last fix just truncated the password. This fixes the message
handler per the bug report.
2013-06-01 00:03:44 -07:00
Stanley Sufficool
3b54de3db0
FIX BUG #60512
...
FreeTDS will segfault when passwords over 30 characters are used.
Truncate the password and let the server return an error if the
password is still invalid.
2013-05-31 23:58:16 -07:00
Stanley Sufficool
317653e694
FIX BUG #61900
...
PDO DBLIB was not setting error and message handlers when FreeTDS was used.
Updated to set error and message handlers the same way as mssql.
2013-05-31 23:24:57 -07:00
Stanley Sufficool
0e2bcf3373
FIX BUG #64338 , #64808 , #63638
...
PDO DBLIB would segfault on getcolumn meta when colno was
out of bounds. DBLIB connection specified null arg to dbsetopt
per Microsoft technical docs, but FreeTDS complains. The SQL USE
statement was invalid for SQL Azure, use DBSETLDBNAME instead.
2013-05-31 22:53:08 -07:00
Matteo Beccati
d22c7368e7
Merge branch 'PHP-5.5'
2013-05-31 16:27:16 +02:00
Matteo Beccati
d19e46d9d4
Merge branch 'PHP-5.4' into PHP-5.5
2013-05-31 16:27:01 +02:00
Matteo Beccati
a3b5b42e77
Merge branch 'PHP-5.3' into PHP-5.4
2013-05-31 16:26:54 +02:00
Matteo Beccati
598e2690b8
Merge branch 'pull-request/309' into PHP-5.3
2013-05-31 16:26:38 +02:00
Matteo Beccati
bf4a034e3e
NEWS
2013-05-31 16:26:06 +02:00
Matteo Beccati
510498947e
Slightly edited tests and fix for bug #62024
2013-05-31 16:19:58 +02:00
Matheus Degiovani
df6ca450ce
Fixed bug #62024 (unable to run consecutive prepared querys with null values)
...
Credits to james@kenjim.com for the patch.
2013-05-31 14:30:57 +02:00
Matheus Degiovani
65d233f06c
Fixed bug #64037 (wrong value returned when using a negative numeric field equal to the scale)
2013-05-31 14:30:51 +02:00
Remi Collet
f8b4c0815a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
NEWS
Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
Use size_t everywhere instead
This needs to be a long Otherwise we are limited to a 32G opcache segment
2013-05-31 08:46:18 +02:00
Remi Collet
c829895a1a
NEWS
2013-05-31 08:45:54 +02:00
Remi Collet
f3ca1d3125
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
2013-05-31 08:45:32 +02:00
Remi Collet
0c9f11758f
NEWS
2013-05-31 08:45:09 +02:00
Remi Collet
2dd67abb7d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
2013-05-31 08:44:33 +02:00
Remi Collet
1c623e3b07
Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
...
There is a lot of call such as:
pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, "Copy command failed");
Where the 3rd paramater is a error message string where a sqlstate (5 chars)
is expected. This cause a segfault in copy_from.phpt and copy_to.phpt.
This is only a sanity check to avoid buffer overflow, but obviously this
calls need to be fixed (using NULL or a correct sqlstate).
2013-05-31 08:39:32 +02:00
Stanley Sufficool
0074cd2675
pdo_dblib: fix bug #64522DBLIB statement destructor was being called late and clobbered results from subsequent statement objects sharing the same connection
2013-05-30 21:59:00 -07:00
Rasmus Lerdorf
4c762152bf
Use size_t everywhere instead
2013-05-29 14:34:53 -07:00
Rasmus Lerdorf
e02add77fc
Use size_t everywhere instead
2013-05-29 14:34:22 -07:00
Rasmus Lerdorf
80c13e9965
This needs to be a long
...
Otherwise we are limited to a 2G opcache segment
2013-05-29 14:26:42 -07:00
Rasmus Lerdorf
29ee4b81f2
This needs to be a long
...
Otherwise we are limited to a 32G opcache segment
2013-05-29 14:22:43 -07:00
Dmitry Stogov
029c1da846
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed incorrect argument number
2013-05-29 11:15:27 +04:00
Dmitry Stogov
7e00d0994f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed incorrect argument number
2013-05-29 11:14:15 +04:00
Dmitry Stogov
8b515fa00a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed incorrect argument number
Conflicts:
Zend/zend_compile.c
2013-05-29 11:12:43 +04:00
Dmitry Stogov
13e5c97ffd
Fixed incorrect argument number
2013-05-29 11:09:55 +04:00
Dmitry Stogov
ad90e90d90
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fix #64745 hash_pbkdf2 truncation issue
2013-05-29 00:02:37 +04:00
Dmitry Stogov
9e019f1099
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fix #64745 hash_pbkdf2 truncation issue
2013-05-29 00:02:13 +04:00
Dmitry Stogov
458f02c471
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed crash during search in empty persistent HashTable
2013-05-29 00:01:35 +04:00
Dmitry Stogov
6008ac8e32
Fixed crash during search in empty persistent HashTable
2013-05-28 23:45:36 +04:00
Anthony Ferrara
2129c70896
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #64745 hash_pbkdf2 truncation issue
2013-05-28 15:38:11 -04:00
Anthony Ferrara
540a5a52e8
Fix #64745 hash_pbkdf2 truncation issue
...
When using hash_pbkdf2 with hex output and 0 length (auto), it incorrectly
truncates the result to 1/2 the expected result.
2013-05-28 15:30:45 -04:00
Pierre Joye
8059ec1832
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix #64898imagerotate is broken with bilinear interpolation
2013-05-27 09:22:00 +02:00
Pierre Joye
2f01e06786
fix #64898imagerotate is broken with bilinear interpolation
2013-05-27 09:21:41 +02:00
Anatol Belski
6e081f8a82
Merge branch 'PHP-5.5'
...
* PHP-5.5:
reduced the file size even more
2013-05-25 00:11:09 +02:00
Anatol Belski
b262787ef9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
reduced the file size even more
2013-05-25 00:10:49 +02:00
Anatol Belski
bcdac7526d
reduced the file size even more
...
the first second is what at least has to be
2013-05-25 00:09:32 +02:00
Anatol Belski
3a3828669f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64916 finfo testcase contains copyrighted music.
2013-05-25 00:02:34 +02:00
Anatol Belski
fbdce3b6f6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64916 finfo testcase contains copyrighted music.
2013-05-25 00:02:09 +02:00
Anatol Belski
2d386db878
Fixed bug #64916 finfo testcase contains copyrighted music.
...
I wasn't able to produce a file causing exactly the same crash.
However the first three seconds of the originally reported
file are pretty enough to repro bug #64830 . That reduces its
size to 72k.
2013-05-24 23:58:31 +02:00
Remi Collet
76ad52ccc5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Fixed Bug #64915 (error_log ignored when daemonize=0)
2013-05-24 12:11:16 +02:00
Remi Collet
af13dded5c
NEWS
2013-05-24 12:11:04 +02:00
Remi Collet
433731d463
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #64915 (error_log ignored when daemonize=0)
2013-05-24 12:10:39 +02:00
Remi Collet
9f6ca9bc64
Fixed Bug #64915 (error_log ignored when daemonize=0)
...
Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.
2013-05-24 12:09:05 +02:00
David Soria Parra
cd23df35b2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
News for upcoming RC3 if necessary
News for RC2
2013-05-23 00:57:30 +02:00
David Soria Parra
2df1067036
News for upcoming RC3 if necessary
2013-05-23 00:44:42 +02:00
David Soria Parra
aa5f19cffb
News for RC2
2013-05-23 00:44:08 +02:00
Johannes Schlüter
925a71e583
Merge branch 'PHP-5.5'
2013-05-22 17:20:49 +02:00
Johannes Schlüter
4fe74f14c4
Merge branch 'PHP-5.4' into PHP-5.5
2013-05-22 17:19:58 +02:00
Johannes Schlüter
cd74b7d57e
Merge branch 'PHP-5.3' into PHP-5.4
2013-05-22 17:15:27 +02:00
Johannes Schlüter
4cb25d25f1
This will be PHP 5.3.27
2013-05-22 17:13:17 +02:00
Stanislav Malyshev
c53058763a
5.4.17 is next
2013-05-21 23:36:28 -07:00
Remi Collet
c50cef1dc5
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:30:50 +02:00
Remi Collet
88db679742
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
NEWS
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:30:00 +02:00
Remi Collet
93469a1d15
NEWS
2013-05-22 08:29:43 +02:00
Remi Collet
d64e8dd7a4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:29:30 +02:00
Remi Collet
73eedaf6f7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:29:08 +02:00
Remi Collet
013797588a
NEWS
2013-05-22 08:28:53 +02:00
Remi Collet
fc2a9d6e47
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:28:05 +02:00
Stanislav Malyshev
7b0d91643b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
merge NEWS from 5.3
fix order
2013-05-21 23:26:40 -07:00
Stanislav Malyshev
f5fcb591cc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
merge NEWS from 5.3
fix order
2013-05-21 23:26:23 -07:00
Stanislav Malyshev
0776337e28
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix order
2013-05-21 23:26:03 -07:00
Stanislav Malyshev
de4fd8638b
merge NEWS from 5.3
2013-05-21 23:25:46 -07:00
Stanislav Malyshev
d4ad889824
fix order
2013-05-21 23:25:35 -07:00
Sara Golemon
ee366ea516
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Don't double-quote name of namespaced function.
2013-05-19 13:35:09 -07:00
Remi Collet
57b35f1b0d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int): metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:09:22 +02:00
Remi Collet
4840ff0f05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int): metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:09:02 +02:00
Remi Collet
646ebc2cb9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int): metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:08:45 +02:00
Remi Collet
4828f7343b
Integer overflow in SndToJewish leads to php hang
...
AT least in (inputDay is long, metonicCycle is int):
metonicCycle = (inputDay + 310) / 6940;
So large value give strange (negative) results or php hangs.
This is patch already applied in some linux distro.
2013-05-21 18:04:17 +02:00
Andrey Hristov
e19b7c2b57
Merge branch 'PHP-5.5'
2013-05-21 13:28:09 +02:00
Andrey Hristov
378a5f9bfe
updates
2013-05-21 13:27:45 +02:00
Remi Collet
07c58d4191
Merge branch 'PHP-5.5'
...
* PHP-5.5:
UPGRADING
2013-05-21 12:32:23 +02:00
Remi Collet
ed9a9b6144
UPGRADING
2013-05-21 12:32:11 +02:00
Remi Collet
6dc95b4df3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
2013-05-21 09:54:54 +02:00
Remi Collet
70abac2b4e
NEWS
2013-05-21 09:54:39 +02:00
Remi Collet
c79f162c37
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
2013-05-21 09:53:51 +02:00
Remi Collet
0e99329e0a
Add --with-fpm-systemd option to report health to systemd, and
...
systemd_interval option to configure this. The service can now use
Type=notify in the systemd unit file.
Systemd status line will looks like:
Status: "Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic: 10req/sec"
Watchdog mode is also supported. In this case watchdog interval,
configured in the unit file, override the systemd_interval option.
When not used (default), no change from previous version.
2013-05-21 09:49:00 +02:00
Dmitry Stogov
bf146ad5b5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64720 (SegFault on zend_deactivate)
Conflicts:
NEWS
2013-05-21 10:33:57 +04:00
Dmitry Stogov
a2d6d27458
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64720 (SegFault on zend_deactivate)
Conflicts:
NEWS
2013-05-21 10:15:37 +04:00
Dmitry Stogov
77fffff157
Fixed bug #64720 (SegFault on zend_deactivate)
2013-05-21 09:58:11 +04:00
Stanislav Malyshev
1c41a495d4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add reporter
2013-05-20 02:02:46 -07:00
Stanislav Malyshev
49c1a223d5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add reporter
2013-05-20 02:02:34 -07:00
Stanislav Malyshev
1124b0678f
add reporter
2013-05-20 02:01:38 -07:00
Stanislav Malyshev
3ce366b7cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #64660 - yyparse can return 2, not only 1
2013-05-20 00:58:12 -07:00
Stanislav Malyshev
ac0aa5737e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #64660 - yyparse can return 2, not only 1
Conflicts:
Zend/zend_language_scanner.c
2013-05-20 00:57:34 -07:00
Stanislav Malyshev
fb58e69a84
fix bug #64660 - yyparse can return 2, not only 1
2013-05-20 00:52:38 -07:00
Stanislav Malyshev
fe1c83925c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix 5.4.16 relase date
2013-05-19 23:55:45 -07:00
Stanislav Malyshev
0f02c3aa29
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix 5.4.16 relase date
2013-05-19 23:55:38 -07:00
Stanislav Malyshev
7c66c502d0
fix 5.4.16 relase date
2013-05-19 23:55:12 -07:00
Sara Golemon
4f46a40b9d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Don't double-quote name of namespaced function.
2013-05-19 13:35:03 -07:00
Sara Golemon
2d7415a4af
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Don't double-quote name of namespaced function.
2013-05-19 13:34:57 -07:00
Sara Golemon
2d5695cbc5
Don't double-quote name of namespaced function.
...
ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)
was resulting in a function declaration of:
ns\"zend_name"()
including the errant quotes.
This diff corrects that. There are currently no uses of ZEND_NS_NAMED_FE
in core and reason to believe that there are no uses in the wild either.
2013-05-19 13:32:17 -07:00
Pierre Joye
9ef6b30dc3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
entry for #64214
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:51:18 +02:00
Pierre Joye
40d5458eff
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
entry for #64214
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:50:52 +02:00
Pierre Joye
b142e8825f
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-05-17 11:49:45 +02:00
Pierre Joye
aff65a0346
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
entry for #64214
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:49:33 +02:00
Pierre Joye
46b05bc57a
entry for #64214
2013-05-17 11:49:13 +02:00
Pierre Joye
3eb1745643
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:45:13 +02:00
Dmitry Stogov
76516701ae
Added missing ZE/OPcache related entries
2013-05-17 13:35:32 +04:00
Johannes Schlüter
22da0b7364
Recover NEWS
...
Apperently wrongly merged in revision 488933792a
2013-05-17 11:22:04 +02:00
Dmitry Stogov
273ad58295
Improved IS_VAR operands fetching
2013-05-17 13:15:09 +04:00
Sara Golemon
cfd1045822
Add optional second arg to unserialize()
...
Returns the number of bytes consumed by reference for
streaming unserialization.
Actual unserialization behavior is not modified at all.
The need for this came up while trying to parse SplDoublyLinkedList's
serialization format which uses a non-standard stream of serialized values.
2013-05-16 15:18:35 -07:00
Anatol Belski
bc656cde04
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed error handling for ext/sockets under win
2013-05-16 19:29:42 +02:00
Anatol Belski
d565e8f0eb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed error handling for ext/sockets under win
2013-05-16 19:29:25 +02:00
Anatol Belski
8dec06ea2a
Fixed error handling for ext/sockets under win
...
WSAGetLastError() must be the very next call after a socket
function had an invalid return. Any function call inbetween
will clear the error information.
2013-05-16 19:23:31 +02:00
Anatol Belski
2933f77e39
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
Fixed bug #64853Use of no longer available ini directives causes crash on TS build
2013-05-16 08:45:02 +02:00
Anatol Belski
07bd1fac57
updated NEWS
2013-05-16 08:44:36 +02:00
Anatol Belski
fda25c7ea6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64853Use of no longer available ini directives causes crash on TS build
2013-05-16 08:43:07 +02:00
Anatol Belski
d82704b677
Fixed bug #64853Use of no longer available ini directives causes crash on TS build
...
The fatal error for removed ini options is thrown before the executor
init, so ensure the relevant variables are initialized.
2013-05-16 08:40:56 +02:00
Pierre Joye
f5d5a50a1c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
2013-05-15 15:55:20 +02:00
Pierre Joye
ebadc02273
Merge branch 'master' of git.php.net:php-src
2013-05-15 15:55:13 +02:00
Pierre Joye
9accfee55f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
2013-05-15 15:54:52 +02:00
Pierre Joye
bfb50d17cb
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-05-15 15:54:46 +02:00
Pierre Joye
09470ebf35
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-05-15 15:53:57 +02:00
David Soria Parra
c5841f8cb7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix array_colum segfault
2013-05-15 14:43:03 +02:00
David Soria Parra
139e9824ad
Fix array_colum segfault
...
Separate zval to avoid gc from freeing
2013-05-15 14:42:39 +02:00
Anatol Belski
8fa8591cfa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixe preprocessor definition
2013-05-15 14:24:46 +02:00
Anatol Belski
082ee90b9b
fixe preprocessor definition
2013-05-15 14:24:21 +02:00
Anatol Belski
d8e44e3d70
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
2013-05-15 11:17:57 +02:00
Anatol Belski
077b575d51
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
2013-05-15 11:17:18 +02:00
Anatol Belski
de82e7edf7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
2013-05-15 11:14:58 +02:00
Anatol Belski
86db5fb4c2
Fix unitialized vars when sql.safe_mode=1
...
which can break the subsequent mysqlnd_connect() call
2013-05-15 11:12:17 +02:00
Pierre Joye
3ed4bf8fd9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
more check for php_stream_fopen_tmpfile failure
2013-05-14 16:46:40 +02:00
Pierre Joye
42a186e22d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
more check for php_stream_fopen_tmpfile failure
2013-05-14 16:46:32 +02:00
Pierre Joye
7ec2e5314e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
more check for php_stream_fopen_tmpfile failure
2013-05-14 16:45:56 +02:00
Pierre Joye
ba1af29805
more check for php_stream_fopen_tmpfile failure
2013-05-14 16:45:11 +02:00
Andrey Hristov
1f97fde89e
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-05-14 13:01:18 +02:00
Andrey Hristov
09cc4484a2
Merge branch 'master' of ssh://git.php.net/php-src
2013-05-14 12:57:19 +02:00
Andrey Hristov
47c5ba4c0c
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-05-14 12:57:02 +02:00
Andrey Hristov
9d2dda9058
Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C
2013-05-14 11:26:35 +02:00
Anatol Belski
b1480987f9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated libmagic.patch after fix for #64830
2013-05-14 11:16:17 +02:00
Anatol Belski
75ee1a6113
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch after fix for #64830
2013-05-14 11:16:01 +02:00
Anatol Belski
1a46a102d9
updated libmagic.patch after fix for #64830
2013-05-14 11:14:37 +02:00
Anatol Belski
8c36156070
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-05-14 09:45:02 +02:00
Anatol Belski
ad210f2c10
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-05-14 09:44:48 +02:00
Anatol Belski
4206e2d870
Merge branch 'master' of git.php.net:php-src
2013-05-14 09:44:36 +02:00
Anatol Belski
1f2e0cb8f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:42:57 +02:00
Anatol Belski
2626819d65
updated NEWS
2013-05-14 09:42:34 +02:00
Anatol Belski
933e01bbac
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:41:38 +02:00
Anatol Belski
74555e7c26
Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:40:43 +02:00
Pierre Joye
bb5f8626eb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:38 +02:00
Pierre Joye
362402d748
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:30 +02:00
Pierre Joye
f37c54ab27
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:17 +02:00
Pierre Joye
533e636a62
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:20:53 +02:00
Anatol Belski
65fda25024
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix heap overflow warnings on win x64 debug crt
2013-05-13 14:27:12 +02:00
Anatol Belski
e191cb63ba
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix heap overflow warnings on win x64 debug crt
2013-05-13 14:26:50 +02:00
Anatol Belski
156576fcce
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix heap overflow warnings on win x64 debug crt
2013-05-13 14:25:25 +02:00
Anatol Belski
fe21accfb4
fix heap overflow warnings on win x64 debug crt
2013-05-13 14:24:21 +02:00
Anatol Belski
39d48c4bfa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64825 Invalid free unserializing DateTimeZone
2013-05-12 21:30:21 +02:00
Anatol Belski
e44849b0f4
Fixed bug #64825 Invalid free unserializing DateTimeZone
2013-05-12 21:29:16 +02:00
Anatol Belski
1477471f6c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
2013-05-12 14:10:24 +02:00
Anatol Belski
3fd39c13f9
updated NEWS
2013-05-12 14:09:59 +02:00
Anatol Belski
2d8ce75f39
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
2013-05-12 14:09:16 +02:00
Anatol Belski
89159926ad
updated NEWS
2013-05-12 14:08:42 +02:00
Anatol Belski
dd188e9538
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
2013-05-12 14:06:59 +02:00
Anatol Belski
d6505acbf5
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
...
If user inherits Exception and overrides the properties to arbitrary data types,
or simply doesn't run parent::__construct(), here we go. Just convert everything
to the appropriate data type, like Exception::__toString() does.
2013-05-12 14:00:32 +02:00
Anatol Belski
cf72450c88
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed variable corruption under win x64
2013-05-11 02:48:24 +02:00
Anatol Belski
95ea1e7ca7
fixed variable corruption under win x64
2013-05-11 02:47:48 +02:00
Xinchen Hui
b3f6cc20e0
Merge branch 'PHP-5.4' into PHP-5.5
2013-05-09 15:57:44 +08:00
Xinchen Hui
699dc04c55
Missed SKIPIF
2013-05-09 15:57:25 +08:00
Gustavo Lopes
98302ee3cc
Fix NEWS (wrong bug # AND wrong section...)
...
It's bug #64508 , not #64506 .
2013-05-08 20:03:43 +02:00
Gustavo Lopes
8687332e08
Fix bug #64506 : fix build with --disable-ipv6
2013-05-08 19:58:27 +02:00
Anatol Belski
7b09e5fe35
Fixed news, rc1 is already branched
2013-05-08 19:24:51 +02:00
Anatol Belski
4091e94660
Fixed bug #64769 mbstring PHPTs crash on Windows x64
...
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.
[SNIPPET]
unsigned long ul0[2], ul1, *ul2;
ul0[0] = 42uL;
ul0[0] = 24uL;
ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;
/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]
To make it portable, ULONG_PTR should be used in this case.
In oniguruma this behaviour is to see at least in the following
codepath:
ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
2013-05-08 19:22:37 +02:00
David Soria Parra
288f04c430
News for RC2
2013-05-08 18:57:06 +02:00
David Soria Parra
e30dbcce77
NEWS for RC1
2013-05-08 18:44:05 +02:00
Johannes Schlüter
9ef017af00
Merge branch 'PHP-5.4' into PHP-5.5
2013-05-08 18:03:12 +02:00
Johannes Schlüter
898ddcb9e1
Merge branch 'PHP-5.3' into PHP-5.4
2013-05-08 18:02:35 +02:00
Johannes Schlüter
1cc2162b83
PHP 5.3.25 NEWS
2013-05-08 18:01:39 +02:00
Remi Collet
36eee5b994
Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
2013-05-08 07:37:40 +02:00
Ard Biesheuvel
5b121eb04d
Fix #64780 (PHP 5.5 builds are broken with GCC 3)
...
A recent change (by me) introduced a call to __builtin_offsetof()
into zend_operators.h which is not defined by GCC prior to
version 4.
Changed the code to use offsetof() instead: this is defined in
<stddef.h>, so #include this header conditionally (#ifdef GNUC)
2013-05-07 20:37:04 +02:00
jas-
525e27e1e5
Fix for challenge string length pointed out by Kalle Nielsen
2013-05-06 18:43:13 -06:00
jas-
8f56ac8401
Address feature request #38917 for native SPKAC (HTML5 keygen element) support
2013-05-06 16:36:06 -06:00
Xinchen Hui
da07e91c3a
Merge branch 'PHP-5.5'
2013-05-09 15:57:56 +08:00
Gustavo Lopes
ab9a3ca669
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64506 : fix build with --disable-ipv6
2013-05-08 19:58:43 +02:00
Gustavo Lopes
ab38bf1931
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64506 : fix build with --disable-ipv6
2013-05-08 19:57:23 +02:00
Gustavo Lopes
6f3c3862ca
Fix bug #64506 : fix build with --disable-ipv6
2013-05-08 19:56:40 +02:00
Anatol Belski
3a8776a288
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed news, rc1 is already branched
Fixed bug #64769 mbstring PHPTs crash on Windows x64
2013-05-08 19:26:04 +02:00
Anatol Belski
506ecc0a73
Merge branch 'master' of git.php.net:php-src
2013-05-08 19:19:24 +02:00
Anatol Belski
5490fe2402
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64769 mbstring PHPTs crash on Windows x64
2013-05-08 19:18:00 +02:00
Anatol Belski
d2a784baa6
Fixed bug #64769 mbstring PHPTs crash on Windows x64
...
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.
[SNIPPET]
unsigned long ul0[2], ul1, *ul2;
ul0[0] = 42uL;
ul0[0] = 24uL;
ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;
/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]
To make it portable, ULONG_PTR should be used in this case.
In oniguruma this behaviour is to see at least in the following
codepath:
ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
2013-05-08 18:58:32 +02:00
David Soria Parra
f10fc6fcee
Merge branch 'PHP-5.5'
...
* PHP-5.5:
News for RC2
NEWS for RC1
2013-05-08 18:57:23 +02:00
Johannes Schlüter
7cf806a033
Merge branch 'PHP-5.5'
2013-05-08 18:03:53 +02:00
Remi Collet
70e0118b1b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
2013-05-08 07:37:46 +02:00
Ard Biesheuvel
046594caad
Merge branch 'PHP-5.5'
2013-05-07 22:08:24 +02:00
Remi Collet
f5973141af
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff).
2013-05-06 10:25:41 +02:00
Remi Collet
de7415ea55
gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff).
2013-05-06 10:25:36 +02:00
Remi Collet
9b30ee7e0b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: fix previous (bad include)
2013-05-06 10:07:11 +02:00
Remi Collet
96a575123d
gd: fix previous (bad include)
2013-05-06 10:07:06 +02:00
Remi Collet
03091c834c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd
2013-05-06 10:02:34 +02:00
Remi Collet
9480de29db
Revert removal of overflow2 use in gd.c
...
Function provided by gd_security with bundled libgd
Function provided by gd_compat with system libgd
This fix failed test imageloadfont_invalid.phpt
This test now also pass with system libgd
2013-05-06 10:00:45 +02:00
Remi Collet
76665ca070
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: fix include...
2013-05-05 10:39:37 +02:00
Remi Collet
4cea61a0fa
gd: fix include...
2013-05-05 10:39:33 +02:00
Remi Collet
87de7b353b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Move (back) missing functions in system libgd to gd_compat - display libPng version in all cases - gd_compat.c in ext/gd (nothing in ext/gd/libgd)
2013-05-05 09:56:52 +02:00
Remi Collet
0cae9a15d7
Move (back) missing functions in system libgd to gd_compat
...
- display libPng version in all cases
- gd_compat.c in ext/gd (nothing in ext/gd/libgd)
2013-05-05 09:54:27 +02:00
Remi Collet
e7ffb77341
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd
2013-05-05 08:35:34 +02:00
Remi Collet
9a48b6506c
gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd
2013-05-05 08:35:29 +02:00
Remi Collet
a47c5ed855
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: missing comma
2013-05-05 06:52:35 +02:00
Remi Collet
54d6f8b34e
gd: missing comma
2013-05-05 06:52:28 +02:00
Remi Collet
dca2cd2f98
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: fix typo and cleanups
2013-05-04 20:36:42 +02:00
Remi Collet
2ab270011d
gd: fix typo and cleanups
2013-05-04 20:36:32 +02:00
Remi Collet
71e76816ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
fix build with bundled libgd
Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/.
Remove extra unused functions from gd_compat.h
Rewrite Xpm library check so it doesn't break on MultiArch systems
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
* Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
Remove overflow2, getmbi and skipheader, since they are not needed anymore.
Allow to use new GD-2.1.0 function from system library
2013-05-04 16:54:46 +02:00
Remi Collet
d981c191d4
NEWS
2013-05-04 16:54:22 +02:00
Remi Collet
00b097d2a3
fix build with bundled libgd
2013-05-04 16:51:56 +02:00
Ondřej Surý
2a2ac5f2be
Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/.
2013-05-04 16:50:13 +02:00
Ondřej Surý
e6704501f8
Remove extra unused functions from gd_compat.h
2013-05-04 16:50:11 +02:00
Ondřej Surý
5e9c6c3b64
Rewrite Xpm library check so it doesn't break on MultiArch systems
2013-05-04 16:50:08 +02:00
Ondřej Surý
8a90aad35b
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
2013-05-04 16:50:06 +02:00
Ondřej Surý
2fc17d83cb
* Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
2013-05-04 16:50:03 +02:00
Ondřej Surý
8a07908215
Remove overflow2, getmbi and skipheader, since they are not needed anymore.
2013-05-04 16:49:59 +02:00
Ondřej Surý
6aedadce0a
Allow to use new GD-2.1.0 function from system library
2013-05-04 16:49:35 +02:00
Xinchen Hui
d6de58d7e4
Merge branch 'PHP-5.5'
2013-05-04 20:45:07 +08:00
Xinchen Hui
9155d17fef
Fix #64749 (warning: cast from pointer to integer of different size)
2013-05-04 20:43:42 +08:00
Anatol Belski
a14a809aff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
better fix for bug #64770
better fix for bug #64770
2013-05-04 12:20:36 +02:00
Anatol Belski
b2ef8672c7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
better fix for bug #64770
better fix for bug #64770
2013-05-04 12:20:19 +02:00
Anatol Belski
ec4388158d
better fix for bug #64770
2013-05-04 12:19:52 +02:00
Anatol Belski
f1e5127e7a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
better fix for bug #64770
2013-05-04 12:18:06 +02:00
Anatol Belski
5c701d19ac
better fix for bug #64770
2013-05-04 12:16:38 +02:00
Boris Lytochkin
98063b6531
Merge branch 'PHP-5.5'
...
* PHP-5.5:
remove OS-specific OIDs from 'WALK multiple on single OID with OID suffix as keys' test part
2013-05-04 00:06:15 +04:00
Boris Lytochkin
67d83de11c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
remove OS-specific OIDs from 'WALK multiple on single OID with OID suffix as keys' test part
2013-05-04 00:06:06 +04:00
Boris Lytochkin
8c3b8f39aa
remove OS-specific OIDs from
...
'WALK multiple on single OID with OID suffix as keys' test part
2013-05-04 00:04:52 +04:00
Boris Lytochkin
7f5a4cd70a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore add test for Bug #64159 bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
cut PHP_VERSION_ID - we know API version now
2013-05-03 23:22:27 +04:00
Boris Lytochkin
eff60f993c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore add test for Bug #64159 bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
2013-05-03 23:10:11 +04:00
Boris Lytochkin
c34274acb8
re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore
...
add test for Bug #64159
bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
2013-05-03 23:06:34 +04:00
Boris Lytochkin
86fbf51ac1
Merge branch 'master' of https://git.php.net/push/php-src
...
* 'master' of https://git.php.net/push/php-src :
updated NEWS
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 19:25:33 +04:00
Boris Lytochkin
3a413f216a
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/push/php-src :
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 19:24:24 +04:00
Boris Lytochkin
f1269d80c5
Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3
...
* 'PHP-5.3' of https://git.php.net/push/php-src :
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 19:23:46 +04:00
Boris Lytochkin
1c8befe893
cut PHP_VERSION_ID - we know API version now
2013-05-03 19:22:21 +04:00
Boris Lytochkin
74ef9b6cea
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/push/php-src :
updated NEWS
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 19:10:22 +04:00
Anatol Belski
88c83469b5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 17:06:16 +02:00
Anatol Belski
f7830e4f98
updated NEWS
2013-05-03 17:05:54 +02:00
Anatol Belski
6d41711fd9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 17:04:53 +02:00
Anatol Belski
b1c24d1eac
updated NEWS
2013-05-03 17:04:26 +02:00
Anatol Belski
aa4762572e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 17:03:16 +02:00
Anatol Belski
b1ea0b7a7a
Fixed bug #64770 stream_select() fails with pipes
...
returned by proc_open() on Windows x64
2013-05-03 17:01:33 +02:00
Boris Lytochkin
cdba4ee320
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64159 (Truncated snmpget)
Fixed bug #64159 (Truncated snmpget)
2013-05-03 15:47:29 +04:00
Boris Lytochkin
2c336c9cde
Fixed bug #64159 (Truncated snmpget)
2013-05-03 15:46:43 +04:00
Boris Lytochkin
c68f9d5503
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64159 (Truncated snmpget)
2013-05-03 15:39:57 +04:00
Boris Lytochkin
e36adfe94a
Fixed bug #64159 (Truncated snmpget)
2013-05-03 15:35:09 +04:00
Boris Lytochkin
1e5bcd4cf5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update NEWS
update NEWS
Fix bug #64765 (enclose IPv6 address into square brackets)
2013-05-03 12:26:16 +04:00
Boris Lytochkin
cbe2870b72
update NEWS
2013-05-03 12:25:49 +04:00
Boris Lytochkin
1ce836580d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Fix bug #64765 (enclose IPv6 address into square brackets)
2013-05-03 12:19:10 +04:00
Boris Lytochkin
a39282b64d
update NEWS
2013-05-03 12:15:35 +04:00
Boris Lytochkin
3828f6227b
Fix bug #64765 (enclose IPv6 address into square brackets)
2013-05-03 12:13:50 +04:00
Boris Lytochkin
ae54e37793
Merge branch 'master' of https://git.php.net/push/php-src
...
* 'master' of https://git.php.net/push/php-src: (346 commits)
NEWS
NEWS
NEWS
From code coverity scan, syscall return value must be check.
fix more resource leaks
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
fixed size array cannot be null
use limit_extensions as we use security_limit_extensions later (free)
unused variable
fix possible null deref (detected by code coverity scan)
updated lib versions
Oops
Harden loopback tests
Fix race condition when ext/hash/tests run in parallel
Remove trailing space in NEWS
NEWS for 514afd67
Fix bug #64729 : compilation failure on x32
don't include smart_str.h in a too global header, fixes #64718
NEWS
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
...
2013-05-03 11:23:20 +04:00
Boris Lytochkin
5f67584fd7
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/push/php-src: (310 commits)
NEWS
NEWS
NEWS
From code coverity scan, syscall return value must be check.
fix more resource leaks
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
fixed size array cannot be null
use limit_extensions as we use security_limit_extensions later (free)
unused variable
fix possible null deref (detected by code coverity scan)
updated lib versions
Remove trailing space in NEWS
NEWS for 514afd67
Fix bug #64729 : compilation failure on x32
don't include smart_str.h in a too global header, fixes #64718
NEWS
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
Added SoapClient constructor option 'ssl_method' to specify ssl method
fix #64738 , fix implicit type declaration
Avoid possible conditional jump depended on uninitialised value
...
2013-05-03 11:22:42 +04:00
Boris Lytochkin
5af2c5d202
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/push/php-src: (109 commits)
NEWS
NEWS
From code coverity scan, syscall return value must be check.
fix more resource leaks
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
fixed size array cannot be null
use limit_extensions as we use security_limit_extensions later (free)
unused variable
fix possible null deref (detected by code coverity scan)
Remove trailing space in NEWS
NEWS for 514afd67
Fix bug #64729 : compilation failure on x32
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
Revert "Add CURL_WRAPPERS_ENABLE constant"
Also fixed bug #64726 in 5.3
Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
Fix memory realted to #64726
updated libmagic.patch
Fixed bug bug #64713 Compilation warnings in finfo
Fix Test Bug #64714
...
2013-05-03 11:22:16 +04:00
Boris Lytochkin
aa448adc83
Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3
...
* 'PHP-5.3' of https://git.php.net/push/php-src: (39 commits)
NEWS
From code coverity scan, syscall return value must be check.
fix more resource leaks
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
fixed size array cannot be null
use limit_extensions as we use security_limit_extensions later (free)
unused variable
fix possible null deref (detected by code coverity scan)
Also fixed bug #64726 in 5.3
Fix memory realted to #64726
Fix Test Bug #64714
PHP 5.3.26 this will be
Fix NEWS
Fix bug #64458 (dns_get_record result with string of length -1)
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
Fixed stream_socket_pair() on Windows x64 and
- Updated to version 2013.3 (2013c)
lower the limit, should fit in a byte
updated lib versions
allow lcov 1.10
...
2013-05-03 11:21:48 +04:00
Remi Collet
3db066759f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
NEWS
NEWS
2013-05-03 08:31:45 +02:00
Remi Collet
432b09f238
NEWS
2013-05-03 08:31:22 +02:00
Remi Collet
3011208f1a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
NEWS
2013-05-03 08:30:58 +02:00
Remi Collet
9996c310d1
NEWS
2013-05-03 08:30:47 +02:00
Remi Collet
f087c53130
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
NEWS
2013-05-03 08:30:19 +02:00
Remi Collet
4a34d4a83c
NEWS
2013-05-03 08:29:56 +02:00
Remi Collet
570290e208
Merge branch 'PHP-5.5'
...
* PHP-5.5:
From code coverity scan, syscall return value must be check.
2013-05-03 08:23:20 +02:00
Remi Collet
c9085837a9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
From code coverity scan, syscall return value must be check.
2013-05-03 08:23:07 +02:00
Remi Collet
3fd4b6be63
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
From code coverity scan, syscall return value must be check.
2013-05-03 08:22:55 +02:00
Remi Collet
0549e55d82
From code coverity scan, syscall return value must be check.
...
To not alter current behaviour, we simply log the problem,
so, if it occurs, the message will give explanation.
This are only warning as they don't block the server,
but such fail can explain strange (not expected) behaviour later.
2013-05-03 08:19:14 +02:00
Remi Collet
adf9ecfd4f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix more resource leaks
2013-05-02 13:47:58 +02:00
Remi Collet
6494faa844
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix more resource leaks
2013-05-02 13:47:48 +02:00
Remi Collet
b7b150b830
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix more resource leaks
2013-05-02 13:47:36 +02:00
Remi Collet
444e59eb20
fix more resource leaks
2013-05-02 13:47:24 +02:00
Remi Collet
d583064a51
Merge branch 'PHP-5.5'
...
* PHP-5.5:
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
2013-05-02 13:31:38 +02:00
Remi Collet
a3e177b9fd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
2013-05-02 13:31:22 +02:00
Remi Collet
08b72ac9f1
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
2013-05-02 13:31:11 +02:00
Remi Collet
331540d20c
From code coverity scan
...
- fix some memory leak
- fix some resources leak (fd)
- create fpm_worker_pool_free (shared use)
- possible null dref (wp->user and wp->home can be null)
2013-05-02 13:27:16 +02:00
Remi Collet
ecb17b9a2d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed size array cannot be null
2013-05-02 10:33:14 +02:00
Remi Collet
eb53035a80
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed size array cannot be null
2013-05-02 10:33:05 +02:00
Remi Collet
c374b80dda
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed size array cannot be null
2013-05-02 10:32:54 +02:00
Remi Collet
d0c40220d1
fixed size array cannot be null
2013-05-02 10:32:45 +02:00
Remi Collet
59820266c3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
use limit_extensions as we use security_limit_extensions later (free)
unused variable
2013-05-02 10:16:01 +02:00
Remi Collet
2f12769db0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
use limit_extensions as we use security_limit_extensions later (free)
unused variable
2013-05-02 10:15:49 +02:00
Remi Collet
78c48af2f2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
use limit_extensions as we use security_limit_extensions later (free)
unused variable
2013-05-02 10:15:20 +02:00
Remi Collet
8492bbefbb
use limit_extensions as we use security_limit_extensions later (free)
2013-05-02 10:15:12 +02:00
Remi Collet
a7d6cb2360
unused variable
2013-05-02 10:15:05 +02:00
Remi Collet
db9cfd7a82
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix possible null deref (detected by code coverity scan)
Remove trailing space in NEWS
NEWS for 514afd67
2013-05-02 09:39:06 +02:00
Remi Collet
d42ae32738
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix possible null deref (detected by code coverity scan)
Remove trailing space in NEWS
NEWS for 514afd67
2013-05-02 09:38:38 +02:00
Remi Collet
be3f7ba4fb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix possible null deref (detected by code coverity scan)
2013-05-02 09:38:12 +02:00
Remi Collet
ab117573cd
fix possible null deref (detected by code coverity scan)
2013-05-02 09:38:00 +02:00
Anatol Belski
06f104aab9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated lib versions
2013-05-01 21:38:17 +02:00
Anatol Belski
e3aeb6c070
updated lib versions
2013-05-01 21:37:28 +02:00
Sara Golemon
e836f8e38f
Oops
2013-04-30 19:43:52 -07:00
Sara Golemon
e217db8e69
Harden loopback tests
...
These tests depend on being able to bind port 31337.
Try a range of ports until one binds or we give up trying.
2013-04-30 19:30:55 -07:00
Sara Golemon
6aefaad46e
Fix race condition when ext/hash/tests run in parallel
2013-04-30 16:28:37 -07:00
Gustavo Lopes
3f2f534a5c
Remove trailing space in NEWS
2013-04-30 19:42:31 +02:00
Gustavo Lopes
1656b337ce
NEWS for 514afd67
2013-04-30 19:41:27 +02:00
Gustavo Lopes
734cb61f81
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64729 : compilation failure on x32
2013-04-30 19:38:00 +02:00
Gustavo Lopes
865cc3a800
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64729 : compilation failure on x32
Conflicts:
Zend/zend_alloc.c
2013-04-30 19:36:08 +02:00
Gustavo Lopes
514afd67b6
Fix bug #64729 : compilation failure on x32
2013-04-30 19:28:24 +02:00
Johannes Schlüter
bfb787b16f
Merge branch 'PHP-5.5'
2013-04-30 14:28:18 +02:00
Johannes Schlüter
062519ed41
don't include smart_str.h in a too global header, fixes #64718
2013-04-30 14:26:55 +02:00
Remi Collet
bd77763889
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
2013-04-30 09:03:28 +02:00
Remi Collet
36b968ae96
NEWS
2013-04-30 09:03:18 +02:00
Remi Collet
fbff4ccf27
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
2013-04-30 09:02:59 +02:00
Remi Collet
4a92ae3401
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm
...
the SCRIPT_FILENAME may contains the QUERY_STRING.
Ex : RewriteRule ^(.*)\.php$ fcgi://127.0.0.1:9000/$1.php [P]
From apache debug (build with -DFCGI_DUMP_ENV_VARS)
AH01062: sending env var 'SCRIPT_FILENAME' value 'proxy:fcgi://127.0.0.1:9000/var/www/html/info.php?foo'
AH01071: Got error 'Primary script unknown\n'
2013-04-30 08:55:18 +02:00
Dmitry Stogov
13de57c0f4
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix #64738 , fix implicit type declaration
2013-04-30 10:27:24 +04:00
Dmitry Stogov
4558533ef3
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
fix #64738 , fix implicit type declaration
2013-04-30 10:26:57 +04:00
Dmitry Stogov
a9679227cf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added SoapClient constructor option 'ssl_method' to specify ssl method
2013-04-30 10:26:29 +04:00
Dmitry Stogov
c782cf7fb3
Added SoapClient constructor option 'ssl_method' to specify ssl method
2013-04-30 10:24:49 +04:00
Pierre Joye
fc666bdb83
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix #64738 , fix implicit type declaration
2013-04-30 08:03:46 +02:00
Pierre Joye
83682d8833
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-30 08:01:52 +02:00
Pierre Joye
1a335d20a8
fix #64738 , fix implicit type declaration
2013-04-30 07:52:40 +02:00
Dmitry Stogov
05a88447ad
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Avoid possible conditional jump depended on uninitialised value
2013-04-29 10:46:54 +04:00
Dmitry Stogov
4b83f4a011
Avoid possible conditional jump depended on uninitialised value
2013-04-29 10:45:31 +04:00
Dmitry Stogov
3f48e8765d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilation warnings (issue #92 )
2013-04-29 10:32:50 +04:00
Dmitry Stogov
a5b4eeb5f0
Fixed compilation warnings (issue #92 )
2013-04-29 10:32:08 +04:00
Stanislav Malyshev
4aecf0eb66
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "Add CURL_WRAPPERS_ENABLE constant"
2013-04-28 22:28:53 -07:00
Stanislav Malyshev
8a51bdd3ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "Add CURL_WRAPPERS_ENABLE constant"
Conflicts:
ext/curl/interface.c
2013-04-28 22:28:13 -07:00
Stanislav Malyshev
4e773c1b92
Revert "Add CURL_WRAPPERS_ENABLE constant"
...
This reverts commit d7f709a032 .
Since wrappers are deleted from 5.5, no point in adding this constant.
2013-04-28 22:26:05 -07:00
David Soria Parra
6bac9bb1e8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "Fix conversion from unsigned char to char"
2013-04-29 02:28:46 +02:00
David Soria Parra
86685aefab
Revert "Fix conversion from unsigned char to char"
...
This reverts commit bc50ba4bf9 .
2013-04-29 02:27:11 +02:00
Pierre Joye
9877773438
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-27 18:00:02 +02:00
Pierre Joye
03ab53b213
Merge branch 'master' of git.php.net:php-src
2013-04-27 17:59:40 +02:00
Pierre Joye
eaec5522ff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix #64725 , wrong res check
2013-04-27 17:52:38 +02:00
Pierre Joye
25c9f34c9c
fix #64725 , wrong res check
2013-04-27 17:52:30 +02:00
Xinchen Hui
24a26df1f8
Merge branch 'PHP-5.5'
2013-04-27 23:50:29 +08:00
Xinchen Hui
e60638faca
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-27 23:50:23 +08:00
Xinchen Hui
7b9eabaf51
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-27 23:50:02 +08:00
Xinchen Hui
15b554cd9b
Also fixed bug #64726 in 5.3
2013-04-27 23:49:43 +08:00
Xinchen Hui
9555531eea
Merge branch 'PHP-5.5'
2013-04-27 23:42:34 +08:00
Xinchen Hui
a56a95e58d
Update NEWS
2013-04-27 23:42:18 +08:00
Xinchen Hui
1c07590ed7
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-27 23:41:51 +08:00
Xinchen Hui
8f5a534b21
Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
2013-04-27 23:41:31 +08:00
Xinchen Hui
d54432ed98
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-27 23:38:10 +08:00
Xinchen Hui
c7b8368ed5
Fix memory realted to #64726
2013-04-27 23:38:00 +08:00
Anatol Belski
35364cd71d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated libmagic.patch
2013-04-27 14:10:09 +02:00
Anatol Belski
ca148c030f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2013-04-27 14:09:55 +02:00
Anatol Belski
e9b03c412b
updated libmagic.patch
2013-04-27 14:09:29 +02:00
Anatol Belski
232f5d0306
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:51:31 +02:00
Anatol Belski
d72307f1ca
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:51:12 +02:00
Anatol Belski
cdc1a63790
Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:49:50 +02:00
David Soria Parra
e0e18a2b1d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix implicit declaration warning for cdf_timestamp_to_timespec
Fix #64711 ("value computed but not used" in parse_date.c)
Fix implicit uint* to int* conversion warning
Fix conversion from unsigned char to char
Fix #64712 (Obsolete declarations in php_date.c)
2013-04-26 12:41:08 +02:00
David Soria Parra
cf5d7d9e73
Fix implicit declaration warning for cdf_timestamp_to_timespec
2013-04-26 12:28:58 +02:00
David Soria Parra
b86c85723e
Fix #64711 ("value computed but not used" in parse_date.c)
2013-04-26 11:33:54 +02:00
David Soria Parra
3411fbbc51
Fix implicit uint* to int* conversion warning
2013-04-26 10:57:55 +02:00
David Soria Parra
bc50ba4bf9
Fix conversion from unsigned char to char
2013-04-26 10:55:52 +02:00
David Soria Parra
75cec90d8c
Fix #64712 (Obsolete declarations in php_date.c)
2013-04-26 10:45:08 +02:00
Pierre Joye
bba7f8aa31
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- #64710 , check return val
- #64710 , kill unused var
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , Implicit declaration
2013-04-26 08:16:02 +02:00
Pierre Joye
2809afa119
- #64710 , check return val
2013-04-26 08:15:33 +02:00
Pierre Joye
7bd20354a8
- #64710 , kill unused var
2013-04-26 08:15:05 +02:00
Pierre Joye
b0afef2d5e
#64710 , kill unused vars
2013-04-26 08:10:24 +02:00
Pierre Joye
685a6d9aab
#64710 , kill unused vars
2013-04-26 08:09:19 +02:00
Pierre Joye
7b06189702
#64710 , kill unused vars
2013-04-26 08:08:38 +02:00
Pierre Joye
3fffc78ed0
#64710 , kill unused vars
2013-04-26 08:07:47 +02:00
Pierre Joye
b5902b6c9d
#64710 , kill unused vars
2013-04-26 08:06:34 +02:00
Pierre Joye
afe46d4d47
#64710 , Implicit declaration
2013-04-26 07:48:11 +02:00
Pierre Joye
fde3198daa
Merge branch 'master' of git.php.net:php-src
2013-04-26 06:40:42 +02:00
Matt Ficken
d35822b4fa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Adding sys_get_temp_dir() test specific for Windows.
2013-04-25 14:55:50 -07:00
Matt Ficken
4941e3fe44
Adding sys_get_temp_dir() test specific for Windows.
...
sys_get_temp_dir() returns a Windows-style path (\\ instead of /) on
Windows. This is why a Windows specific test is required.
Skipping req60524.phpt on Windows. Adding -win32 fork for use only on
Windows.
Fixes test bug #64396 .
2013-04-25 14:52:48 -07:00
Anatol Belski
df236828b5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed float precision change under Windows x64
2013-04-25 23:01:13 +02:00
Anatol Belski
30802dbc55
Fixed float precision change under Windows x64
...
otherwise we'll have asserts in debug builds and void runs of the
error handlers in non debug builds.
2013-04-25 22:44:29 +02:00
Matt Ficken
67a72ceb93
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix Test Bug #64714
2013-04-25 11:37:36 -07:00
Matt Ficken
7d0dd957eb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix Test Bug #64714
2013-04-25 11:37:25 -07:00
Matt Ficken
5adf1be45d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix Test Bug #64714
2013-04-25 11:37:09 -07:00
Matt Ficken
bf5506f511
Fix Test Bug #64714
2013-04-25 11:34:57 -07:00
Johannes Schlüter
488933792a
Merge branch 'PHP-5.5'
2013-04-25 18:05:56 +02:00
Johannes Schlüter
6251706ea6
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-25 18:05:40 +02:00
Johannes Schlüter
239ba8d58b
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
configure.in
main/php_version.h
2013-04-25 18:05:19 +02:00
Johannes Schlüter
63434524f8
PHP 5.3.26 this will be
2013-04-25 18:02:53 +02:00
Johannes Schlüter
671ef9fda7
Fix NEWS
2013-04-25 17:58:02 +02:00
David Soria Parra
4a52fe4755
NEWS for RC1
2013-04-25 08:05:56 +02:00
David Soria Parra
51e3fabf10
NEWS for PHP 5.5.0 Beta 4 again
2013-04-25 08:05:16 +02:00
David Soria Parra
e04baf692a
Fix curl build on windows
2013-04-25 08:04:30 +02:00
Remi Collet
182fef46a9
Fixed bug #64707 missing declaration after dd0399f
2013-04-25 06:40:55 +02:00
Pierrick Charron
f42a257711
Update NEWS file
2013-04-24 13:26:34 -04:00
Stanislav Malyshev
cf9db2154e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.16-dev
Conflicts:
configure.in
main/php_version.h
2013-04-24 10:16:56 -07:00
Stanislav Malyshev
a58a279d7b
5.4.16-dev
2013-04-24 10:15:35 -07:00
Remi Collet
26bd2cba81
gd: missing headers in previous
2013-04-24 16:15:42 +02:00
Remi Collet
3a8ceed844
allow use of gdImageCreateFromJpegEx with system libgd
2013-04-24 16:15:11 +02:00
Remi Collet
dd0399f5c6
We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
...
The new (Ex) functions are used with the new ignore_warning parameter
The standard functions are used in _php_image_create_from_string,
sent as a function pointer, and call without this optional parameter.
2013-04-24 16:07:50 +02:00
Remi Collet
7189cc5be8
gd: fix proto comment
2013-04-24 14:44:20 +02:00
Anatol Belski
eb4065b9e1
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-24 14:36:57 +02:00
Remi Collet
aa4b0af20f
gd: provide imageflip with system libgd when available
2013-04-24 14:32:03 +02:00
Anatol Belski
8d41f6dab6
Removed fork of ext/zlib/tests/bug_52944.phpt
...
The real issue is a bug in asm zlib build, reported here
https://github.com/madler/zlib/issues/41 . Non ASM builds
behave more predictable.
2013-04-24 14:31:59 +02:00
David Soria Parra
ee65e6953f
NEWS for RC 1
2013-04-24 12:39:44 +02:00
David Soria Parra
78c79a2d5b
NEWS for beta 4
2013-04-24 12:37:07 +02:00
ptarjan
22f6b6dbec
Fix zlib/tests/gzseek to create unique temporary files
...
When running tests in parallel these create a race condition.
Race conditions are bad.
2013-04-24 01:06:55 -07:00
David Soria Parra
4c0746228d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for RC1
NEWS for PHP 5.5.0 Beta 4 again
Fix curl build on windows
2013-04-25 08:25:10 +02:00
Remi Collet
b0cf340eef
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64707 missing declaration after dd0399f
2013-04-25 06:41:01 +02:00
Pierrick Charron
dec5324d5e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update NEWS file
2013-04-24 13:27:06 -04:00
Stanislav Malyshev
aa2b3a4b31
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.4.16-dev
2013-04-24 10:17:11 -07:00
Remi Collet
e12abebf50
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: missing headers in previous
allow use of gdImageCreateFromJpegEx with system libgd
2013-04-24 16:16:25 +02:00
Remi Collet
5897696a02
Merge branch 'PHP-5.5'
...
* PHP-5.5:
We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
gd: fix proto comment
2013-04-24 16:11:34 +02:00
Remi Collet
7264179eef
gd: fix proto comment
2013-04-24 14:43:59 +02:00
Anatol Belski
d07b7c2fc0
Merge branch 'master' of git.php.net:php-src
2013-04-24 14:36:41 +02:00
Anatol Belski
fba7c8491b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed fork of ext/zlib/tests/bug_52944.phpt
2013-04-24 14:35:34 +02:00
Remi Collet
1d72ea493d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: provide imageflip with system libgd when available
2013-04-24 14:32:09 +02:00
David Soria Parra
0f0cfaebd0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for RC 1
NEWS for beta 4
2013-04-24 12:57:24 +02:00
Stanislav Malyshev
ef0d71092b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update credits
2013-04-23 22:03:55 -07:00
Stanislav Malyshev
920c7ac16e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update credits
2013-04-23 22:03:42 -07:00
Stanislav Malyshev
84e5c8a0e2
update credits
2013-04-23 22:02:57 -07:00
Stanislav Malyshev
50800356af
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:46:27 -07:00
Stanislav Malyshev
1363626f11
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
2013-04-23 21:46:03 -07:00
Stanislav Malyshev
5e24a6e74d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:45:49 -07:00
Stanislav Malyshev
2a15aed399
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:45:10 -07:00
Stanislav Malyshev
f87d2ab893
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:43:55 -07:00
Stanislav Malyshev
18fdab5a09
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:43:35 -07:00
Pierrick Charron
74394733ed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove curl wrappers
2013-04-23 17:01:50 -04:00
Pierrick Charron
b79e65f268
Remove curl wrappers
2013-04-23 17:01:17 -04:00
Dmitry Stogov
302de03a5a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
2013-04-24 00:04:00 +04:00
Dmitry Stogov
758b666c0a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-04-23 23:59:00 +04:00
Dmitry Stogov
43ab915b41
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-04-23 23:55:47 +04:00
Dmitry Stogov
4cf0647399
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
2013-04-23 23:43:23 +04:00
Remi Collet
92a1640694
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix copy/paste in error message
2013-04-23 13:53:07 +02:00
Remi Collet
2005a15caa
fix copy/paste in error message
2013-04-23 13:53:00 +02:00
Remi Collet
2fa178fa41
Merge branch 'PHP-5.5'
...
* PHP-5.5:
enable WebP with system libgd when available
(re)allow WBMP detection with system libgd provide getbmi and skipheader not exported functions in gd_compat.
2013-04-23 13:46:24 +02:00
Remi Collet
9819d81ddf
enable WebP with system libgd when available
2013-04-23 13:46:10 +02:00
Remi Collet
eb50789910
(re)allow WBMP detection with system libgd
...
provide getbmi and skipheader not exported functions in gd_compat.
2013-04-23 13:43:57 +02:00
Sara Golemon
231e2d762a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
array_column() - Use entire subject array when NULL passed for second param.
2013-04-22 16:20:41 -07:00
Sara Golemon
734e165d4e
array_column() - Use entire subject array when NULL passed for second param.
...
This starts to look like array_values(), except that you can reindex the arrays
using the third parameter.
2013-04-22 16:19:21 -07:00
Sara Golemon
35df484b5b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Allow array_column() to take -1 as a valid value in third param
2013-04-22 15:55:38 -07:00
Sara Golemon
1a03bd5dee
Allow array_column() to take -1 as a valid value in third param
...
Also do some cleanup and simplification to make this code more
readable in the long term.
2013-04-22 15:54:21 -07:00
Sara Golemon
caff01e751
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Harden array_column_basic.phpt against resource renumbering.
2013-04-22 13:37:36 -07:00
Sara Golemon
f63db963c4
Harden array_column_basic.phpt against resource renumbering.
...
We don't care what resource number it is, so long as there's a
stream resource returned.
2013-04-22 13:36:40 -07:00
Anatol Belski
b3aa3c2616
updated NEWS
2013-04-22 18:59:47 +02:00
Anatol Belski
8febe2ad08
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 18:59:11 +02:00
Anatol Belski
f082d6311b
Fixed stream_socket_pair() on Windows x64 and
...
improved errorhandling in the socketpair() implementation.
2013-04-22 18:55:32 +02:00
Derick Rethans
0b2c411323
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-22 17:51:43 +01:00
Derick Rethans
70b67f2e50
- Updated to version 2013.3 (2013c)
2013-04-22 17:51:41 +01:00
Sara Golemon
70c700cf8c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix handling of double keys in array_column
2013-04-21 23:33:20 -07:00
Anatol Belski
8645309c4e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 19:01:07 +02:00
Anatol Belski
b119836765
updated NEWS
2013-04-22 19:00:46 +02:00
Anatol Belski
f578bb0388
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 19:00:13 +02:00
Derick Rethans
cf0d902a84
Merge branch 'PHP-5.5'
2013-04-22 17:51:50 +01:00
Derick Rethans
0720804e7c
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-22 17:51:47 +01:00
Remi Collet
41ef288ced
Merge branch 'PHP-5.5'
...
* PHP-5.5:
temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
2013-04-22 17:48:43 +02:00
Remi Collet
ec1678dd7c
temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
2013-04-22 17:48:28 +02:00
Remi Collet
149cf2650a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
overflow2 is not exported by system libgd
2013-04-22 17:39:54 +02:00
Remi Collet
6889a0d1f5
overflow2 is not exported by system libgd
2013-04-22 17:39:35 +02:00
Dmitry Stogov
9ca60e2444
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed linkage with C++
Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
2013-04-22 15:40:46 +04:00
Dmitry Stogov
13b039ff9a
Fixed linkage with C++
2013-04-22 15:39:50 +04:00
Sara Golemon
7b34324f84
Fix handling of double keys in array_column
...
Also fix resource test to not localize __FILE__ to cwd.
2013-04-21 22:35:04 -07:00
Xinchen Hui
b02241b968
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-21 11:11:02 +08:00
Xinchen Hui
32490673b9
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-21 11:10:41 +08:00
Xinchen Hui
6b1928ba0b
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-21 11:09:18 +08:00
Antonio Diaz Ruiz
92bbe6be72
Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
...
Each file covers a different test case
DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
2013-04-21 11:05:59 +08:00
Xinchen Hui
0c1ef6898d
Merge branch 'master' of https://github.com/dejalatele/php-src
2013-04-21 11:04:27 +08:00
Pierre Joye
39d203afb0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
2013-04-20 18:25:27 +02:00
Pierre Joye
3cc81d151d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-20 18:24:04 +02:00
Pierre Joye
d818fdcc47
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
2013-04-20 18:23:21 +02:00
Pierre Joye
14d9f3450b
fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
2013-04-20 18:22:39 +02:00
Antonio Diaz Ruiz
eebe602c58
Merge branch 'master' of https://github.com/dejalatele/php-src
2013-04-20 16:37:45 +02:00
Antonio Diaz Ruiz
9bf80bc294
Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
...
Each file covers a different test case
DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
2013-04-20 16:28:46 +02:00
Xinchen Hui
2bcbe8fab9
Merge branch 'PHP-5.5'
2013-04-20 15:24:48 +08:00
Xinchen Hui
63d3ef4df0
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-20 15:24:18 +08:00
Xinchen Hui
6ed16753c1
Fixed bug #64677 (execution operator `` stealing surrounding arguments)
2013-04-20 15:23:49 +08:00
Dmitry Stogov
1fe5ee4d6a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed 5.2 ZTS build
2013-04-19 21:44:00 +04:00
Dmitry Stogov
c7cf9b68b6
Fixed 5.2 ZTS build
2013-04-19 21:37:24 +04:00
Andrey Hristov
6ce68583be
Merge branch 'PHP-5.5'
2013-04-19 16:47:47 +02:00
Andrey Hristov
7b7424c34c
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-19 16:29:53 +02:00
Andrey Hristov
39cc08c7e9
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-19 15:55:46 +02:00
Andrey Hristov
0802961bd1
lower the limit, should fit in a byte
2013-04-19 15:54:35 +02:00
Dmitry Stogov
fc2f2f7813
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fix other typos & add test script
Fix typo
- Fixed ZTS build
2013-04-19 10:48:46 +04:00
Dmitry Stogov
1074bbd5a3
Fixed ZTS build
2013-04-19 10:48:21 +04:00
Dmitry Stogov
0040aa29b9
Fixed ZTS build
2013-04-19 10:43:00 +04:00
Xinchen Hui
676e737f5b
Fix other typos & add test script
2013-04-19 11:21:44 +08:00
Xinchen Hui
580d6fe94d
Fix typo
2013-04-19 10:55:11 +08:00
Felipe Pena
1192cfa58c
- Fixed ZTS build
2013-04-18 19:27:02 -03:00
Dmitry Stogov
3735d96ce0
Disable FCALL optimization pass for PHP older than 5.4
...
Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
2013-04-18 22:26:37 +04:00
Dmitry Stogov
60a59d27b4
Disable FCALL optimization pass for PHP older than 5.4
2013-04-18 22:22:48 +04:00
Dmitry Stogov
edfeab8bf2
Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
2013-04-18 22:12:31 +04:00
Dmitry Stogov
7deb3d41eb
Merge branch 'PHP-5.5' into PHP-5.5-opcache
...
* PHP-5.5:
Fixed compiler warning "cast from pointer to integer of different size"
2013-04-18 14:19:17 +04:00
Xinchen Hui
0acdeec743
Merge branch 'PHP-5.5'
2013-04-18 17:33:21 +08:00
Xinchen Hui
0704e4badb
Fixed compiler warning "cast from pointer to integer of different size"
2013-04-18 17:32:46 +08:00
Dmitry Stogov
5cdc71ae07
Optimizer may hide some repeating error messages
2013-04-18 11:54:27 +04:00
Dmitry Stogov
26c761915b
Optimizer may hide some repeating error messages
2013-04-18 11:53:44 +04:00
Dmitry Stogov
745531b120
Merge identical constants (and related cache_slots) in op_array->literals table.
2013-04-18 10:50:40 +04:00
Dmitry Stogov
2bfb523f45
Merge identical constants (and related cache_slots) in op_array->literals table.
2013-04-18 10:48:16 +04:00
Antonio Diaz Ruiz
4ee47678a0
Fixs the name of the variable in the assertion
2013-04-17 23:06:36 +02:00
Antonio Diaz Ruiz
8a019f3882
Using absolute path to get the file note.xml
2013-04-17 22:30:04 +02:00
Antonio Diaz Ruiz
b41145bc5c
Fix the path of the book.xml file
2013-04-17 22:09:05 +02:00
Dmitry Stogov
36d343c0c4
Merge branch 'PHP-5.5' into PHP-5.5-opcache
...
* PHP-5.5:
Initialize literals hash_value and cache_slot
Added curl config test for windows
updated lib versions
updated lib versions
fixed EOL
updated lib versions
allow lcov 1.10
allow lcov 1.10
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2013-04-17 21:32:08 +04:00
Dmitry Stogov
bc959fbaff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Initialize literals hash_value and cache_slot
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2013-04-17 21:27:19 +04:00
Dmitry Stogov
5a897009a8
Initialize literals hash_value and cache_slot
2013-04-17 21:19:56 +04:00
Anatol Belski
cd3dc3308b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added curl config test for windows
2013-04-17 14:26:26 +02:00
Anatol Belski
2d9cbf720d
Added curl config test for windows
2013-04-17 14:25:45 +02:00
Anatol Belski
08fa45a372
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated lib versions
updated lib versions
fixed EOL
updated lib versions
allow lcov 1.10
allow lcov 1.10
allow lcov 1.10
2013-04-17 13:21:20 +02:00
Anatol Belski
c76cdb8067
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated lib versions
fixed EOL
updated lib versions
allow lcov 1.10
allow lcov 1.10
2013-04-17 13:20:46 +02:00
Anatol Belski
ca425a67c4
updated lib versions
2013-04-17 13:20:23 +02:00
Anatol Belski
ecf76e2da8
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated lib versions
allow lcov 1.10
2013-04-17 13:18:00 +02:00
Anatol Belski
fb955a613c
updated lib versions
2013-04-17 13:17:32 +02:00
Anatol Belski
4fbe1173eb
fixed EOL
2013-04-17 13:15:08 +02:00
Anatol Belski
323fdb9879
updated lib versions
2013-04-17 13:12:18 +02:00
Antonio Diaz Ruiz
a67ce30262
PHP tests to check the DOM_NOT_FOUND error message is properly raised by the DOMNode::insertBefore method
2013-04-15 23:30:58 +02:00
krakjoe
2c0d93bcbf
zend_register_null_constant
...
fixed zend_register_bool_constant usage in macros
use REGISTER_MAIN_* in zend_register_standard_constants
2013-04-15 20:47:13 +01:00
krakjoe
a49bb472a3
zend_API.h included
...
ZVAL_* family in use
2013-04-15 18:40:09 +01:00
krakjoe
2966e63faf
use Z_* family macros
2013-04-15 18:27:45 +01:00
krakjoe
f11d620cb6
zend_register_bool_constant patch
2013-04-15 18:13:09 +01:00
Dmitry Stogov
e16f24327d
Merge branch 'PHP-5.5' into PHP-5.5-opcache
...
* PHP-5.5:
allow lcov 1.10
Fixed bug (Wrong ce cached)
apply change from opcache readme to php.ini
lucky that the name is not used, fix name of encoder
2013-04-15 12:09:02 +04:00
Nuno Lopes
a9271a8b0d
allow lcov 1.10
2013-04-13 16:57:25 -04:00
Nuno Lopes
e694d40963
allow lcov 1.10
2013-04-13 16:56:30 -04:00
Nuno Lopes
adc17bff57
allow lcov 1.10
2013-04-13 16:53:39 -04:00
Nuno Lopes
dacbf70f92
allow lcov 1.10
2013-04-13 16:51:58 -04:00
Chris Wright
c091819f40
Add schema default/fixed value support
...
Added support for adding fixed/default values during XSD validation
and added/updated associated tests
2013-04-12 09:50:14 +01:00
Dmitry Stogov
a0e3ca1c98
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fixed bug (Wrong ce cached)
apply change from opcache readme to php.ini
lucky that the name is not used, fix name of encoder
2013-04-11 15:32:54 +04:00
Dmitry Stogov
a78c7a4206
Added script level constant replacement
2013-04-11 15:31:35 +04:00
Dmitry Stogov
276847caba
Added script level constant replacement
2013-04-11 15:18:35 +04:00
Xinchen Hui
bcb223a626
Merge branch 'PHP-5.5'
2013-04-11 14:29:51 +08:00
Xinchen Hui
a5cfe57e08
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-11 14:29:09 +08:00
Xinchen Hui
ba292b037f
Fixed bug (Wrong ce cached)
2013-04-11 14:28:42 +08:00
Pierre Joye
e2f3c7f2bc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
lucky that the name is not used, fix name of encoder
2013-04-11 07:08:58 +02:00
Pierre Joye
e71b794569
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
lucky that the name is not used, fix name of encoder
2013-04-11 07:08:39 +02:00
Remi Collet
ab165d3465
Merge branch 'PHP-5.5'
...
* PHP-5.5:
apply change from opcache readme to php.ini
2013-04-11 07:06:36 +02:00
Remi Collet
6df1e8d3fe
apply change from opcache readme to php.ini
2013-04-11 07:05:56 +02:00
Pierre Joye
4475dbf11d
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-11 06:58:04 +02:00
Pierre Joye
684f4d5272
lucky that the name is not used, fix name of encoder
2013-04-11 06:42:38 +02:00
Dmitry Stogov
88e14d01bf
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
update NEWS
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 23:12:48 +04:00
Dmitry Stogov
6893a19dbf
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
update NEWS
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 23:12:25 +04:00
Dmitry Stogov
b8867354c4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added opcache related entries
2013-04-10 23:11:35 +04:00
Dmitry Stogov
193e1865ad
Added opcache related entries
2013-04-10 23:10:43 +04:00
Anatol Belski
622af62502
Merge branch 'master' of git.php.net:php-src
2013-04-10 20:52:29 +02:00
Anatol Belski
7133eee5f2
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-10 20:51:58 +02:00
Anatol Belski
b6d54faa92
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-10 20:51:32 +02:00
Anatol Belski
56b028e590
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2013-04-10 20:50:57 +02:00
Anatol Belski
9386ba9e97
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update NEWS
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:47:55 +02:00
Anatol Belski
fc658f442d
update NEWS
2013-04-10 20:47:28 +02:00
Anatol Belski
0655ab7c26
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:45:28 +02:00
Anatol Belski
782085bbfb
updated NEWS
2013-04-10 20:44:41 +02:00
Anatol Belski
ceb5b684e0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:40:28 +02:00
Anatol Belski
968ae4a56a
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:39:17 +02:00
Pierre Joye
6ea7e6da8b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-10 20:15:03 +02:00
Pierre Joye
ea14901ca4
Merge branch 'master' of git.php.net:php-src
2013-04-10 20:14:46 +02:00
Pierre Joye
ca1962949e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:14:00 +02:00
Pierre Joye
87f5d9aa1b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:46 +02:00
Pierre Joye
c480bf3fb2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:18 +02:00
Pierre Joye
224a67fb9f
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:12:25 +02:00
Dmitry Stogov
fd15a71184
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Allow wilcards in opcache.blacklist_filename
2013-04-10 21:42:50 +04:00
Dmitry Stogov
af967de2af
Allow wilcards in opcache.blacklist_filename
2013-04-10 21:41:30 +04:00
Dmitry Stogov
28a0c38ee4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed support for PHP-5.3
2013-04-10 21:27:54 +04:00
Dmitry Stogov
e27039630a
Fixed support for PHP-5.3
2013-04-10 21:27:06 +04:00
Dmitry Stogov
5868b93c49
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added missing ARG_INFO
2013-04-10 16:47:13 +04:00
Dmitry Stogov
2b3a4afcbf
Added missing ARG_INFO
2013-04-10 16:45:59 +04:00
Dmitry Stogov
3353ba1105
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Numeric string constants used as array indeces have to be converted to long at compile time
2013-04-10 15:34:36 +04:00
Dmitry Stogov
7845f49006
Numeric string constants used as array indeces have to be converted to long at compile time
2013-04-10 15:33:08 +04:00
Johannes Schlüter
c454c85511
Merge branch 'PHP-5.5'
2013-04-10 09:48:37 +02:00
Johannes Schlüter
2e3e87029f
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-10 09:48:15 +02:00
Johannes Schlüter
442ff25187
PHP 5.4.14 release date
2013-04-10 09:45:16 +02:00
Johannes Schlüter
146d786137
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-10 09:44:34 +02:00
Johannes Schlüter
ecdf8bcc45
PHP 5.3.24 release date
2013-04-10 09:41:21 +02:00
Alexander Moskaliov
4883185917
Remove semicolon
2013-04-10 11:06:05 +04:00
Xinchen Hui
d1643bd582
Merge branch 'PHP-5.5'
2013-04-10 13:48:38 +08:00
Michael Moravec
70668fd88a
Fixed typo - inconsistent notice for undefined property (introduced by fix for #49348 )
2013-04-10 13:36:47 +08:00
Alexander Moskalev
a8dc4f0b18
Fix DateInterval->days value
...
when object was created not from DateTime::diff()
2013-04-10 00:12:39 +04:00
David Soria Parra
1a8575ab05
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS section for next beta
NEWS for PHP 5.5.0 Beta 3
2013-04-09 20:34:50 +02:00
David Soria Parra
1c498e6e94
NEWS section for next beta
2013-04-09 20:27:22 +02:00
David Soria Parra
6426a002e7
NEWS for PHP 5.5.0 Beta 3
2013-04-09 20:26:58 +02:00
Dmitry Stogov
caa2bccb8f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed CFG construction bugs
2013-04-09 17:49:45 +04:00
Dmitry Stogov
2b28f29e53
Fixed CFG construction bugs
2013-04-09 17:48:45 +04:00
Dmitry Stogov
619fb50096
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
fix possible NULL deref
2013-04-09 12:11:26 +04:00
Dmitry Stogov
e13d2c7c7f
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix possible NULL deref
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 12:10:54 +04:00
Dmitry Stogov
c8758c91a7
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 12:10:06 +04:00
Pierre Joye
d0cd049312
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix possible NULL deref
2013-04-09 10:09:54 +02:00
Pierre Joye
24f1045d55
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix possible NULL deref
2013-04-09 10:09:47 +02:00
Pierre Joye
aab5659357
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix possible NULL deref
2013-04-09 10:09:36 +02:00
Dmitry Stogov
255ed92b34
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed ZTS build
2013-04-09 12:09:33 +04:00
Pierre Joye
88b3cdc4e9
fix possible NULL deref
2013-04-09 10:09:17 +02:00
Pierre Joye
1359eaa057
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-09 10:06:49 +02:00
Pierre Joye
eb7d0ce3b0
Merge branch 'master' of git.php.net:php-src
2013-04-09 10:06:00 +02:00
Pierre Joye
f4308084d8
Merge branch 'PHP-5.5'
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.5:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:41 +02:00
Pierre Joye
4d6c367177
Merge branch 'PHP-5.4' into PHP-5.5
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:32 +02:00
Pierre Joye
10d62de4aa
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:17 +02:00
Pierre Joye
4d4adf47e0
fix null deref
2013-04-09 10:04:01 +02:00
Dmitry Stogov
4bf1f3801b
Fixed ZTS build
2013-04-09 12:03:41 +04:00
Dmitry Stogov
1d8b6de2a4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function)
2013-04-09 11:59:30 +04:00
Dmitry Stogov
4cf00c08bd
Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function)
2013-04-09 11:57:28 +04:00
Dmitry Stogov
68d567d56c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #82 (allow comments in blacklist file, lines started with ";")
2013-04-09 10:53:12 +04:00
Dmitry Stogov
d9c9e78369
Fixed issue #82 (allow comments in blacklist file, lines started with ";")
2013-04-09 10:51:19 +04:00
Pierre Joye
396b1109cf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ws and comment for recommended aa method
2013-04-09 07:05:03 +02:00
Pierre Joye
83500123d0
ws and comment for recommended aa method
2013-04-09 07:04:52 +02:00
Pierre Joye
ec136c219e
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-09 06:47:21 +02:00
Pierre Joye
28a9181ceb
Merge branch 'master' of git.php.net:php-src
2013-04-09 06:46:58 +02:00
Pierre Joye
21cfbdf42c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix some unitialized values and typo
2013-04-09 06:45:24 +02:00
Pierre Joye
85ad65ef40
fix some unitialized values and typo
2013-04-09 06:44:45 +02:00
Anatol Belski
5027736ce7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated libmagic.patch
2013-04-08 16:24:32 +02:00
Anatol Belski
a9f9ff68a2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2013-04-08 16:24:20 +02:00
Anatol Belski
a35d386612
updated libmagic.patch
2013-04-08 16:23:43 +02:00
Anatol Belski
a1c96ebbd9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix ident
2013-04-08 15:52:07 +02:00
Anatol Belski
b810878e7d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix ident
2013-04-08 15:51:53 +02:00
Anatol Belski
9de5dcad1c
fix ident
2013-04-08 15:51:22 +02:00
Anatol Belski
6b56ec449b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Refactored the previous memleak fix
2013-04-08 14:34:21 +02:00
Anatol Belski
a1f66c0b50
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Refactored the previous memleak fix
2013-04-08 14:34:09 +02:00
Anatol Belski
f3ca1155d6
Refactored the previous memleak fix
...
to avoid usage of a freed pointer. Thanks Laruence )
2013-04-08 14:32:37 +02:00
Anatol Belski
8b12bcaae8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix memory leak at apprentice.c:1095
2013-04-08 12:50:47 +02:00
Anatol Belski
9f0bfed435
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix memory leak at apprentice.c:1095
2013-04-08 12:50:25 +02:00
Anatol Belski
28e26b0fad
fix memory leak at apprentice.c:1095
2013-04-08 12:49:53 +02:00
Anatol Belski
631ab1f373
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed EOL
2013-04-08 09:21:20 +02:00
Anatol Belski
30fc3ac6aa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed EOL
2013-04-08 09:21:06 +02:00
Anatol Belski
b0b81c0a37
fixed EOL
2013-04-08 09:20:43 +02:00
Anatol Belski
c71d4b1ca7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
upgraded libmagic to 5.14
leave a sane environment behind (even if empty) when exiting some OS atexit() handlers call getenv()
2013-04-07 22:20:57 +02:00
Anatol Belski
ee0df8c40a
updated NEWS
2013-04-07 22:20:12 +02:00
Anatol Belski
b12f79cafb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
upgraded libmagic to 5.14
2013-04-07 22:18:53 +02:00
Anatol Belski
10367fa7c6
upgraded libmagic to 5.14
2013-04-07 22:15:56 +02:00
Nuno Lopes
e769025791
leave a sane environment behind (even if empty) when exiting
...
some OS atexit() handlers call getenv()
2013-04-07 02:33:33 -04:00
Nuno Lopes
1a71bf646e
leave a sane environment behind (even if empty) when exiting
...
some OS atexit() handlers call getenv()
2013-04-07 02:32:20 -04:00
Xinchen Hui
bd96813042
Merge branch 'PHP-5.5'
2013-04-05 23:28:23 +08:00
Xinchen Hui
5ac8084e5f
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-05 23:28:02 +08:00
Carson McDonald
39bc1bd25f
Fix typo
2013-04-05 23:27:34 +08:00
Xinchen Hui
d28b5e8ff2
Merge branch 'PHP-5.5'
2013-04-05 21:35:41 +08:00
Xinchen Hui
5c4d9123fa
Drop support for bison < 2.4 when building PHP from GIT source
2013-04-05 21:35:09 +08:00
Xinchen Hui
1471ec7dcf
Merge branch 'PHP-5.5'
2013-04-05 14:28:27 +08:00
Xinchen Hui
ce88a81111
Contant has been renamed
2013-04-05 14:27:56 +08:00
Xinchen Hui
f4d27a1557
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-05 14:27:29 +08:00
Xinchen Hui
1bcaf771dc
Constant has been renamed
2013-04-05 14:25:54 +08:00
Rasmus Lerdorf
cb54fada51
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-04 19:24:12 -07:00
Rasmus Lerdorf
c3a57fff5e
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-04 19:23:22 -07:00
Rasmus Lerdorf
569eddce0f
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-04 19:22:28 -07:00
Rasmus Lerdorf
1b60c189ad
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-04 19:15:52 -07:00
Johannes Schlüter
e9cc55a803
Merge branch 'PHP-5.5'
2013-04-04 15:38:35 +02:00
Johannes Schlüter
9587cf385e
Improve warning when trying to load zend ext as PHP module
2013-04-04 15:36:46 +02:00
Xinchen Hui
2794d455ea
Merge branch 'PHP-5.5'
2013-04-04 19:31:21 +08:00
Xinchen Hui
01ca2bf8c3
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/curl/interface.c
2013-04-04 19:31:14 +08:00
Xinchen Hui
185e5e15ae
s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,
2013-04-04 19:28:17 +08:00
Xinchen Hui
4788a961f1
Merge branch 'PHP-5.5'
2013-04-04 14:56:10 +08:00
Xinchen Hui
aac43c9ee8
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-04 14:56:00 +08:00
Xinchen Hui
4f2acd8cde
Update test script to make sure the error occurred
2013-04-04 14:55:17 +08:00
Xinchen Hui
4d66b3b589
no tab here
2013-04-04 14:53:30 +08:00
Xinchen Hui
5f969c1d46
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-04 14:53:17 +08:00
Xinchen Hui
846d298f9b
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 14:53:06 +08:00
Xinchen Hui
9883d8d3e5
no tab here
2013-04-04 14:52:59 +08:00
Xinchen Hui
934dfae4e1
no tab here
2013-04-04 14:52:27 +08:00
Xinchen Hui
cf0ee2d332
Merge branch 'PHP-5.5'
2013-04-04 14:49:58 +08:00
Xinchen Hui
34c5b80595
Update NEWs
2013-04-04 14:49:22 +08:00
Xinchen Hui
65e368debd
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-04 14:48:53 +08:00
Xinchen Hui
82ac3106e0
Use 5.4 specifical warnnig & Update NEWs
2013-04-04 14:47:49 +08:00
Xinchen Hui
f4f8b5a94b
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 14:44:28 +08:00
Xinchen Hui
c96a5bc6be
Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault)
2013-04-04 14:34:11 +08:00
Xinchen Hui
db3d629f05
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 13:40:46 +08:00
Xinchen Hui
7fc8077e4c
Fixed Bug #64578
2013-04-04 13:40:21 +08:00
Nikita Popov
d1ee0349d6
Merge branch 'PHP-5.5'
2013-04-03 20:30:31 +02:00
Nikita Popov
1f34ccbe34
Fix bug #64555 : foreach no longer copies keys if they are interned
2013-04-03 20:29:19 +02:00
Xinchen Hui
8333dcce68
Merge branch 'PHP-5.5'
2013-04-03 19:52:56 +08:00
Xinchen Hui
42f94aa978
Fix test due to opcache
2013-04-03 19:52:09 +08:00
Xinchen Hui
e15a97f924
Merge branch 'PHP-5.5'
2013-04-03 18:51:44 +08:00
Xinchen Hui
bbb4a44f98
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-03 18:51:19 +08:00
ptarjan
99ad08f9a5
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:27 +08:00
ptarjan
e8d80b770b
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:18 +08:00
Xinchen Hui
4799c8370b
Merge branch 'PHP-5.5'
2013-04-03 10:21:24 +08:00
Xinchen Hui
f5f3ab1b3f
format
2013-04-03 10:21:06 +08:00
Xinchen Hui
0495061a8f
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-03 10:20:52 +08:00
Xinchen Hui
e34767d426
format
2013-04-03 10:20:33 +08:00
Xinchen Hui
bd6a90dac7
Merge branch 'PHP-5.5'
2013-04-03 10:17:49 +08:00
Xinchen Hui
bb70176328
Update NEWS & UPGRADING
2013-04-03 10:17:27 +08:00
Xinchen Hui
6ace9c646b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/curl/interface.c
2013-04-03 10:15:41 +08:00
Xinchen Hui
78a9489f6a
Use new constant replace ugly trick
2013-04-03 10:12:49 +08:00
Xinchen Hui
37b20a1bc2
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-03 10:11:33 +08:00
Xinchen Hui
d7f709a032
Add CURL_WRAPPERS_ENABLE constant
...
see http://news.php.net/php.internals/66871
2013-04-03 10:09:51 +08:00
Remi Collet
688f5fc889
NEW for #64565
2013-04-02 16:34:39 +02:00
Remi Collet
c51e32860a
NEW for #64565
2013-04-02 16:33:54 +02:00
Remi Collet
db037caf18
Merge branch 'PHP-5.5'
...
* PHP-5.5:
keep previous test to avoid any behavior change
2013-04-02 16:31:54 +02:00
Remi Collet
44dbe6a815
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
keep previous test to avoid any behavior change
2013-04-02 16:31:45 +02:00
Remi Collet
731a5c5104
keep previous test to avoid any behavior change
2013-04-02 16:31:36 +02:00
Remi Collet
6cad4398a8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix comment
Fixed Bug #64565 copy doesn't report failure on partial copy
2013-04-02 16:24:33 +02:00
Remi Collet
ce89bc8743
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix comment
Fixed Bug #64565 copy doesn't report failure on partial copy
2013-04-02 16:24:14 +02:00
Remi Collet
8e8a75444c
fix comment
2013-04-02 16:24:00 +02:00
Remi Collet
6b4148bc97
Fixed Bug #64565 copy doesn't report failure on partial copy
...
_php_stream_copy_to_stream_ex, when mmap is possible, doesn't check
if actually written bytes match read bytes.
Fix this (paranoid check) to be consistent with non mmap mode
Seems hard to add a unit test, as this rely on a full filesystem.
2013-04-02 16:18:26 +02:00
Rasmus Lerdorf
91c514c49a
Merge branch 'PHP-5.5'
2013-04-01 16:30:34 -07:00
Rasmus Lerdorf
608b195c59
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-01 16:30:10 -07:00
Rasmus Lerdorf
527ac404a1
The printf modifier for a double is just %f
2013-04-01 16:27:09 -07:00
Dmitry Stogov
11262fba8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed ZTS build
2013-04-01 21:17:26 +04:00
Dmitry Stogov
23b44e7f39
Fixed ZTS build
2013-04-01 21:16:33 +04:00
Xinchen Hui
aa1c764e3e
Merge branch 'PHP-5.5'
2013-04-01 19:16:44 +08:00
Xinchen Hui
d8a5f41a60
Fixed bug parameter is casted to string of array_column
2013-04-01 19:11:45 +08:00
Xinchen Hui
79f68e285d
Merge branch 'PHP-5.5'
2013-04-01 18:17:53 +08:00
Xinchen Hui
3b504a3717
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-01 18:17:28 +08:00
Xinchen Hui
7b07d05917
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-01 18:13:38 +08:00
Xinchen Hui
9456dac54e
Fix test
2013-04-01 18:12:16 +08:00
Dmitry Stogov
71a45bec35
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #79 (Optimization Problem/Bug)
fix coverage data for the opcache optimizer
2013-04-01 11:34:37 +04:00
Dmitry Stogov
74f158fb9d
Fixed issue #79 (Optimization Problem/Bug)
2013-04-01 11:33:04 +04:00
Nuno Lopes
586dc07a8a
fix coverage data for the opcache optimizer
2013-03-31 15:45:15 -04:00
Nuno Lopes
ed54776960
fix coverage data for the opcache optimizer
2013-03-31 15:43:08 -04:00
Xinchen Hui
971676e859
Merge branch 'PHP-5.5'
2013-03-31 21:27:22 +08:00
Xinchen Hui
ad7c0b1928
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-31 21:26:26 +08:00
Xinchen Hui
72426a446d
Skip test when --with-curlwrappers enabled.
2013-03-31 21:22:48 +08:00
Xinchen Hui
f4e16fe7ef
Merge branch 'PHP-5.5'
2013-03-31 20:08:40 +08:00
Xinchen Hui
2f6b9b970c
Fix typo (it's in DateTime::__wakeup)
2013-03-31 20:07:14 +08:00
Derick Rethans
6cdf379185
Merge branch 'PHP-5.5'
2013-03-31 11:07:49 +01:00
Derick Rethans
503760c913
Updated test case and added BFN to NEWS.
2013-03-31 11:07:24 +01:00
EC2 Default User
b07ecb5501
Bug #60774 (DateInterval::format("%a") is always zero when an interval is
...
created using the createFromDateString method)
2013-03-31 10:59:21 +01:00
Derick Rethans
13004550a7
Merge branch 'PHP-5.5'
2013-03-31 10:56:23 +01:00
Derick Rethans
84208d9dc5
Added the new .c files as well as they are not automatically regenerated.
2013-03-31 10:55:45 +01:00
Lonny Kapelushnik
58a8013e5f
Rebased to PHP-5.4
...
Implemented Dmitrys change from df97c3aa0d
Moved the timelib_parse_tz_cor function to ext/date/lib/timelib.c
2013-03-31 10:45:01 +01:00
Lonny Kapelushnik
a4ca01cc2b
Made separate tests for each TZ type
...
Fixed handling of unserializing types 1 and 3
2013-03-31 10:45:00 +01:00
Lonny Kapelushnik
a1ebd82a29
Fixed the test to use %d instead of an actual number
2013-03-31 10:45:00 +01:00
Lonny Kapelushnik
30d0ae42b5
Bug 54567 DateTimeZone serialize/unserialize
...
Make DateTimeZone serializable and implement __set_state
2013-03-31 10:45:00 +01:00
Derick Rethans
bc6e26cdee
Merge branch 'PHP-5.5'
2013-03-31 10:39:11 +01:00
Derick Rethans
5dd73b9e54
Merge branch 'splitting-out-date-time-immutable' into PHP-5.5
2013-03-31 10:39:01 +01:00
Derick Rethans
68a7fec7af
Make DateTime and DateTimeImmutable siblings.
...
They both implement the DateTimeInterface interface, which specifies the
non-modifying methods of DateTime/DateTimeImmutable.
2013-03-31 10:37:16 +01:00
Stanislav Malyshev
da43e7e0cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:24:54 -07:00
Stanislav Malyshev
61fff1fd8b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:24:21 -07:00
Sergey Akbarov
1d4fcdff9f
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:22:30 -07:00
Xinchen Hui
ac9f53dd9c
Merge branch 'PHP-5.5'
2013-03-29 23:49:35 +08:00
Xinchen Hui
bed44e562e
missed part of the patch
2013-03-29 23:47:46 +08:00
Xinchen Hui
3ea4210f8d
Merge branch 'PHP-5.5'
2013-03-29 23:46:24 +08:00
Xinchen Hui
953f07503a
Fixed bug #64544 (Valgrind warnings after using putenv)
...
The frozen_envion is needed, since if an item in environ is updated
(like the test script HOME one), invalid free still shows up
2013-03-29 23:42:50 +08:00
Keyur Govande
1185d10a40
Merge branch 'master' of https://git.php.net/push/php-src
...
* 'master' of https://git.php.net/push/php-src :
fix BELL constant declaration
merging conflict left over
fix typo
add definition for 5.5
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
- fix regression (imagerotate_overflow.phpt), fix for all cases
- fix regression bug24155.phpt and bug39366.phpt
- fix regression (imagerotate_overflow.phpt)
fix memory leak
- ws
- add gd changes
- update the comment to match the code/features
setting plausible default value for struct members
Fixed test after nick previous fix
2013-03-29 14:47:11 +00:00
Keyur Govande
415d077e08
Merge branch 'PHP-5.5'
...
* PHP-5.5: (276 commits)
Patch for Bug #64544 . The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
Fix "passing NULL to non-pointer argument" warnings in intl
Remove support for cloning generators
Removed deprecated check
Fix whitespace issue in the SOAP test
Fix SOAP test
Forgot to fix the test on 5.4
Exclude Travis build for 5.3 and 5.4
Fix tests after addition of ^ (xor) operator to ini
Fix Bug #64545 : PHP Error in ef93a93ee2
Attempt to fix SKIP
This will PHP 5.3.25
Typo fix (greater then => greater than)
don't optimize script if it's not going to be cached
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
Fixed issue #78 (incorrect file path validation)
Fix test on Mac (\D shows up)
Add test for #64529
will be 5.4.15
...
2013-03-29 14:44:35 +00:00
Keyur Govande
b2a760fe45
Merge branch 'pull-request/313' into PHP-5.5
...
* pull-request/313:
Patch for Bug #64544 . The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
2013-03-29 14:42:16 +00:00
Keyur Govande
00d961cf6a
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/push/php-src: (266 commits)
Fix "passing NULL to non-pointer argument" warnings in intl
Remove support for cloning generators
Removed deprecated check
Fix whitespace issue in the SOAP test
Fix SOAP test
Forgot to fix the test on 5.4
Exclude Travis build for 5.3 and 5.4
Fix tests after addition of ^ (xor) operator to ini
Fix Bug #64545 : PHP Error in ef93a93ee2
Attempt to fix SKIP
This will PHP 5.3.25
Typo fix (greater then => greater than)
don't optimize script if it's not going to be cached
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
Fixed issue #78 (incorrect file path validation)
Fix test on Mac (\D shows up)
Add test for #64529
will be 5.4.15
fix NEWS
...
2013-03-29 14:35:45 +00:00
Keyur Govande
5bf6323e51
Patch for Bug #64544 .
...
The process title change module keeps track of the locally allocated
environ, so it doesn't need to worry about when environ changes
underneath it, for example by putenv()/setenv()
2013-03-29 14:27:36 +00:00
Nikita Popov
c3c4ff98ac
Merge branch 'PHP-5.5'
2013-03-29 13:01:08 +01:00
Nikita Popov
8aff7f0528
Fix "passing NULL to non-pointer argument" warnings in intl
...
The second argument to spprintf is a size_t (maximum length).
2013-03-29 12:55:00 +01:00
Nikita Popov
2f4c3ff330
Merge branch 'PHP-5.5'
2013-03-29 11:43:19 +01:00
Nikita Popov
8345abcabb
Remove support for cloning generators
2013-03-29 11:42:10 +01:00
Dmitry Stogov
606c9bb658
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed deprecated check
2013-03-29 03:18:51 +04:00
Dmitry Stogov
aa791a4d72
Removed deprecated check
2013-03-29 03:18:04 +04:00
Pierre Joye
95f830bc81
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix BELL constant declaration
2013-03-28 22:14:50 +01:00
Pierre Joye
ac0b66f160
fix BELL constant declaration
2013-03-28 22:14:34 +01:00
Nikita Popov
f2a2b418ec
Merge branch 'PHP-5.5'
2013-03-28 19:11:21 +01:00
Nikita Popov
0e25e00ecf
Fix whitespace issue in the SOAP test
2013-03-28 19:10:57 +01:00
Nikita Popov
7f40866248
Merge branch 'PHP-5.5'
2013-03-28 19:06:13 +01:00
Nikita Popov
a5e606a2ba
Fix SOAP test
...
Doesn't look like these warnings are present anymore.
2013-03-28 19:05:06 +01:00
Nikita Popov
19f93e9c6d
Merge branch 'PHP-5.5'
2013-03-28 18:43:20 +01:00
Nikita Popov
15994a14a4
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
.travis.yml
2013-03-28 18:43:11 +01:00
Nikita Popov
92aa361bfc
Forgot to fix the test on 5.4
2013-03-28 18:42:01 +01:00
Nikita Popov
bbe9052ca3
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-28 18:41:34 +01:00
Nikita Popov
fecce5a55f
Exclude Travis build for 5.3 and 5.4
2013-03-28 18:40:57 +01:00
Nikita Popov
b472d0733a
Merge branch 'PHP-5.5'
2013-03-28 18:36:06 +01:00
Nikita Popov
dcf0b71c98
Fix tests after addition of ^ (xor) operator to ini
2013-03-28 18:35:46 +01:00
Nikita Popov
f5e5878701
Merge branch 'PHP-5.5'
2013-03-28 18:24:27 +01:00
Nikita Popov
b1a6a17039
Fix Bug #64545 : PHP Error in ef93a93ee2
...
Test was using die "Foo" instead of die("Foo").
2013-03-28 18:23:23 +01:00
Xinchen Hui
5678ada68e
Merge branch 'PHP-5.5'
2013-03-28 23:24:17 +08:00
Xinchen Hui
127c78cb76
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 23:23:07 +08:00
Xinchen Hui
ef93a93ee2
Attempt to fix SKIP
2013-03-28 23:22:20 +08:00
Johannes Schlüter
c5b8004973
Merge branch 'PHP-5.5'
2013-03-28 15:09:28 +01:00
Johannes Schlüter
e6ef89861e
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 15:09:06 +01:00
Johannes Schlüter
242d88c20c
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-28 15:08:30 +01:00
Johannes Schlüter
46ee57f2d7
This will PHP 5.3.25
2013-03-28 15:05:46 +01:00
Xinchen Hui
c7f1279903
Merge branch 'PHP-5.5'
2013-03-28 19:14:25 +08:00
Xinchen Hui
f4daaf9250
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 19:13:58 +08:00
Veres Lajos
124a867b6a
Typo fix (greater then => greater than)
2013-03-28 19:12:08 +08:00
Dmitry Stogov
86d301b232
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
2013-03-28 13:48:18 +04:00
Dmitry Stogov
0b817624a7
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
2013-03-28 13:48:00 +04:00
Dmitry Stogov
07a6f3c677
Merge branch 'PHP-5.5'
...
* PHP-5.5:
don't optimize script if it's not going to be cached
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
2013-03-28 13:47:38 +04:00
Dmitry Stogov
3ae5c55596
don't optimize script if it's not going to be cached
2013-03-28 13:45:40 +04:00
Dmitry Stogov
037ea6f360
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
2013-03-28 13:34:59 +04:00
Remi Collet
18063dc2ac
Merge branch 'PHP-5.5'
...
* PHP-5.5:
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
2013-03-28 10:25:53 +01:00
Remi Collet
201128d39c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
2013-03-28 10:25:39 +01:00
Remi Collet
640e72ce91
With pkgconfig < 0.28 output is a single space
...
With pkgconfig = 0.28 output is an empty string,
This breaks the test on the 2 vars
Need to split when
LIB set (ex -lssl -lcrypto)
INC empty (because /usr/include used)
2013-03-28 10:22:20 +01:00
Dmitry Stogov
c4657614be
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #78 (incorrect file path validation)
2013-03-28 12:31:33 +04:00
Dmitry Stogov
031553cd01
Fixed issue #78 (incorrect file path validation)
2013-03-28 12:30:18 +04:00
Xinchen Hui
feefd2a8fd
Merge branch 'PHP-5.5'
2013-03-28 14:35:57 +08:00
Xinchen Hui
7dd661d0cd
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 14:35:02 +08:00
Xinchen Hui
ab089611e0
Fix test on Mac (\D shows up)
2013-03-28 14:34:08 +08:00
Xinchen Hui
d133cffa00
Merge branch 'PHP-5.5'
2013-03-28 13:55:06 +08:00
Xinchen Hui
ae71c1d9aa
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 13:54:37 +08:00
Xinchen Hui
55341ac0a8
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-03-28 13:54:04 +08:00
Xinchen Hui
467cd6a60f
Add test for #64529
2013-03-28 13:45:42 +08:00
Stanislav Malyshev
07a8ca5707
Merge branch 'PHP-5.5'
...
* PHP-5.5:
will be 5.4.15
fix NEWS
2013-03-27 14:02:45 -07:00
Stanislav Malyshev
5d535a007d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
will be 5.4.15
fix NEWS
Conflicts:
configure.in
main/php_version.h
2013-03-27 14:02:14 -07:00
Stanislav Malyshev
f982aaafa7
will be 5.4.15
2013-03-27 14:00:12 -07:00
Stanislav Malyshev
210d43d7a2
fix NEWS
2013-03-27 13:57:53 -07:00
Lars Strojny
218bcee202
Merge branch 'PHP-5.5'
...
Conflicts:
Zend/zend_ini_scanner.c
2013-03-27 21:37:42 +01:00
Lars Strojny
25b3c94944
Added XOR support for expressions in INI parser: NEWS and zend_language_scanner.c
2013-03-27 21:30:56 +01:00
Dejan Marjanovic
05016b7e96
Added XOR support for expressions in INI parser
2013-03-27 21:28:53 +01:00
Dmitry Stogov
9a80cec0ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64529 (Ran out of opcode space)
Conflicts:
Zend/zend_language_scanner.c
2013-03-28 00:10:13 +04:00
Dmitry Stogov
6e8aa09696
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64529 (Ran out of opcode space)
Conflicts:
NEWS
Zend/zend_execute_API.c
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
2013-03-28 00:08:11 +04:00
Dmitry Stogov
85e5e60777
Fixed bug #64529 (Ran out of opcode space)
2013-03-28 00:03:40 +04:00
Dmitry Stogov
391a41e167
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Remove unused variable
NEWS Section for beta 3
News for beta 2
2013-03-27 23:15:38 +04:00
Dmitry Stogov
f55ff56f24
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Remove unused variable
NEWS Section for beta 3
News for beta 2
2013-03-27 23:15:21 +04:00
Dmitry Stogov
4ee7bbdd08
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #74 (Allowed per request OPcache disabling)
2013-03-27 23:14:59 +04:00
Dmitry Stogov
1556d5df8a
Fixed issue #74 (Allowed per request OPcache disabling)
2013-03-27 23:13:21 +04:00
David Soria Parra
4263a23a79
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove unused variable
2013-03-27 20:01:05 +01:00
David Soria Parra
f92a15864b
Remove unused variable
2013-03-27 20:00:54 +01:00
David Soria Parra
dca8002519
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS Section for beta 3
News for beta 2
2013-03-27 19:58:10 +01:00
David Soria Parra
ef6cdb85d9
NEWS Section for beta 3
2013-03-27 19:57:24 +01:00
David Soria Parra
2185746feb
News for beta 2
2013-03-27 19:30:43 +01:00
Dmitry Stogov
36861bf91d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all)
2013-03-27 22:17:50 +04:00
Dmitry Stogov
91ab11ed07
Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all)
2013-03-27 22:16:18 +04:00
Dmitry Stogov
fc7efecda0
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
add WebP support in phpinfo
2013-03-27 21:09:51 +04:00
Dmitry Stogov
34ac5c9d0d
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
add WebP support in phpinfo
2013-03-27 21:09:31 +04:00
Dmitry Stogov
e67e6a1f36
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added opcache.enable_cli=0
2013-03-27 21:08:58 +04:00
Dmitry Stogov
26f3ff25fe
Added opcache.enable_cli=0
2013-03-27 21:08:18 +04:00
Dmitry Stogov
d40174c6bb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added description for opcache.enable_cli
2013-03-27 21:04:04 +04:00
Dmitry Stogov
f139534694
Added description for opcache.enable_cli
2013-03-27 21:02:39 +04:00
Pierre Joye
33e834aab8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add WebP support in phpinfo
2013-03-27 17:39:05 +01:00
Pierre Joye
e7d88a63fa
add WebP support in phpinfo
2013-03-27 17:38:57 +01:00
Pierre Joye
b03810761e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add windows 8 and windows server 2012
2013-03-27 07:29:56 +01:00
Pierre Joye
f01a7e54d3
add windows 8 and windows server 2012
2013-03-27 07:29:47 +01:00
Pierre Joye
5466035621
Merge branch 'PHP-5.5'
...
* PHP-5.5:
versions no longer supported, no need to check
2013-03-27 07:15:30 +01:00
Pierre Joye
d0aa831614
versions no longer supported, no need to check
2013-03-27 07:15:23 +01:00
Pierre Joye
705ab20252
Merge branch 'PHP-5.5'
...
* PHP-5.5:
FALSE on error
2013-03-27 05:13:42 +01:00
Pierre Joye
f3ebb40ad6
FALSE on error
2013-03-27 05:13:30 +01:00
Pierre Joye
8a85da4a61
merging conflict left over
2013-03-26 17:46:29 +01:00
Pierre Joye
4d73bb070e
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-26 11:24:48 +01:00
Pierre Joye
3b48dc0848
Merge branch 'master' of git.php.net:php-src
2013-03-26 11:24:30 +01:00
Pierre Joye
111123af4f
conflict
2013-03-26 11:24:00 +01:00
Pierre Joye
5ae6f582fb
fix regression, take #2 (merge issue due to git 1.8 default setting changes)
2013-03-26 11:23:15 +01:00
Xinchen Hui
c2afd2765b
Merge branch 'PHP-5.5'
2013-03-26 12:03:37 +08:00
Xinchen Hui
ed31582301
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 12:02:48 +08:00
Xinchen Hui
0496ad31ac
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-26 11:51:15 +08:00
Xinchen Hui
1182a3356c
Update test script
2013-03-26 11:50:47 +08:00
Xinchen Hui
62ec3893d2
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-26 11:47:38 +08:00
Xinchen Hui
5e9377ebd5
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 11:44:57 +08:00
Xinchen Hui
c356038c6e
Merge branch 'PHP-5.5'
2013-03-25 23:49:23 +08:00
Xinchen Hui
975d26667b
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-03-25 23:48:21 +08:00
Pierre Joye
c6e911e154
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-25 13:43:22 +01:00
Pierre Joye
b6fa581d2d
Merge branch 'master' of git.php.net:php-src
2013-03-25 13:43:08 +01:00
Pierre Joye
317168bb1e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
typo and WS
2013-03-25 13:42:42 +01:00
Pierre Joye
0171bcb9fa
typo and WS
2013-03-25 13:42:29 +01:00
Dmitry Stogov
65afa3c044
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
add new functions and constants for GD
2013-03-25 15:49:41 +04:00
Dmitry Stogov
0ff3065474
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
add new functions and constants for GD
2013-03-25 15:49:18 +04:00
Dmitry Stogov
a4c386f32c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
2013-03-25 15:48:13 +04:00
Dmitry Stogov
96e5f5eb05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-03-25 15:47:45 +04:00
Dmitry Stogov
e9f996c00d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-03-25 15:23:49 +04:00
Pierre Joye
878bef2a1d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-25 12:22:20 +01:00
Pierre Joye
d836e654bb
Merge branch 'master' of git.php.net:php-src
2013-03-25 12:20:21 +01:00
Pierre Joye
7da6272fe7
conflict
2013-03-25 12:20:01 +01:00
Pierre Joye
1c662dc303
add new functions and constants for GD
2013-03-25 12:15:46 +01:00
Dmitry Stogov
c4686b4de9
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
2013-03-25 15:07:27 +04:00
Dmitry Stogov
d74a192bd4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
back to dev (7.0.2-dev)
2013-03-25 13:58:12 +04:00
Dmitry Stogov
6a7088fd18
back to dev (7.0.2-dev)
2013-03-25 13:57:50 +04:00
Dmitry Stogov
57a0c655aa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed copy/paste mistake
2013-03-25 13:31:19 +04:00
Dmitry Stogov
f17156c2d1
Fixed copy/paste mistake
2013-03-25 13:30:45 +04:00
Dmitry Stogov
dedd0f56b6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
Separate "start_time" from "last_restart_time"
Fixed PHP-5.2 ZTS compatibility
2013-03-25 13:06:10 +04:00
Dmitry Stogov
0a00d29256
Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
2013-03-25 13:05:16 +04:00
Dmitry Stogov
64b029af0d
Separate "start_time" from "last_restart_time"
2013-03-25 12:33:24 +04:00
Dmitry Stogov
987dee9ca1
Fixed PHP-5.2 ZTS compatibility
2013-03-25 12:21:58 +04:00
Dmitry Stogov
2c22ffc909
Merge branch 'PHP-5.5'
...
* PHP-5.5:
7.0.1 release
2013-03-25 11:45:12 +04:00
Dmitry Stogov
a3316ffe6a
7.0.1 release
2013-03-25 11:44:09 +04:00
Stanislav Malyshev
4003cc23b1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
make it int main
2013-03-24 23:58:50 -07:00
Stanislav Malyshev
c20e4bbc96
make it int main
2013-03-24 23:58:30 -07:00
Stanislav Malyshev
981cd9c500
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix return value
2013-03-24 23:43:45 -07:00
Stanislav Malyshev
016fbd9991
fix return value
2013-03-24 23:43:25 -07:00
Stanislav Malyshev
9e86fa301f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add code to check if we know flock definition on this system
2013-03-24 20:12:33 -07:00
Stanislav Malyshev
385d0e52cc
add code to check if we know flock definition on this system
...
In order to configure detect it and not fail the compile.
Not an ideal solution, suggestions are welcome on how to improve it.
2013-03-24 20:11:28 -07:00
Stanislav Malyshev
f25c3283ae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix typo
add definition for 5.5
2013-03-24 20:04:28 -07:00
Stanislav Malyshev
c1ac5a20a5
fix typo
2013-03-24 20:04:24 -07:00
Stanislav Malyshev
bf457a0387
add definition for 5.5
2013-03-24 20:04:24 -07:00
Stanislav Malyshev
504ef64c7b
fix typo
2013-03-24 20:03:57 -07:00
Stanislav Malyshev
7c0bdb9a4f
add definition for 5.5
2013-03-24 19:54:10 -07:00
Pierre Joye
4394249881
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-25 03:19:08 +01:00
Pierre Joye
52b4a251b7
Merge branch 'master' of git.php.net:php-src
2013-03-25 03:17:59 +01:00
Pierre Joye
f21f37bb4c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
remove comments
2013-03-25 03:14:40 +01:00
Pierre Joye
1b34ab8ff8
remove comments
2013-03-25 03:14:27 +01:00
Stanislav Malyshev
1d59775c00
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:07:43 -07:00
Stanislav Malyshev
c342c9b964
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:07:30 -07:00
Stanislav Malyshev
be278293e4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:04:43 -07:00
Stanislav Malyshev
bd0b09c610
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:03:04 -07:00
Nikita Popov
1e8423b041
Merge branch 'PHP-5.5'
2013-03-24 17:55:01 +01:00
Nikita Popov
c08e1d2be9
Fix PDO::inTransaction() test for pgsql
...
inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.
2013-03-24 17:54:05 +01:00
Johannes Schlüter
32e0c24e7f
Merge branch 'PHP-5.5'
2013-03-24 17:33:41 +01:00
Johannes Schlüter
d900382814
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-24 17:33:17 +01:00
Johannes Schlüter
6f560b0487
Document embedded server options in manpage
2013-03-24 17:32:30 +01:00
Johannes Schlüter
de71f435d8
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-24 17:32:00 +01:00
Johannes Schlüter
66682f5abe
It's 2013, even for a manpage
2013-03-24 17:31:29 +01:00
Nikita Popov
095d552589
Merge branch 'PHP-5.5'
2013-03-24 17:07:36 +01:00
Nikita Popov
4633e07e29
Fix mysql_list_fields.phpt test
...
The minimum length is given in bytes, so it is charset dependent.
For utf8 charsets for example it's 3 rather than 1.
2013-03-24 17:07:16 +01:00
Pierre Joye
94c083ba64
fix conflict
2013-03-24 16:54:55 +01:00
Pierre Joye
be3e2bb295
fix generic rotation and 90 degrees & multiples rotation, take #2
2013-03-24 16:52:20 +01:00
Nikita Popov
453bcfecbf
Merge branch 'PHP-5.5'
2013-03-24 16:09:59 +01:00
Nikita Popov
585f71f497
Fix some errors in mysqlnd charset list
...
I fixed the stuff that seemed obviously wrong, but there are some more
differences with the SHOW COLLATIONS output:
* The whole range of "utf16" collations missing
* "filename" missing
* "ucs2_general_mysql500_ci" and "utf8_general_mysql500_ci" missing
I wasn't sure whether those omissions are intentional, so I didn't add
them.
2013-03-24 16:09:39 +01:00
David Soria Parra
04c659a042
Merge branch 'PHP-5.5'
...
* PHP-5.5:
2013-03-24 14:06:25 +01:00
David Soria Parra
ec7250fb64
Merge commit '1ec484d' into PHP-5.5
...
* commit '1ec484d':
- add imageaffinematrixget and imagematrixconcat
- add affine matrix helper for translate, scale, rotate and shear
- fix unix build
- add new files for interpolation
- config.m4 sync with .w32
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-24 14:05:55 +01:00
Nikita Popov
fce19c5f57
Merge branch 'PHP-5.5'
2013-03-24 13:58:44 +01:00
Nikita Popov
aa2b54812f
Fix version check in test
2013-03-24 13:58:35 +01:00
Pierre Joye
b3b42ccbf2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add reminder for checking return values
2013-03-24 13:29:30 +01:00
Pierre Joye
0179284bfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- add reminder for checking return values
2013-03-24 13:29:16 +01:00
Pierre Joye
bb18fa448c
- add reminder for checking return values
2013-03-24 13:27:00 +01:00
Anatol Belski
75ada593ca
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 22:44:10 +01:00
Anatol Belski
ec26141f92
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 22:43:58 +01:00
Pierre Joye
3af4896837
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
...
Signed-off-by: Anatol Belski <ab@php.net >
2013-03-23 22:42:03 +01:00
Nikita Popov
5c591acc4f
Merge branch 'PHP-5.5'
2013-03-23 21:45:24 +01:00
Nikita Popov
2b62226188
Fix cli server tests on travis
...
This passes an absolute path to the executable, rather than a relative.
Maybe this is something that should be done automatically by
run-tests.php as it doesn't apply only to travis.
2013-03-23 21:43:55 +01:00
Nikita Popov
03c55d6971
Merge branch 'PHP-5.5'
2013-03-23 21:09:37 +01:00
Nikita Popov
430c987716
Skip locale dependent test if locale not available
2013-03-23 21:09:21 +01:00
Nikita Popov
c2893ab592
Missed two occurances of Revision:
2013-03-23 21:09:20 +01:00
Anatol Belski
93c4ce4eed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reworked the changes for bug #64452
2013-03-23 21:01:05 +01:00
Anatol Belski
ec25e99193
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reworked the changes for bug #64452
2013-03-23 21:00:46 +01:00
Anatol Belski
04b492a5fe
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Reworked the changes for bug #64452
2013-03-23 20:59:47 +01:00
Anatol Belski
638c4b89b7
Reworked the changes for bug #64452
2013-03-23 20:57:59 +01:00
Nikita Popov
37c5425543
Merge branch 'PHP-5.5'
2013-03-23 20:14:13 +01:00
Nikita Popov
01583bdc36
phar phpinfo uses Id instead of Revision
2013-03-23 20:11:06 +01:00
Nikita Popov
faf256a4e7
Merge branch 'PHP-5.5'
2013-03-23 18:26:45 +01:00
Nikita Popov
9a56dce83f
Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS
2013-03-23 18:26:11 +01:00
Nikita Popov
bda5c0b082
Show diffs on Travis CI
2013-03-23 18:25:18 +01:00
Nikita Popov
1713d9ad30
Merge branch 'PHP-5.5'
...
Conflicts:
UPGRADING
UPGRADING.INTERNALS
2013-03-23 18:09:05 +01:00
Nikita Popov
0cb868c042
Move some internal changes from UPGRADING to UPGRADING.INTERNALS
2013-03-23 18:06:25 +01:00
Anatol Belski
3e45aa0723
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed possible precision loss in microtime
2013-03-23 17:48:21 +01:00
Anatol Belski
2e00f7611c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed possible precision loss in microtime
2013-03-23 17:48:05 +01:00
Anatol Belski
3654ff7366
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed possible precision loss in microtime
2013-03-23 17:47:39 +01:00
Anatol Belski
b022e54bd1
Fixed possible precision loss in microtime
...
This is related to the fix for bug #64370 . MSVC natively supports __int64 type,
so calculating with 32 bit ints is neither necessary nor reliable. Therefore
an older piece of code is reused.
2013-03-23 17:40:06 +01:00
Pierre Joye
8a256d8ffb
Merge branch 'master' of git.php.net:php-src
2013-03-23 10:30:06 +01:00
Pierre Joye
84220f8a60
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 10:26:26 +01:00
Pierre Joye
4a9eb328ee
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 10:21:22 +01:00
Pierre Joye
e6a9d1ca8d
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 10:18:31 +01:00
David Soria Parra
6cae773dae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Note about bison version
Add SplDoublyLinkedList::add to UPGRADING
Tweaks an add OPcache info to UPGRADING
Conflicts:
UPGRADING
2013-03-22 17:45:07 +01:00
David Soria Parra
defb08c705
Note about bison version
2013-03-22 17:44:32 +01:00
Etienne Kneuss
6af1b08482
Add SplDoublyLinkedList::add to UPGRADING
2013-03-22 11:35:45 +01:00
Pierre Joye
dd9e4b34d6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix regression (imagerotate_overflow.phpt), fix for all cases
2013-03-22 09:30:32 +01:00
Pierre Joye
f39a23696b
- fix regression (imagerotate_overflow.phpt), fix for all cases
2013-03-22 09:30:23 +01:00
Pierre Joye
672f8525fb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix regression bug24155.phpt and bug39366.phpt
2013-03-22 09:21:23 +01:00
Pierre Joye
f05972ddbf
- fix regression bug24155.phpt and bug39366.phpt
2013-03-22 09:21:11 +01:00
Pierre Joye
6512c44d8e
Merge branch 'master' of git.php.net:php-src
2013-03-22 08:31:11 +01:00
Pierre Joye
2a8a9c0007
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix regression (imagerotate_overflow.phpt)
2013-03-22 08:28:25 +01:00
Pierre Joye
4e6d54f5a7
- fix regression (imagerotate_overflow.phpt)
2013-03-22 08:28:11 +01:00
Rasmus Lerdorf
fd2b8df265
Tweaks an add OPcache info to UPGRADING
2013-03-21 23:14:16 -07:00
David Soria Parra
95c3b9ab39
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add OPCache ini settings to php.ini
2013-03-21 15:52:12 +01:00
David Soria Parra
293d5defb4
Add OPCache ini settings to php.ini
2013-03-21 15:51:23 +01:00
Xinchen Hui
9d2897a9d1
Merge branch 'PHP-5.5'
2013-03-21 21:32:57 +08:00
Xinchen Hui
534aec8a52
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-21 21:32:32 +08:00
Xinchen Hui
39a173b79b
Fix bug in reflectionClass relate to #64239
2013-03-21 21:32:06 +08:00
Xinchen Hui
0bf7549772
Merge branch 'PHP-5.5'
2013-03-21 21:11:42 +08:00
Xinchen Hui
9d31c0de0c
Update NEWS
2013-03-21 21:11:15 +08:00
Xinchen Hui
79925094c4
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-21 21:10:32 +08:00
Xinchen Hui
7dce0194c8
Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)
2013-03-21 21:09:30 +08:00
Xinchen Hui
bfbf334aff
Merge branch 'PHP-5.5'
2013-03-21 15:58:25 +08:00
Xinchen Hui
f2383dead6
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-21 15:58:08 +08:00
Xinchen Hui
08624ea90d
Fix test after f8b91d9acf
2013-03-21 15:57:21 +08:00
Xinchen Hui
b9185a4544
Merge branch 'PHP-5.5'
2013-03-21 11:15:05 +08:00
Xinchen Hui
b29a9fa75d
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-21 11:14:36 +08:00
Xinchen Hui
0fd3572f4e
Fixed bug #64432 (more empty delimiter warning in strX methods)
2013-03-21 11:14:10 +08:00
Xinchen Hui
da6916a770
fix memory leak
...
the value shouldn't be ref, use z_add_ref is enough
2013-03-21 10:58:58 +08:00
Xinchen Hui
d99c14b1a6
fix memory leak
...
the value shouldn't be ref, use z_add_ref is enough
2013-03-21 10:56:30 +08:00
Stanislav Malyshev
45b1d014f2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add array_column()
2013-03-20 14:16:08 -07:00
Stanislav Malyshev
6f17c6242f
add array_column()
2013-03-20 14:14:17 -07:00
David Soria Parra
78acb84b6e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS section for beta 2
NEWS for beta 1
Allow local override of PHPROOT in makedist
2013-03-20 15:24:00 +01:00
David Soria Parra
2258350450
NEWS section for beta 2
2013-03-20 15:17:53 +01:00
David Soria Parra
7f2424bb1d
NEWS for beta 1
2013-03-20 15:17:53 +01:00
David Soria Parra
52171aeaf4
Allow local override of PHPROOT in makedist
2013-03-20 15:17:53 +01:00
David Soria Parra
ec26c93eff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for array_column
array_column: Fix compile-time warnings
array_column: Removed array_pluck() alias
array_column: Set array_pluck as an alias for array_column
array_column: Implement ability to specify an index column
Cleaning up a memory leak.
array_column: Adding test for IS_OBJECT and converting object to string
array_column: Using add_next_index_zval() at nikic's recommendation.
array_column: Improved tests
array_column: Cleaning up, as recommended in pull request #56 comments
Fixing typo in test for array_column()
Simplify the code and use zend_hash_next_index_insert()
Adding test for columns not present in all rows for array_column().
Adding tests for the negative results of array_column()
Implement new array function array_column()
2013-03-20 13:14:33 +01:00
David Soria Parra
66b4e5cdec
NEWS for array_column
2013-03-20 13:14:20 +01:00
David Soria Parra
0173c4bab0
Merge branch 'pull-request/257' into PHP-5.5
...
* pull-request/257:
array_column: Fix compile-time warnings
array_column: Removed array_pluck() alias
array_column: Set array_pluck as an alias for array_column
array_column: Implement ability to specify an index column
Cleaning up a memory leak.
array_column: Adding test for IS_OBJECT and converting object to string
array_column: Using add_next_index_zval() at nikic's recommendation.
array_column: Improved tests
array_column: Cleaning up, as recommended in pull request #56 comments
Fixing typo in test for array_column()
Simplify the code and use zend_hash_next_index_insert()
Adding test for columns not present in all rows for array_column().
Adding tests for the negative results of array_column()
Implement new array function array_column()
2013-03-20 13:02:33 +01:00
Pierre Joye
fa161e9a67
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- ws
Conflicts:
UPGRADING
2013-03-20 12:38:22 +01:00
Pierre Joye
15ecea7602
- ws
2013-03-20 12:37:13 +01:00
Pierre Joye
09854f1fb9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add gd changes
Conflicts:
UPGRADING
2013-03-20 12:34:51 +01:00
Pierre Joye
ff7d7bb290
- add gd changes
2013-03-20 12:34:01 +01:00
Pierre Joye
83e81c40ae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- update the comment to match the code/features
2013-03-20 12:29:56 +01:00
Pierre Joye
f0078897c7
- update the comment to match the code/features
2013-03-20 12:29:47 +01:00
Pierre Joye
2799534296
Merge branch 'master' of git.php.net:php-src
2013-03-20 12:20:32 +01:00
Pierre Joye
bc7b287a61
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add imageaffinematrixget and imagematrixconcat
- add affine matrix helper for translate, scale, rotate and shear
- fix unix build
- add new files for interpolation
- config.m4 sync with .w32
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 12:19:46 +01:00
Pierre Joye
1ec484d3c5
- add imageaffinematrixget and imagematrixconcat
2013-03-20 12:19:03 +01:00
Pierre Joye
780c6e0a9c
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 11:01:37 +01:00
Pierre Joye
a46065ef71
- fix unix build
2013-03-20 09:24:54 +01:00
Anatol Belski
7daabc42a2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:15:46 +01:00
Anatol Belski
bf8026aacf
updated NEWS
2013-03-20 09:15:16 +01:00
Anatol Belski
0125ec77d2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:14:13 +01:00
Anatol Belski
0881ff0466
updated NEWS
2013-03-20 09:13:13 +01:00
Anatol Belski
06a526be3e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:12:33 +01:00
Anatol Belski
bb935ff8dc
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:10:10 +01:00
Pierre Joye
a7a53d369b
- add new files for interpolation
2013-03-20 08:10:54 +01:00
Pierre Joye
00a53ca817
- config.m4 sync with .w32
2013-03-20 07:52:23 +01:00
Pierre Joye
22159fb7b7
- add new interpolation method
...
. imagescale
. imageaffine
. replace imagerotate with new generic and optimized new implementations
. imagesetinterpolationmethod, to set the default interpolation to be
used with the new functions
. add imagepalettetotruecolor
2013-03-20 07:46:59 +01:00
Stanislav Malyshev
b5a7675836
Merge branch 'PHP-5.5'
...
* PHP-5.5:
clarify NEWS
2013-03-19 23:26:42 -07:00
Stanislav Malyshev
5aaff8d634
clarify NEWS
2013-03-19 22:32:50 -07:00
Ben Ramsey
f5bf1ba88f
array_column: Fix compile-time warnings
2013-03-19 20:44:19 -05:00
Anatol Belski
1cdf2c49ba
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Backported fix for bug #62852
2013-03-19 21:23:08 +01:00
Anatol Belski
cb76420fe0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Backported fix for bug #62852
2013-03-19 21:22:49 +01:00
Anatol Belski
cfd096fd7c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Backported fix for bug #62852
2013-03-19 21:22:09 +01:00
Anatol Belski
8d199c7c4f
Backported fix for bug #62852
2013-03-19 21:19:55 +01:00
David Soria Parra
d9f5056dba
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Refer to Zend Optimizer as Zend Opcache from now on
2013-03-19 16:21:14 +01:00
David Soria Parra
5e55c6d9fd
Refer to Zend Optimizer as Zend Opcache from now on
2013-03-19 16:20:37 +01:00
David Soria Parra
12877372ac
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ZO+ NEWS
2013-03-19 15:55:36 +01:00
David Soria Parra
60b36a6819
ZO+ NEWS
2013-03-19 15:54:57 +01:00
Anatol Belski
da1aa323fe
Merge branch 'master' of git.php.net:php-src
2013-03-19 15:16:16 +01:00
Anatol Belski
25b84546a8
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-19 15:15:31 +01:00
Anatol Belski
5cea998c5d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix C89 compat
2013-03-19 15:14:03 +01:00
Anatol Belski
b3d82845db
fix C89 compat
2013-03-19 15:13:27 +01:00
David Soria Parra
d90a85c3bd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix typos
2013-03-19 15:11:56 +01:00
David Soria Parra
c542e969f2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix typos
2013-03-19 15:11:48 +01:00
Carson McDonald
c6f6bf88d8
Fix typos
2013-03-19 15:11:34 +01:00
Anatol Belski
ce04268bb9
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-19 14:50:05 +01:00
Anatol Belski
11567299d5
Merge branch 'master' of git.php.net:php-src
2013-03-19 14:49:41 +01:00
David Soria Parra
7b876167cf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #48358 add() method for SplDoublyLinkedLis
2013-03-19 14:48:05 +01:00
Mark Baker
4257469079
Fix #48358 add() method for SplDoublyLinkedLis
2013-03-19 14:46:21 +01:00
Anatol Belski
3b922794ab
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix C90 compat
2013-03-19 14:45:57 +01:00
Anatol Belski
6f0f5d5281
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix C90 compat
2013-03-19 14:44:20 +01:00
Anatol Belski
7687b8b81c
fix C90 compat
2013-03-19 14:42:18 +01:00
Dmitry Stogov
b8ab827e4f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
2013-03-19 17:05:36 +04:00
Dmitry Stogov
4837bdb910
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
Conflicts:
NEWS
2013-03-19 17:04:35 +04:00
Dmitry Stogov
7b0993bfb4
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
2013-03-19 16:59:01 +04:00
Dmitry Stogov
e72d059a0c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Partial fix for bug #64239
2013-03-19 15:48:22 +04:00
Dmitry Stogov
960d5be528
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Partial fix for bug #64239
2013-03-19 15:47:43 +04:00
Dmitry Stogov
984561cfa8
Partial fix for bug #64239
2013-03-19 15:45:48 +04:00
Dmitry Stogov
baa5b3ef74
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 15:01:05 +04:00
Dmitry Stogov
74e11fb14c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62343 (Show class_alias In get_declared_classes())
Conflicts:
NEWS
2013-03-19 15:00:24 +04:00
Dmitry Stogov
84630a1109
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 14:59:08 +04:00
Dmitry Stogov
4a6291508d
Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 14:56:53 +04:00
Dmitry Stogov
b360d26294
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
2013-03-19 13:08:14 +04:00
Dmitry Stogov
ef8c8eaa95
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Conflicts:
NEWS
Zend/zend_compile.c
2013-03-19 13:07:32 +04:00
Dmitry Stogov
e62bb03257
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
2013-03-19 12:48:23 +04:00
Dmitry Stogov
48e82b2988
Merge branch 'PHP-5.5'
...
* PHP-5.5:
strlen() returns size_t
2013-03-19 10:45:57 +04:00
Dmitry Stogov
f621f0b8e7
strlen() returns size_t
2013-03-19 10:45:38 +04:00
Dmitry Stogov
48632d0fc4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Renamed Zend Optimizer+ into Zend OPcache
2013-03-19 10:32:50 +04:00
Dmitry Stogov
a62ffb72f4
Renamed Zend Optimizer+ into Zend OPcache
2013-03-19 10:32:24 +04:00
Dmitry Stogov
d5174afb89
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add stats to phpinfo
2013-03-19 10:19:01 +04:00
Dmitry Stogov
840c0d6091
Add stats to phpinfo
2013-03-19 10:17:44 +04:00
Dmitry Stogov
33ea10141d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Avoid trailing line break
2013-03-18 13:36:52 +04:00
Dmitry Stogov
5b0879e7c9
Avoid trailing line break
2013-03-18 13:36:31 +04:00
Dmitry Stogov
a9684532eb
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix NEWS
fix NEWS
2013-03-18 13:17:42 +04:00
Dmitry Stogov
0522e2cd66
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
fix NEWS
fix NEWS
2013-03-18 13:17:26 +04:00
Dmitry Stogov
4e4bc3a21b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add oom, wasted, hash and manual restart counters to help identify potential configuration problems
Add optional flag to opcache_get_status()
2013-03-18 13:16:32 +04:00
Dmitry Stogov
1fe43d0798
Add oom, wasted, hash and manual restart counters to help identify potential configuration problems
2013-03-18 13:13:35 +04:00
Stanislav Malyshev
06a67b3375
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix NEWS
fix NEWS
2013-03-18 00:52:53 -07:00
Stanislav Malyshev
260007a303
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2013-03-18 00:52:36 -07:00
Stanislav Malyshev
e25b2d7ea5
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix NEWS
2013-03-18 00:52:27 -07:00
Stanislav Malyshev
87c8ea15f2
fix NEWS
2013-03-18 00:52:15 -07:00
Stanislav Malyshev
b893326e0d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2013-03-18 00:51:35 -07:00
Stanislav Malyshev
db4d473d53
fix NEWS
2013-03-18 00:51:16 -07:00
Dmitry Stogov
ccf7d7cc93
Add optional flag to opcache_get_status()
2013-03-18 11:23:26 +04:00
Boris Lytochkin
92198fa2a5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
merge with 5.4
more test coverage: missing square bracket error message
Fixed bug #61981
2013-03-17 20:53:19 +04:00
Boris Lytochkin
fe384b3444
merge with 5.4
2013-03-17 20:52:55 +04:00
Boris Lytochkin
c5ba47ac59
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
more test coverage: missing square bracket error message
Fixed bug #61981
2013-03-17 20:52:12 +04:00
Boris Lytochkin
85d9d85ce2
more test coverage: missing square bracket error message
2013-03-17 20:40:15 +04:00
Boris Lytochkin
44197774c0
Fixed bug #61981
2013-03-17 20:29:14 +04:00
Boris Lytochkin
719264d1af
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #61981
2013-03-17 20:18:17 +04:00
Boris Lytochkin
5d0826e9c3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #61981
2013-03-17 20:02:34 +04:00
Boris Lytochkin
b32405053f
Fix bug #61981
2013-03-17 20:00:37 +04:00
Dmitry Stogov
ada89863c3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Load "black list" only if O+ is enabled
2013-03-17 12:17:39 +04:00
Dmitry Stogov
dcc927d3f2
Load "black list" only if O+ is enabled
2013-03-17 12:17:04 +04:00
Dmitry Stogov
513c6e7021
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Made opcache_get_status() return statistics during O+ restart
2013-03-17 11:57:08 +04:00
Dmitry Stogov
e66c8681c7
Made opcache_get_status() return statistics during O+ restart
2013-03-17 11:56:04 +04:00
Dmitry Stogov
0def1ca59a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added ability to load zend_extensions without absolute path names
2013-03-17 11:43:45 +04:00
Dmitry Stogov
0b8b6a727d
Added ability to load zend_extensions without absolute path names
2013-03-17 11:42:25 +04:00
Dmitry Stogov
8635900e8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Enabled O+ build by default (it may be disabled before 5.0.0 release)
2013-03-17 10:59:23 +04:00
Dmitry Stogov
930b272d70
Enabled O+ build by default (it may be disabled before 5.0.0 release)
2013-03-17 10:58:30 +04:00
Dmitry Stogov
2db4e43436
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed files that are neccessary only for standalone pecl branch
setting plausible default value for struct members
2013-03-17 10:42:41 +04:00
Dmitry Stogov
07b1eaa609
Removed files that are neccessary only for standalone pecl branch
2013-03-17 10:40:59 +04:00
Anatol Belski
fa3fc711d3
setting plausible default value for struct members
...
especially for unsigned members so they don't casted to max unsigned
2013-03-16 18:29:50 +01:00
Anatol Belski
23bf72f7b1
Merge branch 'master' of git.php.net:php-src
2013-03-16 18:27:21 +01:00
Etienne Kneuss
79d2657873
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove spurious int cast in between two longs
2013-03-16 18:20:24 +01:00
Etienne Kneuss
b46897941a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove spurious int cast in between two longs
2013-03-16 18:20:16 +01:00
Etienne Kneuss
5de1b08482
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove spurious int cast in between two longs
2013-03-16 18:20:06 +01:00
Etienne Kneuss
62364e6e01
Remove spurious int cast in between two longs
2013-03-16 18:19:14 +01:00
Anatol Belski
a8e72b61a6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
setting plausible default value for struct members
2013-03-16 18:09:30 +01:00
Anatol Belski
add5420d89
setting plausible default value for struct members
...
especially for unsigned members so they don't casted to max unsigned
2013-03-16 18:07:21 +01:00
Xinchen Hui
1ee20ab72a
Merge branch 'PHP-5.5'
2013-03-16 23:16:56 +08:00
Xinchen Hui
c1cf7538f0
Fixed test after nick previous fix
2013-03-16 23:16:32 +08:00
Xinchen Hui
acd160530a
Fix test after f8b91d9acf
2013-03-16 23:14:06 +08:00
Xinchen Hui
67618a8f88
Fixed test after nick previous fix
2013-03-16 22:58:47 +08:00
Dmitry Stogov
c4c61e395b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed memory leaks
2013-03-16 17:25:48 +04:00
Dmitry Stogov
e00b04a54f
Fixed memory leaks
2013-03-16 17:24:54 +04:00
Dmitry Stogov
1b72240226
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Made test compatible with O+
2013-03-16 16:11:41 +04:00
Dmitry Stogov
e9641141aa
Made test compatible with O+
2013-03-16 16:11:00 +04:00
Dmitry Stogov
b7fd7c79e9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compatibility with ext/phar
2013-03-16 16:08:51 +04:00
Dmitry Stogov
92430bcf5d
Fixed compatibility with ext/phar
2013-03-16 16:08:11 +04:00
Dmitry Stogov
e6fc7c1e76
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed O+ testes
2013-03-16 12:08:25 +04:00
Dmitry Stogov
ac05e68f55
Fixed O+ testes
2013-03-16 12:07:09 +04:00
Dmitry Stogov
9ef01ce698
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-16 00:46:34 +04:00
Dmitry Stogov
b3ed38c704
Merge branch 'master' of git.php.net:php-src
2013-03-16 00:46:00 +04:00
Dmitry Stogov
29a9e13d60
Merge branch 'PHP-5.5'
...
* PHP-5.5: (101 commits)
Renamed ZendOptimizerPlus.so into opcache.so
"ZendOptimizerPlus" is renamed to "opcache" to de merged into PHP-5.5 under ext/opcache (the product name is still "Zend Optimizer+")
More accurate restart scheduling
Autogolobal $GLOBALS has to be pinged even if auto_globals_jit=0
Allow only shared O+ build
Fixed typos
add tests into package
Add test script for #57 (segfaults in drupal7)
fixed memory leaks
Fixed Issue #57 (segfaults in drupal7)
Fixed issue #58 (PHP-5.2 compatibility)
Allows exclusion of large files from being cached
Add maintainers inot package.xml
fix ANSI C90 compat
Fixed test
Fixed uninitialized variable
Fixed bug #64353 (Built-in classes can be unavailable with dynamic includes and Optimizer+)
Save a stat() call by calling sapi_module.get_stat()
Fixed #54 (PECL install adds extension= instead of zend_extension= to php.ini)
release 7.0.0
...
2013-03-16 00:43:40 +04:00
Dmitry Stogov
34d3202eda
Merge Zend Optimizer+
...
git-subtree-dir: ext/opcache
git-subtree-mainline: b1dbfb7357
git-subtree-split: 8d35170c5f
2013-03-16 00:41:46 +04:00
Anatol Belski
be8282b927
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #62852 Unserialize Invalid Date crash
2013-03-15 21:30:18 +01:00
Anatol Belski
f8b91d9acf
Fixed bug #62852 Unserialize Invalid Date crash
...
Error handling is the same as in bug #53437 , E_ERROR if we
expect an invalid object.
2013-03-15 21:22:35 +01:00
Anatol Belski
a3bb8ff4e4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
2013-03-15 19:12:51 +01:00
Anatol Belski
b1dbfb7357
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
2013-03-15 19:12:34 +01:00
Anatol Belski
73c38eca5a
updated NEWS
2013-03-15 19:11:53 +01:00
Anatol Belski
7d84cf6a75
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Backported patch for #64370
2013-03-15 19:09:36 +01:00
Anatol Belski
f058942923
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Backported patch for #64370
2013-03-15 19:09:18 +01:00
Anatol Belski
90c8f16c3b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Backported patch for #64370
2013-03-15 19:08:32 +01:00
Anatol Belski
b903d2d6cd
Backported patch for #64370
2013-03-15 19:04:40 +01:00
Dmitry Stogov
8d35170c5f
Renamed ZendOptimizerPlus.so into opcache.so
2013-03-15 21:03:05 +04:00
Anatol Belski
65a1c314b3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #53437 Crash with unserialized DatePeriod instance
2013-03-15 17:01:16 +01:00
Anatol Belski
0ee71557ff
Fixed bug #53437 Crash with unserialized DatePeriod instance
2013-03-15 16:59:54 +01:00
Nikita Popov
279285598d
Merge branch 'PHP-5.5'
2013-03-15 13:49:14 +01:00
Nikita Popov
b7788c52f1
Fix wrong macro usage and add missing NEWS entry
2013-03-15 13:48:33 +01:00
Dmitry Stogov
c765c81cf6
"ZendOptimizerPlus" is renamed to "opcache" to de merged into PHP-5.5 under ext/opcache (the product name is still "Zend Optimizer+")
2013-03-15 16:21:07 +04:00
Ferenc Kovacs
2b1c2e3c3f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
explain the step updating the git submodule reference in web/php.git
2013-03-15 09:42:37 +01:00
Ferenc Kovacs
cc51729c00
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
explain the step updating the git submodule reference in web/php.git
2013-03-15 09:41:50 +01:00
Ferenc Kovacs
30eff1a697
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
explain the step updating the git submodule reference in web/php.git
2013-03-15 09:41:34 +01:00
Ferenc Kovacs
9350f45aca
explain the step updating the git submodule reference in web/php.git
2013-03-15 09:40:28 +01:00
Dmitry Stogov
be020633f2
More accurate restart scheduling
2013-03-15 11:49:33 +04:00
Dmitry Stogov
0ab356c8e5
Autogolobal $GLOBALS has to be pinged even if auto_globals_jit=0
2013-03-15 10:45:49 +04:00
Dmitry Stogov
61ac64b372
Allow only shared O+ build
2013-03-14 23:11:10 +04:00
Anatol Belski
657135c16a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix zts check
2013-03-14 14:40:03 +01:00
Anatol Belski
96388c78c9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix zts check
2013-03-14 14:39:47 +01:00
Anatol Belski
5df8cf1975
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix zts check
2013-03-14 14:39:09 +01:00
Anatol Belski
e43c5a8395
fix zts check
2013-03-14 14:38:20 +01:00
Dmitry Stogov
22b0f5d829
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed redundand code
2013-03-14 14:22:51 +04:00
Dmitry Stogov
dd1c358d1b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix the fix
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
Forgot to remove some now unused variables
Add support for non-scalar Iterator keys in foreach
fixed headers order
- Updated to version 2013.2 (2013b)
fixed the test
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
Disable zend_always_inline in debug build
2013-03-14 14:19:41 +04:00
Andrey Hristov
37664354e5
Merge branch 'PHP-5.5'
2013-03-13 15:57:08 +01:00
Andrey Hristov
f4279f0d5e
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-03-13 15:57:04 +01:00
Andrey Hristov
c09652c289
fix the fix
2013-03-13 15:56:44 +01:00
Andrey Hristov
7503a4b4a4
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-03-13 15:29:40 +01:00
Dmitry Stogov
d77c865aff
Removed redundand code
2013-03-13 17:51:10 +04:00
Andrey Hristov
0777a18703
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
NEWS
2013-03-13 14:24:23 +01:00
Andrey Hristov
f1e2edff8b
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
2013-03-13 13:37:51 +01:00
Nikita Popov
5f136b5e04
Merge branch 'PHP-5.5'
2013-03-12 17:39:40 +01:00
Nikita Popov
28634bf603
Forgot to remove some now unused variables
2013-03-12 17:39:20 +01:00
Nikita Popov
81623d3a60
Merge branch 'PHP-5.5'
...
Conflicts:
UPGRADING
UPGRADING.INTERNALS
2013-03-12 17:29:54 +01:00
Nikita Popov
fcc6611de9
Add support for non-scalar Iterator keys in foreach
...
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Anatol Belski
8eed855b84
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed headers order
2013-03-12 08:35:49 +01:00
Anatol Belski
8436342d88
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed headers order
2013-03-12 08:34:48 +01:00
Anatol Belski
a328cc452e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed headers order
2013-03-12 08:34:16 +01:00
Anatol Belski
bdaafe3c7b
fixed headers order
2013-03-12 08:33:36 +01:00
Derick Rethans
d0ddcf70e4
Merge branch 'PHP-5.5'
2013-03-11 21:36:42 +00:00
Derick Rethans
e5c64c0bda
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-11 21:36:41 +00:00
Derick Rethans
98bb5f4798
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-11 21:36:37 +00:00
Derick Rethans
50ad2af503
- Updated to version 2013.2 (2013b)
2013-03-11 21:36:36 +00:00
Pascal Borreli
4c5517623c
Fixed typos
2013-03-11 18:49:05 +00:00
Anatol Belski
64dba85575
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed the test
2013-03-11 16:15:01 +01:00
Anatol Belski
278c4097c6
fixed the test
2013-03-11 16:14:39 +01:00
Anatol Belski
20e4d86984
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
2013-03-11 16:05:07 +01:00
Anatol Belski
8aaa09636a
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
2013-03-11 16:04:37 +01:00
Xinchen Hui
01e1ba8873
Merge branch 'PHP-5.5'
...
Conflicts:
UPGRADING
2013-03-11 15:19:59 +08:00
Xinchen Hui
4573405c5d
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-11 15:16:47 +08:00
Xinchen Hui
0444708c5c
Disable zend_always_inline in debug build
...
it will be much more easier for debuging
2013-03-11 15:15:22 +08:00
Keyur Govande
c7ad92fac7
Adding in NEWS/UPGRADING about process title change support.
2013-03-11 00:20:57 +00:00
Keyur Govande
cdacda720c
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/push/php-src :
Fix tests after laruence unserialize change
Fix get_property_ptr_ptr declaration in simplexml
Update NEWS
Fixed confused exception message while user threw exception
Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
Fix date
use NEWS only
Fixed bug #61025 (__invoke() visibility not honored)
2013-03-11 00:05:49 +00:00
Nikita Popov
3670085d7d
Merge branch 'PHP-5.5'
2013-03-09 20:22:29 +01:00
Nikita Popov
9490118fdb
Fix tests after laruence unserialize change
2013-03-09 20:21:33 +01:00
Nikita Popov
a59b211b2d
Fix get_property_ptr_ptr declaration in simplexml
...
A new parameter was added to the API and simplexml wasn't adjusted,
thus causing crashes.
2013-03-09 20:15:00 +01:00
Xinchen Hui
12413b1393
Merge branch 'PHP-5.5'
2013-03-09 23:12:25 +08:00
Xinchen Hui
9d816ba1d3
Update NEWS
2013-03-09 23:11:48 +08:00
Xinchen Hui
1be745ce1b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/standard/var_unserializer.c
2013-03-09 23:10:48 +08:00
Xinchen Hui
7197f0ffcc
Fixed confused exception message while user threw exception
2013-03-09 23:08:14 +08:00
Xinchen Hui
f52b2e6a65
Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
...
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
2013-03-09 23:00:58 +08:00
Xinchen Hui
76fda41bb3
Merge branch 'PHP-5.5'
2013-03-09 11:38:58 +08:00
Xinchen Hui
af5ada3871
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-09 11:38:32 +08:00
Xinchen Hui
6fece94369
Fix date
2013-03-09 11:37:41 +08:00
David Soria Parra
6824dc6b33
use NEWS only
2013-03-08 11:12:35 +01:00
Xinchen Hui
79a96d2af0
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS-5.5
2013-03-08 10:36:13 +08:00
Xinchen Hui
01049ca7ae
Fixed bug #61025 (__invoke() visibility not honored)
2013-03-08 10:34:17 +08:00
Keyur Govande
15c3d3ac71
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Support for CLI process title (https://wiki.php.net/rfc/cli_process_title )
2013-03-07 23:59:11 +00:00
Keyur Govande
5543035a70
Merge branch 'pull-request/300' into PHP-5.5
...
* pull-request/300:
Support for CLI process title (https://wiki.php.net/rfc/cli_process_title )
2013-03-07 23:51:37 +00:00
David Soria Parra
ced5f41a9a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix for https://bugs.php.net/bug.php?id=62649
2013-03-07 23:20:35 +01:00
Ralph Schindler
ac73ca6db4
Fix for https://bugs.php.net/bug.php?id=62649
2013-03-07 23:20:11 +01:00
David Soria Parra
3adb1aa89e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Typo fix: recieved to received
2013-03-07 23:05:14 +01:00
Carson McDonald
0c11cab919
Typo fix: recieved to received
2013-03-07 23:05:05 +01:00
Keyur Govande
a0a995cff3
Support for CLI process title ( https://wiki.php.net/rfc/cli_process_title )
...
A new commit into branch 5.5
2013-03-07 18:54:34 +00:00
David Soria Parra
19915917b9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
News for next beta
Do another Alpha instead of Beta because of ZO+ RFC being voted on
2013-03-07 12:16:31 +01:00
David Soria Parra
e98271f588
News for next beta
2013-03-07 12:14:48 +01:00
David Soria Parra
d0ca2430da
Do another Alpha instead of Beta because of ZO+ RFC being voted on
2013-03-07 12:14:26 +01:00
Xinchen Hui
d2f9804e1f
add tests into package
2013-03-07 14:53:22 +08:00
Xinchen Hui
bc926f2fbb
Add test script for #57 (segfaults in drupal7)
2013-03-07 12:19:30 +08:00
Dmitry Stogov
b543511343
fixed memory leaks
2013-03-07 08:13:58 +04:00
David Soria Parra
76c6061aa0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for the next beta
NEWS for PHP 5.5.0 Beta 1
2013-03-07 00:27:48 +01:00
David Soria Parra
4923bb579a
NEWS for the next beta
2013-03-06 23:51:27 +01:00
David Soria Parra
b6ae7cba1e
NEWS for PHP 5.5.0 Beta 1
2013-03-06 22:39:54 +01:00
Dmitry Stogov
1143d3b1d0
Fixed Issue #57 (segfaults in drupal7)
2013-03-06 22:32:21 +04:00
Anatol Belski
7fb0142fee
Merge branch 'PHP-5.5'
...
* PHP-5.5:
simplified the previous fix for #64359
2013-03-06 16:49:33 +01:00
Anatol Belski
8589dfb6cc
simplified the previous fix for #64359
2013-03-06 16:48:51 +01:00
Dmitry Stogov
b34e50cc78
Fixed issue #58 (PHP-5.2 compatibility)
2013-03-06 17:49:47 +04:00
Anatol Belski
cb80655024
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64359 strftime crash with VS2012
2013-03-06 12:39:01 +01:00
Anatol Belski
371000a877
Fixed bug #64359 strftime crash with VS2012
2013-03-06 12:37:57 +01:00
Stanislav Malyshev
9ccf470b5f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix NEWS
2013-03-06 00:45:54 -08:00
Stanislav Malyshev
9ed7eab514
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2013-03-06 00:45:26 -08:00
Stanislav Malyshev
38847482c8
fix NEWS
2013-03-06 00:44:43 -08:00
Dmitry Stogov
40ce4127f6
Merge branch 'master' of github.com:zend-dev/ZendOptimizerPlus
2013-03-06 09:42:26 +04:00
Dmitry Stogov
08bfdc75a4
Allows exclusion of large files from being cached
2013-03-06 09:41:59 +04:00
Xinchen Hui
be5369be59
Add maintainers inot package.xml
...
otherwise, when doing release, pecl net will sync the maintianers info
form package.xml
2013-03-06 11:22:20 +08:00
Anatol Belski
bfb8b9153b
fix ANSI C90 compat
2013-03-05 20:24:58 +01:00
Dmitry Stogov
c3c244af81
Fixed test
2013-03-05 22:49:31 +04:00
Dmitry Stogov
6ab1759369
Fixed uninitialized variable
2013-03-05 15:46:21 +04:00
Dmitry Stogov
fae0a738df
Fixed bug #64353 (Built-in classes can be unavailable with dynamic includes and Optimizer+)
2013-03-05 14:57:50 +04:00
Xinchen Hui
0fbe0a1495
Merge branch 'PHP-5.5'
2013-03-05 17:18:41 +08:00
Xinchen Hui
082741814a
skip if no IPv6 support
2013-03-05 17:18:13 +08:00
Xinchen Hui
09e9c294b8
Merge branch 'PHP-5.5'
2013-03-05 16:57:37 +08:00
Xinchen Hui
e5d0dc24d2
Fix tests temporary
...
seems IPV6_PKTINFO are not avaiable in some OS
2013-03-05 16:56:00 +08:00
Dmitry Stogov
32904c6043
Merge branch 'master' of github.com:zend-dev/ZendOptimizerPlus
2013-03-05 12:18:57 +04:00
Dmitry Stogov
9c5039eabb
Save a stat() call by calling sapi_module.get_stat()
2013-03-05 12:17:18 +04:00
Xinchen Hui
ac2376fbf1
Merge branch 'PHP-5.5'
2013-03-05 14:03:47 +08:00
Xinchen Hui
1978dae309
Skip test on Apple
2013-03-05 14:02:28 +08:00
Xinchen Hui
3f67d5ae43
Revert "Fixed Bug #64340 (sockets tests failed) Patch by Reeze"
...
build break, will only leave the test script fix first
This reverts commit f2246f352f .
2013-03-05 13:58:20 +08:00
Xinchen Hui
3b78c87a36
Fixed #54 (PECL install adds extension= instead of zend_extension= to php.ini)
2013-03-05 13:37:49 +08:00
Xinchen Hui
8f991588b9
Merge pull request #52 from laruence/master
...
update package.xml for releasing 7.0.0
2013-03-04 05:35:14 -08:00
Pierre Joye
177a25fef2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix path
2013-03-04 14:14:36 +01:00
Pierre Joye
0404c38615
- fix path
2013-03-04 14:14:09 +01:00
Pierre Joye
e9a2642c89
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-04 14:06:09 +01:00
Xinchen Hui
a293bd1c4a
release 7.0.0
2013-03-04 19:49:53 +08:00
Dmitry Stogov
2c95834135
Increased version number
2013-03-04 15:29:02 +04:00
Dmitry Stogov
3b0da73d32
Preparaton for pecl release
2013-03-04 15:26:40 +04:00
Pierre Joye
33a8e387f5
- damned conflicts
2013-03-04 12:11:20 +01:00
Pierre Joye
a29ae8c8f7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add noisy php logo for autocrop with threshold test
2013-03-04 12:06:11 +01:00
Pierre Joye
5001f40e82
- add noisy php logo for autocrop with threshold test
2013-03-04 12:05:59 +01:00
Pierre Joye
5357d55634
Merge branch 'master' of git.php.net:php-src
2013-03-04 12:05:13 +01:00
Pierre Joye
3e0e64f208
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add test for imagecropauto
- (s)rgb distance works way better for now, re enable threshold
- disable threshold for now, will enable it again using CIEDE2000
- add todo for threshold
- clean and enable threshold
- add image crop support
Conflicts:
UPGRADING
2013-03-04 12:03:01 +01:00
Anatol Belski
defb654efd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:15:34 +01:00
Anatol Belski
2635408a0d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:15:17 +01:00
Anatol Belski
4e46a87392
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:14:14 +01:00
Stephen A. Zarkos
b6fdb60ecf
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:09:45 +01:00
Pierre Joye
2024ff3b61
- add test for imagecropauto
2013-03-04 07:26:07 +01:00
Xinchen Hui
d207f23475
Merge branch 'typofix' of https://github.com/carsonmcdonald/php-src
2013-03-04 10:47:30 +08:00
Stanislav Malyshev
d93d8acca7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
rename NEWS back
updated NEWS
2013-03-03 13:24:31 -08:00
Stanislav Malyshev
b65d4d1cfc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
rename NEWS back
updated NEWS
2013-03-03 13:24:00 -08:00
Stanislav Malyshev
2578f7bcc0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
rename NEWS back
updated NEWS
2013-03-03 13:20:57 -08:00
Stanislav Malyshev
656fcb67f1
rename NEWS back
2013-03-03 13:18:58 -08:00
Anatol Belski
3f48adbd64
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:23:26 +01:00
Anatol Belski
a5b6a0a25b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:23:06 +01:00
Anatol Belski
d95faef1a1
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:22:35 +01:00
Anatol Belski
fe2612d71e
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
...
* 'PHP-5.3' of git.php.net:php-src:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:21:45 +01:00
Anatol Belski
5e57bebbb7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
This commit was manufactured by cvs2svn to create tag 'NEWS'.
2013-03-03 19:17:14 +01:00
Anatol Belski
555d584a40
updated NEWS
2013-03-03 19:16:36 +01:00
Anatol Belski
b89c326578
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
This commit was manufactured by cvs2svn to create tag 'NEWS'.
2013-03-03 19:15:37 +01:00
Anatol Belski
00ecc12c0f
updated NEWS
2013-03-03 19:14:50 +01:00
Anatol Belski
faf14e9b2e
Merge commit 'NEWS' into PHP-5.4
...
* commit 'NEWS':
This commit was manufactured by cvs2svn to create tag 'NEWS'.
2013-03-03 19:14:17 +01:00
Anatol Belski
e1023affc1
updated NEWS
2013-03-03 19:13:38 +01:00
Anatol Belski
8dd1e0bf6c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
merged PCRE 8.32
2013-03-03 19:11:25 +01:00
Derick Rethans
ef99886bcb
Merge branch 'PHP-5.5'
2013-03-03 13:10:41 -05:00
Derick Rethans
1e1de1554f
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 13:10:24 -05:00
Anatol Belski
1cda84a986
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
merged PCRE 8.32
2013-03-03 19:10:12 +01:00
Derick Rethans
47ac3ec1f4
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-03 13:10:07 -05:00
Derick Rethans
6c2564766f
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 13:09:52 -05:00
Derick Rethans
206cce0d8b
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-03 13:09:31 -05:00
Derick Rethans
b36df28dca
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 13:08:19 -05:00
Anatol Belski
ca4a3e6138
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
merged PCRE 8.32
2013-03-03 19:07:49 +01:00
Anatol Belski
357ab3cbad
merged PCRE 8.32
...
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
2013-03-03 19:06:22 +01:00
Derick Rethans
b267ad3902
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-03-03 13:00:42 -05:00
Derick Rethans
c596850af6
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-03-03 12:58:42 -05:00
Derick Rethans
a3f020a4be
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-03 12:53:23 -05:00
Derick Rethans
c134f2a1a5
- Updated to version 2013.1 (2013a)
2013-03-03 12:53:22 -05:00
Carson McDonald
58f3c74e13
Fix a couple typos
2013-03-03 10:44:46 -05:00
Pierre Joye
0a55c4b1dd
- (s)rgb distance works way better for now, re enable threshold
2013-03-03 05:30:12 +01:00
Xinchen Hui
b572f07b6f
Merge branch 'PHP-5.5'
2013-03-03 11:25:49 +08:00
Xinchen Hui
46e612ada4
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-03 11:25:29 +08:00
Xinchen Hui
fe5ce5cb91
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-03-03 11:25:08 +08:00
Xinchen Hui
9bda6a25a5
Fix test (skip on unable to create socket)
2013-03-03 11:24:45 +08:00
Xinchen Hui
a3c0942cb0
Merge branch 'PHP-5.5'
2013-03-03 11:14:34 +08:00
Xinchen Hui
2413fa6fbb
Fix test after the convert_to_long be improved, see #64290
2013-03-03 11:13:52 +08:00
Xinchen Hui
0cdd4e83bd
Merge branch 'PHP-5.5'
2013-03-03 11:00:36 +08:00
Xinchen Hui
505c6ca486
Fixed bug #64290 (behavior change of converting to long)
...
convert_to_long behavior has been improved
As Cataphrace said in IRC, the test should be fixed.
2013-03-03 10:59:15 +08:00
Xinchen Hui
b5e8597e5a
Merge branch 'PHP-5.5'
2013-03-03 10:53:52 +08:00
Xinchen Hui
f2246f352f
Fixed Bug #64340 (sockets tests failed) Patch by Reeze
...
Add __APPLE_USE_RFC_3542 for OS X 10.7 because IPv6 options are incompatible with RFC 2292.
2013-03-03 10:51:04 +08:00
Dmitry Stogov
68c265ce37
typo
2013-03-01 22:57:53 +04:00
Dmitry Stogov
ecf0cbdf3b
Fixed timestamp update on Phar contents modification.
2013-03-01 19:17:25 +04:00
Dmitry Stogov
b6656d0ec9
Fixed timestamp update on Phar contents modification.
2013-03-01 19:17:08 +04:00
Pierre Joye
7698bc5735
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 08:10:49 +01:00
Dmitry Stogov
28cd079adb
Added info anout zend_optimizerplus.mmap_base directice
2013-03-01 10:17:41 +04:00
Dmitry Stogov
a91292c6e9
Merge branch 'master' of https://github.com/Tyrael/ZendOptimizerPlus into test
2013-03-01 10:03:59 +04:00
Dmitry Stogov
aa1e91b130
Merge branch 'patch-1' of https://github.com/patrickallaert/ZendOptimizerPlus into test
2013-03-01 10:00:21 +04:00
Stanislav Malyshev
6eff31e1fd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.4.24-dev
5.3.23RC1
2013-02-28 21:31:15 -08:00
Stanislav Malyshev
99b373da25
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.24-dev
5.3.23RC1
2013-02-28 21:30:02 -08:00
Stanislav Malyshev
03dfa08da9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
5.4.24-dev
5.3.23RC1
Conflicts:
configure.in
main/php_version.h
2013-02-28 21:29:40 -08:00
Stanislav Malyshev
5c5bc7cf1b
5.4.24-dev
2013-02-28 21:25:36 -08:00
Stanislav Malyshev
8f533d2dfd
5.3.23RC1
2013-02-28 21:22:06 -08:00
Ferenc Kovacs
0a29c8de7a
adding the package.xml for pecl
2013-02-28 22:38:09 +01:00
Pierre Joye
22aeb976e0
- add todo for threshold
2013-02-28 19:34:14 +01:00
Pierre Joye
0c32a18d4c
- clean and enable threshold
2013-02-28 19:22:06 +01:00
Pierre Joye
a991360344
- add image crop support
2013-02-28 17:24:23 +01:00
Patrick Allaert
171843a4e0
Fixed typo
2013-02-28 15:44:58 +01:00
Pierre Joye
02a15898b2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- typo
2013-02-27 21:03:09 +01:00
Pierre Joye
82765a0780
- typo
2013-02-27 21:02:47 +01:00
Pierre Joye
c9a67b17db
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix name for imageflip constants, consistent witht the other
- add test
- add constants for imageflip
2013-02-27 20:23:38 +01:00
Pierre Joye
74983a45cc
- fix name for imageflip constants, consistent witht the other
2013-02-27 20:23:31 +01:00
Pierre Joye
03d0bf633d
- add test
2013-02-27 20:22:45 +01:00
Pierre Joye
34adce6c47
- add constants for imageflip
2013-02-27 20:08:26 +01:00
Ilia Alshanetsky
23daa95d10
return false to be consistent
2013-02-27 13:54:56 -05:00
Ilia Alshanetsky
0039f160f2
Make the functions validate input parameters (or lack thereof)
2013-02-27 13:53:03 -05:00
Dmitry Stogov
d39a49a534
Correction
2013-02-27 21:35:24 +04:00
Ilia Alshanetsky
e1fb6ce365
Added missing calloc() result checks
2013-02-27 10:13:01 -05:00
Pierre Joye
6192dbaa7e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add only once
- add new file for m4 as well
2013-02-27 16:03:27 +01:00
Pierre Joye
efffdb4d7f
- add only once
2013-02-27 16:03:17 +01:00
Pierre Joye
98e43de7c5
- add new file for m4 as well
2013-02-27 16:02:54 +01:00
Pierre Joye
6ab9f906da
- fix conflict on merge
2013-02-27 16:00:11 +01:00
Pierre Joye
fa940a60de
- add image flip API support
2013-02-27 10:39:25 +01:00
Pierre Joye
e6414140e6
- add image flip API support
2013-02-27 10:39:16 +01:00
Pierre Joye
af5bf879aa
- add image flip API support
2013-02-27 10:39:09 +01:00
Pierre Joye
e26ea9df42
- add image flip API support
2013-02-27 10:38:55 +01:00
Pierre Joye
6a3623e199
- add image flip API support
2013-02-27 10:38:33 +01:00
Pierre Joye
246de922e6
- add image flip API support
2013-02-27 10:37:48 +01:00
Stanislav Malyshev
c4ef791958
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.4.13 branched, now it's 5.4.14
2013-02-26 22:26:55 -08:00
Stanislav Malyshev
0d65a85cc0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.13 branched, now it's 5.4.14
Conflicts:
configure.in
main/php_version.h
2013-02-26 22:26:36 -08:00
Stanislav Malyshev
31a6f8b7f4
5.4.13 branched, now it's 5.4.14
2013-02-26 22:25:33 -08:00
Stanislav Malyshev
e7b6251708
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add news for SOAP fixes
2013-02-26 22:20:56 -08:00
Stanislav Malyshev
84b65cf7ab
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add news for SOAP fixes
2013-02-26 22:20:50 -08:00
Stanislav Malyshev
7ffb77d243
add news for SOAP fixes
2013-02-26 22:20:21 -08:00
Stanislav Malyshev
15d90c24a2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Bug #52861 : unset fails with ArrayObject and deep arrays
2013-02-26 22:13:31 -08:00
Stanislav Malyshev
207d0ee08a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #52861 : unset fails with ArrayObject and deep arrays
2013-02-26 22:13:01 -08:00
Stanislav Malyshev
7c08232509
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Bug #52861 : unset fails with ArrayObject and deep arrays
2013-02-26 22:12:36 -08:00
Mike Willbanks
61099f8585
Bug #52861 : unset fails with ArrayObject and deep arrays
...
When checking to make into a reference write, readwrite are checked but not unset
2013-02-26 22:11:52 -08:00
Dmitry Stogov
a6e115e94e
Fixed typo
2013-02-26 23:05:24 +04:00
Remi Collet
3718d0c404
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add support for ppc64p7 arch (Power7 optimized)
2013-02-26 14:36:04 +01:00
Remi Collet
7a3933a93b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add support for ppc64p7 arch (Power7 optimized)
2013-02-26 14:35:47 +01:00
Remi Collet
52d1add0fe
add support for ppc64p7 arch (Power7 optimized)
2013-02-26 14:35:34 +01:00
Dmitry Stogov
616214f929
Fixed build instruction
2013-02-26 11:26:51 +04:00
Dmitry Stogov
443a177b34
Emit the same error messages as without O+ (use "dups_fix" hack only for classes)
2013-02-26 01:34:11 +04:00
Dmitry Stogov
a7a355c741
Fixed memory leaks (avoid generation of unused results)
2013-02-26 01:32:24 +04:00
Dmitry Stogov
70f1cd9dc5
Execute shared memory initialization/deinitialization under exclusive lock
2013-02-25 16:35:44 +04:00
Dmitry Stogov
f463abc508
Fixed function prototypes
2013-02-25 16:06:38 +04:00
Dmitry Stogov
56baf17a17
Merge branch 'master' of https://github.com/laruence/ZendOptimizerPlus
...
Conflicts:
Optimizer/block_pass.c
2013-02-25 14:55:27 +04:00
Dmitry Stogov
cf102333a2
op_array->brk_count_array has to be kept even if op_array doesn't have BRK/CONT/GOTO opcodes.
...
It might be used to unlock "loop" or "switch" variable in case of exception.
2013-02-25 14:18:07 +04:00
Xinchen Hui
3da5b830c2
coding style improve
2013-02-25 15:29:54 +08:00
Xinchen Hui
c58b899470
remove useless configure option
2013-02-25 14:45:03 +08:00
Dmitry Stogov
ce69b86927
Ability to disable O+ per process (or process pool)
2013-02-25 10:35:59 +04:00
Dmitry Stogov
0c220d6fb3
Fixed build in a separate directory (Ilia Alshanetsky)
2013-02-25 10:04:03 +04:00
Dmitry Stogov
0d73c20d87
Fixed compilation, when compiling right into PHP (Ilia Alshanetsky)
2013-02-25 09:59:39 +04:00
Xinchen Hui
26252f4667
Merge branch 'PHP-5.5'
2013-02-24 13:00:01 +08:00
Xinchen Hui
e75804c34e
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-24 12:59:10 +08:00
Xinchen Hui
d24ac6953e
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/spl/spl_fixedarray.c
2013-02-24 12:58:39 +08:00
Xinchen Hui
1b58bd39a6
Fixed bug #64264 (SPLFixedArray toArray problem)
2013-02-24 12:55:53 +08:00
Gustavo Lopes
c30d5a8ce3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
sendrecvmsg_shutdown function moved to mshutdown
2013-02-24 03:51:11 +01:00
Gustavo Lopes
59ec22b370
sendrecvmsg_shutdown function moved to mshutdown
...
The function php_socket_sendrecvmsg_shutdown() should have been called in
MSHUTDOWN, not RSHUTDOWN.
Bug only on TSRM builds.
Should fix bug #64287 .
2013-02-24 03:50:38 +01:00
Gustavo Lopes
0112b2bc7f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix ext/sockets build with phpize
Fix ext/intl build with phpize
2013-02-24 00:49:41 +01:00
Gustavo Lopes
189fbfd53b
Fix ext/sockets build with phpize
...
Fixes bug #64285
2013-02-24 00:49:25 +01:00
Gustavo Lopes
97f22702c4
Fix ext/intl build with phpize
...
Fixes bug #64284 .
2013-02-24 00:49:01 +01:00
Gustavo Lopes
46adc1603c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for 8718755
Remove trailing whitespace; break long lines
Fix rounding of zend_dval_to_lval
Fix zend_dval_to_lval outside 64bit integers range
2013-02-23 18:07:22 +01:00
Gustavo Lopes
fa3cb8608c
NEWS for 8718755
2013-02-23 18:07:01 +01:00
Gustavo Lopes
12745594a4
Remove trailing whitespace; break long lines
2013-02-23 18:01:52 +01:00
Gustavo Lopes
8718755c9f
Merge branch 'dval_to_lval' into PHP-5.5
...
* dval_to_lval:
Fix rounding of zend_dval_to_lval
Fix zend_dval_to_lval outside 64bit integers range
2013-02-23 17:59:28 +01:00
Gustavo Lopes
a86fcfbc1d
Fix rounding of zend_dval_to_lval
...
Now rounding is always towards zero; the rounding can be though as if
occurring on the original double. Only relevant for the 32-bit long
variant.
2013-02-23 16:55:50 +00:00
Gustavo Lopes
77566edbaf
Fix zend_dval_to_lval outside 64bit integers range
...
PHP should preserve the least significant bits when casting from double
to long. Zend.m4 contains this:
AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])
If ZEND_DVAL_TO_LVAL_CAST_OK is not defined, zend_operators.h had an
inline implementation of zend_dval_to_lval() that would do a cast to an
int64_t (when sizeof(long) == 4), then a cast to unsigned long and
finally the cast to long.
While this works well for doubles inside the range of values of the type
used in the first cast (int64_t in the 32-bit version and unsigned long
in the 64-bit version), if outside the range, it is undefined behavior
that WILL give varying and not particularly useful results.
This commit uses fmod() to first put the double in a range that can
safely be cast to unsigned long and then casts this unsigned long to
long. This last cast is implementation defined, but it's very likely
that this gives the expected result (i.e. the internal 2's complement
representation is unchanged) on all platforms that PHP supports. In any
case, the previous implementationa already had this assumption.
This alternative code path is indeed significantly slower than simply
casting the double (almost an order of magnitude), but that should not
matter because casting doubles with a very high absolute value is a
rare event.
2013-02-23 17:23:49 +01:00
Xinchen Hui
a1afc0a139
Simplify the install instructions
2013-02-23 15:34:10 +08:00
Dmitry Stogov
a9910f3ce2
white spaces
2013-02-22 18:09:26 +04:00
Dmitry Stogov
4fe4b0d593
Fixed memory leak
2013-02-22 17:22:43 +04:00
Dmitry Stogov
f2e8465017
Fixed memory leak
2013-02-22 17:10:34 +04:00
Andrey Hristov
3ad32ef12a
Merge branch 'PHP-5.5'
2013-02-22 13:50:13 +01:00
Andrey Hristov
64a2a8a753
relax the check
2013-02-22 13:50:04 +01:00
Andrey Hristov
402296d46c
Merge branch 'PHP-5.5'
2013-02-22 13:18:07 +01:00
Andrey Hristov
1643d4ed56
Add some parameter checks
2013-02-22 13:17:46 +01:00
Dmitry Stogov
56818541c7
Started Test Suite
2013-02-22 14:06:02 +04:00
Dmitry Stogov
f1b76342d8
We build a zend_extension (not a regular PHP module).
2013-02-22 13:38:32 +04:00
Xinchen Hui
cddc2c35d9
Codes style improve
2013-02-22 14:56:05 +08:00
Johannes Schlüter
08a52b7087
Merge branch 'PHP-5.5'
2013-02-21 16:51:37 +01:00
Johannes Schlüter
b479c2bffb
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-21 16:50:59 +01:00
Johannes Schlüter
064c62e4cf
Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)
2013-02-21 16:49:28 +01:00
Johannes Schlüter
4642d0e0d6
Merge branch 'PHP-5.5'
2013-02-21 15:11:09 +01:00
Johannes Schlüter
7b719235b3
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-21 15:10:47 +01:00
Johannes Schlüter
1e9bc56775
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-21 15:10:15 +01:00
Johannes Schlüter
fcd4b5335a
Fix TSRM (after afc1debb)
2013-02-21 15:08:58 +01:00
Dmitry Stogov
d0b549e9a7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
PHAR should modify entry timestamp when it's modified
2013-02-21 16:23:36 +04:00
Dmitry Stogov
8b7222e22f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
PHAR should modify entry timestamp when it's modified
2013-02-21 16:08:07 +04:00
Dmitry Stogov
b5d267aa95
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
PHAR should modify entry timestamp when it's modified
2013-02-21 15:57:26 +04:00
Dmitry Stogov
7b113d789d
PHAR should modify entry timestamp when it's modified
2013-02-21 15:55:20 +04:00
Sara Golemon
f54a87e3ab
Merge branch 'PHP-5.5'
...
* PHP-5.5:
http-stream test requires network connectivity
2013-02-21 03:22:31 -08:00
Sara Golemon
ead2e1708d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
http-stream test requires network connectivity
2013-02-21 03:22:09 -08:00
Sara Golemon
c16d6befd4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
http-stream test requires network connectivity
2013-02-21 03:21:49 -08:00
Sara Golemon
bc55a8eb9f
http-stream test requires network connectivity
2013-02-21 03:21:23 -08:00
Xinchen Hui
6a05c6be41
Merge branch 'PHP-5.5'
2013-02-21 18:21:19 +08:00
Xinchen Hui
f39d12c821
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-21 18:20:48 +08:00
Xinchen Hui
9a44a9806c
Fixed bug #64235 (Insteadof not work for class method in 5.4.11)
...
As we discussed with stefan, we think previous of allowing use with
classes is a bug, should be forbided, anyway, the error message should
be improved.
2013-02-21 18:18:41 +08:00
Anatol Belski
43c2a897fa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added back the older vc9 favours
2013-02-21 11:00:54 +01:00
Anatol Belski
22ae9efe6e
added back the older vc9 favours
2013-02-21 10:59:50 +01:00
Anatol Belski
d879ad3d1c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated lib versions
updated lib versions
updated lib versions
2013-02-21 10:34:40 +01:00
Anatol Belski
27f8944eaa
updated lib versions
2013-02-21 10:32:56 +01:00
Anatol Belski
5ec06a1e5a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated lib versions
updated lib versions
2013-02-21 10:29:55 +01:00
Anatol Belski
bae95bd9d4
updated lib versions
2013-02-21 10:27:37 +01:00
Anatol Belski
07a13fd9fa
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated lib versions
2013-02-21 10:26:38 +01:00
Stanislav Malyshev
4c293bfe91
Merge branch 'PHP-5.5'
...
* PHP-5.5:
news for bug #49348
fix tests
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-21 00:57:52 -08:00
Stanislav Malyshev
76160319a5
news for bug #49348
2013-02-21 00:56:00 -08:00
Stanislav Malyshev
d39554ac08
Merge branch 'bug49348' into PHP-5.5
...
* bug49348:
fix tests
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-21 00:52:46 -08:00
Anatol Belski
81e9aa6c8d
updated lib versions
2013-02-21 09:46:50 +01:00
Dmitry Stogov
3a06991ffd
Added ability to always validate cached script timestamps using zend_optimizerplus.revalidate_freq=0
2013-02-21 12:11:03 +04:00
Dmitry Stogov
b7f89bc701
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed external entity loading
2013-02-20 22:31:52 +04:00
Dmitry Stogov
20c623c9be
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed external entity loading
2013-02-20 22:30:59 +04:00
Dmitry Stogov
c737b89473
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed external entity loading
Conflicts:
ext/libxml/libxml.c
ext/libxml/php_libxml.h
2013-02-20 22:27:41 +04:00
Dmitry Stogov
8e76d0404b
Fixed external entity loading
2013-02-20 22:14:59 +04:00
Karsten Schmidt
3fd5a40556
Dont reset other counters when incrementing slow_rq
2013-02-20 18:53:17 +01:00
Dmitry Stogov
280bbaf301
Avoid unexpected warning messages (ext/standard/tests/file/fopencookie.phpt)
2013-02-20 18:04:07 +04:00
Johannes Schlüter
39fb14acb7
Merge branch 'PHP-5.5'
2013-02-20 11:58:29 +01:00
Johannes Schlüter
b157e05f57
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-20 11:58:01 +01:00
Johannes Schlüter
021f57ef0e
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-20 11:57:11 +01:00
Johannes Schlüter
afc1debb2f
5.3.22 NEWS
2013-02-20 11:56:29 +01:00
Dmitry Stogov
b95964535c
Fixed compilation error
2013-02-20 11:21:15 +04:00
David Soria Parra
5a987919d8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Start new NEWS section for beta1
News for PHP 5.5.0 Alpha 5
2013-02-19 19:43:18 +01:00
David Soria Parra
7e5f761e82
Start new NEWS section for beta1
2013-02-19 19:42:27 +01:00
David Soria Parra
a4bcc15c3b
News for PHP 5.5.0 Alpha 5
2013-02-19 19:41:46 +01:00
David Soria Parra
915c00d42f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
News for PHP 5.5.0 Alpha 5
2013-02-19 19:41:02 +01:00
David Soria Parra
c3931bdfb3
News for PHP 5.5.0 Alpha 5
2013-02-19 19:27:37 +01:00
Dmitry Stogov
1fcdd25e83
Added check for calloc() failure
2013-02-19 18:21:31 +04:00
Dmitry Stogov
6ee2602317
Simplification
2013-02-19 18:15:11 +04:00
Dmitry Stogov
4813a71174
Fixed static analyser warning
2013-02-19 18:07:23 +04:00
Dmitry Stogov
3af305cc50
Removed redundand TSRMLS_FETCH()
2013-02-19 18:04:40 +04:00
Dmitry Stogov
2d87dce1ed
Avoid buffer overrun
2013-02-19 18:00:49 +04:00
Anatol Belski
15a182a2d0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix the test for curl 7.29.0+
2013-02-19 09:05:45 +01:00
Anatol Belski
43664e656d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix the test for curl 7.29.0+
2013-02-19 09:05:27 +01:00
Anatol Belski
cc34dfce16
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix the test for curl 7.29.0+
2013-02-19 09:04:52 +01:00
Anatol Belski
558c5dbe65
fix the test for curl 7.29.0+
2013-02-19 09:04:06 +01:00
Stanislav Malyshev
dc6f073ce9
fix tests
2013-02-18 23:01:42 -08:00
Stanislav Malyshev
0c6d903ce7
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-18 20:56:02 -08:00
Dmitry Stogov
d7cbc01188
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64070 (Inheritance with Traits failed with error)
2013-02-18 16:36:25 +04:00
Dmitry Stogov
d77eb411ea
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64070 (Inheritance with Traits failed with error)
Conflicts:
NEWS
Zend/zend_compile.c
2013-02-18 16:20:49 +04:00
Dmitry Stogov
42437dd870
Fixed bug #64070 (Inheritance with Traits failed with error)
2013-02-18 16:07:51 +04:00
Dmitry Stogov
511b33ccdf
Avoid warning about possible precision loss
2013-02-18 13:27:42 +04:00
Dmitry Stogov
40107aa6da
Use proper format specifier
2013-02-18 13:19:24 +04:00
Dmitry Stogov
53d4abb16c
Avoid static analyzer warning
2013-02-18 13:13:25 +04:00
Dmitry Stogov
f18678bbcf
Fixed signed/unsigned comparison warnings
2013-02-18 13:03:29 +04:00
Dmitry Stogov
e708dce674
Lenght is unsigned
2013-02-18 12:42:56 +04:00
Dmitry Stogov
d9ba147e5c
Avoid mixing declarations and code
2013-02-18 12:33:58 +04:00
Dmitry Stogov
a120178520
Added checks for malloc() failures
2013-02-18 11:34:10 +04:00
Dmitry Stogov
6d999b4379
Added check for CreateMutex() failure
2013-02-18 11:12:20 +04:00
Dmitry Stogov
908fc9dcc4
Fixed inconsistent start_accel_module() prototype and usage
2013-02-18 11:04:58 +04:00
Gustavo Lopes
427de31aa6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Cleanup some multicast code; fix for mac os x?
2013-02-17 22:43:28 +01:00
Gustavo Lopes
91538e4e13
Cleanup some multicast code; fix for mac os x?
...
When I moved some stuff from sockets.c to multicast.c, I did not copy
some conditional defines for systems without the RFC 3678 API.
I moved such defines to multicast.h so both sockets.c and multicast.c
can benefit from them and I prefixed them with PHP_ so that it's less
confusing: now PHP_MCAST_* are defined to either the MCAST_* RFC 3678
APIs or to legacy APIs and MCAST_* always mean the (possibly undefined)
system definitions.
2013-02-17 22:42:58 +01:00
Stanislav Malyshev
c389d33f0c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix protos
2013-02-17 13:34:07 -08:00
Stanislav Malyshev
17c6389e9e
fix protos
2013-02-17 13:33:48 -08:00
Stanislav Malyshev
1307c6c197
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:30:04 -08:00
Stanislav Malyshev
0841eca580
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:29:34 -08:00
Stanislav Malyshev
7b0107cc5d
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:28:42 -08:00
Anatol Belski
9a85dca7a5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix free vs. curl_free
2013-02-17 20:29:58 +01:00
Anatol Belski
432d59ab55
fix free vs. curl_free
2013-02-17 20:29:20 +01:00
krakjoe
996485e0b2
bug #29 enable cli-server support
2013-02-17 15:48:31 +00:00
Stanislav Malyshev
8be9a974da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update NEWS
2013-02-17 02:38:41 -08:00
Stanislav Malyshev
d420368bc9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
2013-02-17 02:38:25 -08:00
Stanislav Malyshev
92b1cb3ca0
update NEWS
2013-02-17 02:37:58 -08:00
Stanislav Malyshev
5077cde952
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added HTTP codes as of RFC 6585
2013-02-17 01:20:36 -08:00
Stanislav Malyshev
c877fcf6ec
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added HTTP codes as of RFC 6585
2013-02-17 01:20:14 -08:00
Jonh Wendell
59b016192d
Added HTTP codes as of RFC 6585
...
Added descriptions for the new HTTP codes:
- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
2013-02-17 01:18:40 -08:00
Xinchen Hui
a1b5796c5c
Merge branch 'PHP-5.5'
2013-02-17 11:07:07 +08:00
Xinchen Hui
d3291de51a
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-17 11:06:33 +08:00
Xinchen Hui
263accb626
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-17 11:05:34 +08:00
Xinchen Hui
01ae5c3c2f
Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)
2013-02-17 11:04:36 +08:00
Xinchen Hui
c520280381
Merge branch 'PHP-5.5'
2013-02-16 22:30:14 +08:00
Xinchen Hui
69b80a93de
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-16 22:29:14 +08:00
Xinchen Hui
375e3c273b
Fix test failed after 0ea83ff847
2013-02-16 22:28:28 +08:00
Xinchen Hui
92046b7ef1
Merge branch 'PHP-5.5'
2013-02-16 22:25:37 +08:00
Xinchen Hui
75742d57eb
Exceptions triggered by undefined variable should be handled before FATAL error
...
this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
Dmitry Stogov
2b6eede1d3
Fixed warning about uninitialized variable (actually, it doesn't have to be initialized).
2013-02-15 18:06:48 +04:00
Dmitry Stogov
6693f1854d
Wrong value
2013-02-15 17:59:36 +04:00
Dmitry Stogov
bee06002d0
Fixed possible resource leak
2013-02-15 17:46:38 +04:00
Dmitry Stogov
4c97b6c8cf
"locked" must be a "module" global (local to thread)
2013-02-15 17:35:58 +04:00
Dmitry Stogov
d70ed26aaa
Added ZTS lock
2013-02-15 15:08:51 +04:00
Dmitry Stogov
bde294f8eb
Renamed ZCG(startup_ok) into "accel_startup_ok".
...
It must be a "true" global to make ZTS work.
(ZTS starts work, but ZTS O+ is not stable anyway)
2013-02-15 13:45:42 +04:00
Dmitry Stogov
f579ef5abe
Merge branch 'patch-1' of https://github.com/reeze/ZendOptimizerPlus
2013-02-15 10:51:29 +04:00
Reeze Xia
4fec381b3a
Typo fix
2013-02-15 13:48:37 +08:00
Daniel Gimenes
ddbe1b66ed
Fix typo in README
2013-02-15 00:00:40 -02:00
Boris Lytochkin
cddc9f598b
Fixed bug #64124 (IPv6 malformed)
2013-02-14 23:12:53 +04:00
Boris Lytochkin
68fa6a3eb7
+Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin)
2013-02-14 23:08:08 +04:00
Dmitry Stogov
aef92d22d5
Fixed compatibility with 5.2 and 5.3
2013-02-14 18:36:07 +04:00
Dmitry Stogov
5cd7c77545
Added Xdebug compatibility note
2013-02-14 18:20:34 +04:00
Dmitry Stogov
d8b84d9f80
Merge branch 'master' of https://github.com/thomasbley/ZendOptimizerPlus
2013-02-14 16:15:55 +04:00
Dmitry Stogov
a84b588208
Merge branch 'issue-ini' of https://github.com/remicollet/ZendOptimizerPlus
2013-02-14 16:03:32 +04:00
Thomas Bley
a9ff713a56
phpize is already in README
2013-02-14 12:44:07 +01:00
Thomas Bley
f0aa77a44d
Update README
2013-02-14 12:24:48 +01:00
Thomas Bley
8eb38dacac
added travis-ci config (make + load extension)
2013-02-14 12:20:50 +01:00
Dmitry Stogov
ded12158cc
Fixed phpinfo() output when O+ is not enabled for CLI
2013-02-14 13:19:06 +04:00
Dmitry Stogov
91e775df1b
Disabled unsafe optimization pattern
2013-02-14 13:06:30 +04:00
Remi Collet
071ab3cf37
also add load_comments
2013-02-14 09:24:11 +01:00
Remi Collet
92df8e208f
missing directives in accelerator_get_configuration
2013-02-14 09:21:45 +01:00
Remi Collet
d30b985015
missing directive in README (need doc)
2013-02-14 09:21:45 +01:00
Dmitry Stogov
afb43f5650
- Added zend_optimizerplus.load_comments configuration durective, so "Doc comments" may be always stored in SHM, but
...
restored only by applicaions that really need them.
- Added note, that zend_optimizerplus.save_comments is dangerous and may break applications and frameworks.
2013-02-14 11:59:23 +04:00
Dmitry Stogov
4bc28ae783
Revert renaming (md needs additional formatting tags)
2013-02-14 11:13:51 +04:00
Dmitry Stogov
37de7567b1
Renamed README into README.md
2013-02-14 11:09:36 +04:00
Dmitry Stogov
30ea6e100e
Merge branch 'master' of https://github.com/johnl/ZendOptimizerPlus
2013-02-14 11:04:37 +04:00
Dmitry Stogov
54a90b691f
Don't completely delete the "enabled condition".
2013-02-14 11:00:04 +04:00
Dmitry Stogov
18904d18c7
Merge branch 'master' of https://github.com/adoy/ZendOptimizerPlus
2013-02-14 10:57:59 +04:00
Dmitry Stogov
abb7788093
Merge branch 'master' of https://github.com/pierrejoye/ZendOptimizerPlus
2013-02-14 10:43:50 +04:00
Pierre Joye
dfcd77341d
- nuke unused variable
2013-02-14 07:41:18 +01:00
Dmitry Stogov
219decd8ec
This is a development version yet
2013-02-14 10:38:20 +04:00
Pierre Joye
f74c938c95
- fix windows build
2013-02-14 07:24:26 +01:00
Dmitry Stogov
44f892080d
Merge branch 'patch-1' of https://github.com/raziel057/ZendOptimizerPlus
2013-02-14 10:07:39 +04:00
Dmitry Stogov
bfcbe7849b
Avoid compilation of unsupported SHM backends
2013-02-14 10:01:29 +04:00
Pierrick Charron
30c3a59668
Avoid unnecessary code and change the type of accelerator_enabled
...
accelerator_enabled will always be true when accelerator_get_status
returns an array. Also the accelerator_enabled should be a boolean
and not a long
2013-02-13 14:25:38 -05:00
Thomas Lallement
8847f9107b
Fix typo
2013-02-13 19:56:44 +01:00
John Leach
54da28b015
Added LICENSE from http://www.php.net/license/3_01.txt
...
Closes #2
2013-02-13 18:47:31 +00:00
Dmitry Stogov
dd304c8e19
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Proper bit reset code
2013-02-13 22:08:13 +04:00
Dmitry Stogov
1bde2b4fc9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Proper bit reset code
2013-02-13 22:07:57 +04:00
Dmitry Stogov
4b900f4831
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Proper bit reset code
2013-02-13 22:07:21 +04:00
Dmitry Stogov
188c196d4d
Proper bit reset code
2013-02-13 22:06:37 +04:00
Dmitry Stogov
7334835143
Fixed zend_optimizerplus.enable_file_override=1 compatibility with PHP-5.3
2013-02-13 21:41:07 +04:00
sasezaki
2ba47175cf
typo at Optimizer/block_pass.c
2013-02-14 00:48:18 +09:00
Damien Tournoud
7c0e3ccdb6
Fix typos and grammar issues in README.
2013-02-13 16:08:19 +01:00
Ard Biesheuvel
0fcde51c35
Merge branch 'PHP-5.5'
2013-02-13 13:52:30 +01:00
Ard Biesheuvel
65fa9f2c4b
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-13 13:50:53 +01:00
Dmitry Stogov
aafc1456b0
spelling
2013-02-13 16:33:14 +04:00
Dmitry Stogov
528006a3b4
Open Source Release
2013-02-13 16:26:47 +04:00
Ard Biesheuvel
050aae2860
Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang)
...
Updated the code to test for __ARMCC_VERSION instead of __arm, as
that is a more reliable indicator of whether the ARMCC compiler is
being used.
2013-02-13 12:22:50 +01:00
Ard Biesheuvel
a439309453
Merge branch 'PHP-5.5'
2013-02-11 17:54:54 +01:00
Ard Biesheuvel
d1ad926aa4
Update config.sub/config.guess to latest GPLv2 upstream version
...
This adds the ability to configure/build for/on 64-bit ARMv8,
which uses the host triplet 'aarch64-linux-gnu'.
Source:
http://git.savannah.gnu.org/gitweb/?p=config.git;h=306afce
2013-02-11 17:53:30 +01:00
Ard Biesheuvel
b1c2322d9c
Merge branch 'PHP-5.5'
2013-02-11 16:01:03 +01:00
Ard Biesheuvel
dbad4fb3ad
NEWS update
2013-02-11 15:54:59 +01:00
Ard Biesheuvel
7c1e19ed76
Merge branch 'PHP-5.5'
2013-02-11 14:45:17 +01:00
Ard Biesheuvel
e2453276e9
Low-level ARM optimizations
...
- added ARM versions of zend_mm_high_bit()/zend_mm_low_bit()
- improved safe_address()
2013-02-11 14:36:58 +01:00
Ard Biesheuvel
aa12cdc361
Improve x86 inline assembler
...
- added cc annotation to inline asm that clobbers the condition
flags
- remove hardcoded constants (IS_LONG,IS_DOUBLE)
- remove hardcoded offsets (zval->value, zval->type)
2013-02-11 13:53:27 +01:00
Andrey Hristov
c98b52d7ea
Merge branch 'master' of ssh://git.php.net/php-src
2013-02-11 12:28:55 +01:00
Andrey Hristov
faa79150f6
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-02-11 12:07:55 +01:00
Andrey Hristov
5bfdf4f069
build fixes
2013-02-11 12:07:10 +01:00
Remi Collet
5f0e374da7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-11 09:14:06 +01:00
Remi Collet
1a954ea616
NEWS
2013-02-11 09:13:52 +01:00
Remi Collet
dc47ec0490
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-11 09:13:27 +01:00
Remi Collet
e67a2b9e47
Fixed bug #64142 (dval to lval different behavior on ppc64)
...
See discussion on internals
http://marc.info/?t=136042277700003&r=1&w=2
2013-02-11 09:10:51 +01:00
Stanislav Malyshev
aac90ee333
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update NEWS
mb_split() can now handle empty matches like preg_split() does.
mb_split() can now handle empty matches like preg_split() does.
2013-02-09 23:05:58 -08:00
Stanislav Malyshev
ce005c0883
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
mb_split() can now handle empty matches like preg_split() does.
2013-02-09 23:05:35 -08:00
Stanislav Malyshev
bfdb889d4f
update NEWS
2013-02-09 23:02:26 -08:00
Moriyoshi Koizumi
20eb33b321
mb_split() can now handle empty matches like preg_split() does.
2013-02-10 15:05:17 +09:00
Moriyoshi Koizumi
0ea83ff847
mb_split() can now handle empty matches like preg_split() does.
2013-02-10 15:04:23 +09:00
Andrey Hristov
1d5d63131d
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-02-08 18:34:35 +01:00
Andrey Hristov
3d9a31efdf
news for mysqli_savepoint and mysql_release_savepoint
2013-02-08 18:33:45 +01:00
Andrey Hristov
a9daf26dcf
Merge branch 'PHP-5.5'
2013-02-08 18:28:34 +01:00
Andrey Hristov
a5b426eeff
update test case
2013-02-08 18:28:22 +01:00
Andrey Hristov
5a2b3a0a34
Merge branch 'PHP-5.5'
2013-02-08 18:10:08 +01:00
Andrey Hristov
43ecd8fe1b
mysqli_savepoint()/mysqli_release_savepoint()
2013-02-08 18:09:50 +01:00
Andrey Hristov
77cae97ac8
Merge branch 'PHP-5.5'
2013-02-08 17:06:05 +01:00
Andrey Hristov
0da369ae50
Add the constants needed for mysqli_commit(), _rollback() and
...
begin_transaction()
2013-02-08 17:05:25 +01:00
Andrey Hristov
2de2c1cf5b
Merge branch 'PHP-5.5'
2013-02-08 16:36:52 +01:00
Andrey Hristov
666a835660
Add savepoint and rollback to savepoint support
2013-02-08 16:36:17 +01:00
Andrey Hristov
12d6c22afb
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-02-08 11:13:45 +01:00
Andrey Hristov
2d30a192f0
add the news about recent commits
2013-02-08 11:12:54 +01:00
Andrey Hristov
e1e22fd2e4
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-02-07 20:35:30 +01:00
Andrey Hristov
e0664cc602
Merge branch 'master' of ssh://git.php.net/php-src
2013-02-07 20:35:16 +01:00
Andrey Hristov
c292792198
Merge branch 'PHP-5.5'
2013-02-07 18:46:36 +01:00
Andrey Hristov
afacdecd1f
Add support for begin_transaction in libmysql mode.
...
Add support for flags and name for commit/rollback in libmysql mode
2013-02-07 18:45:49 +01:00
Boris Lytochkin
92a7924c1a
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
2013-02-07 21:43:37 +04:00
Boris Lytochkin
e09211545c
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
2013-02-07 21:42:07 +04:00
Boris Lytochkin
175219c9a3
Merge branch 'master' of https://git.php.net/push/php-src
2013-02-07 21:36:09 +04:00
Andrey Hristov
a0e975c7bc
Merge branch 'PHP-5.5'
2013-02-07 18:30:32 +01:00
Andrey Hristov
403d4fbbff
Export new calls
2013-02-07 18:29:19 +01:00
Xinchen Hui
5fcae352ed
Merge branch 'PHP-5.5'
2013-02-07 23:50:35 +08:00
Xinchen Hui
7948eea6f9
Forgot test script
2013-02-07 23:49:35 +08:00
Xinchen Hui
7fb07acf98
Merge branch 'PHP-5.5'
2013-02-07 23:46:15 +08:00
Xinchen Hui
ee825e0b42
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-02-07 23:45:28 +08:00
Xinchen Hui
290509755a
Fixed bug #64135 (Exceptions from set_error_handler are not always propagated)
2013-02-07 23:44:46 +08:00
Andrey Hristov
67ccb99f2c
Merge branch 'PHP-5.5'
2013-02-07 16:24:44 +01:00
Andrey Hristov
49e3d91ad9
Add the name in a comment at commit/rollback, if provided
2013-02-07 16:24:08 +01:00
Andrey Hristov
2c07219d24
Merge branch 'PHP-5.5'
2013-02-07 16:06:50 +01:00
Andrey Hristov
9fb0dba4be
Add support for commit and rollback options.
...
Add support for explicitly starting a transaction - modes also available.
Using the API makes the life of load balancer mysqlnd plugins easier/possible.
2013-02-07 16:05:27 +01:00
Dmitry Stogov
a80b0ee967
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Disabled external entities loading
2013-02-07 16:10:20 +04:00
Dmitry Stogov
0547a36e95
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Disabled external entities loading
2013-02-07 16:09:49 +04:00
Dmitry Stogov
1a18e84822
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Disabled external entities loading
2013-02-07 16:09:12 +04:00
Dmitry Stogov
afe98b7829
Disabled external entities loading
2013-02-07 16:07:05 +04:00
Boris Lytochkin
6d614d5105
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #64124 (IPv6 malformed)
2013-02-07 14:50:41 +04:00
Boris Lytochkin
6c5c04888d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #64124 (IPv6 malformed)
2013-02-07 14:49:45 +04:00
Boris Lytochkin
ed6763420c
fix bug #64124 (IPv6 malformed)
...
hostname returned from zend_parse_parameters() was modified in
netsnmp_session_init() that caused imput parameter modification along with
unpredictable changes when parameter is a constant sctring.
One typo in comment was fixed.
2013-02-07 14:48:28 +04:00
Dmitry Stogov
a443dad71a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:13:50 +04:00
Dmitry Stogov
4730bc8680
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:12:01 +04:00
Dmitry Stogov
702b436ef4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:10:04 +04:00
Dmitry Stogov
cc4c318b0c
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:04:47 +04:00
Anatoliy Belsky
2249881c0d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
make libvpx optional
2013-02-06 16:23:16 +01:00
Anatoliy Belsky
215da6057f
make libvpx optional
2013-02-06 16:22:27 +01:00
Remi Collet
9f7b121da3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
revert
revert
2013-02-05 12:29:34 +01:00
Remi Collet
02ae4522f5
revert
2013-02-05 12:29:21 +01:00
Remi Collet
7b75a941ef
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
revert
2013-02-05 12:29:01 +01:00
Remi Collet
e7ce002c01
revert
2013-02-05 12:28:47 +01:00
Ard Biesheuvel
d0e0a51c4c
Add ARM optimized versions of safe_address()
...
The function safe_address() uses inline assembler to detect
overflow in size/offset calculations, as detecting this in
plain C is a lot more work.
2013-02-05 12:14:55 +01:00
Ard Biesheuvel
72a728872b
Update config.guess to latest GPLv2 upstream version
...
This adds the ability to configure/build *on* 64-bit ARMv8,
which uses the host triplet 'aarch64-linux-gnu'.
Source:
http://git.savannah.gnu.org/gitweb/?p=config.git;h=306afce
2013-02-05 10:27:30 +01:00
Remi Collet
c2a2f5e3ff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-04 15:27:54 +01:00
Remi Collet
6585a7bd79
NEWS
2013-02-04 15:27:43 +01:00
Remi Collet
79956330fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-04 15:27:07 +01:00
Remi Collet
6533094d9e
Fixed bug #64142 (dval to lval different behavior on ppc64)
...
On x86_64:
(long)(double)9223372036854775807+1 = -9223372036854775808
On ppc64
(long)(double)9223372036854775807-1 = 9223372036854775807
2013-02-04 15:19:32 +01:00
Andrey Hristov
9e65d4ec85
Merge branch 'PHP-5.5'
2013-02-04 14:34:38 +01:00
Andrey Hristov
c311884e5b
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-04 14:28:23 +01:00
Andrey Hristov
740b823be8
check the validity of the parameter
2013-02-04 14:27:56 +01:00
Andrey Hristov
643ce95b5b
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2013-02-04 14:15:58 +01:00
Andrey Hristov
cb8b2dd2e0
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-02-04 14:15:29 +01:00
Andrey Hristov
309bdfba42
Merge branch 'master' of ssh://git.php.net/php-src
2013-02-04 14:15:19 +01:00
Andrey Hristov
2a2975cb97
Merge branch 'PHP-5.5'
2013-02-04 13:50:23 +01:00
Xinchen Hui
34381de5f3
Merge branch 'PHP-5.5'
2013-02-04 14:22:17 +08:00
Xinchen Hui
53159f6e05
implicit declaration of zend_throw_exception
2013-02-04 14:20:50 +08:00
Felipe Pena
112e428752
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed ZTS build
News about FR #49180 .
2013-02-03 11:00:58 -02:00
Felipe Pena
7369a68379
- Fixed ZTS build
2013-02-03 10:57:31 -02:00
Martin Jansen
60b5f6d463
News about FR #49180 .
2013-02-03 13:27:36 +01:00
Martin Jansen
80be1432c0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add option to specific the expected separator character.
There is no need to use memchr() for comparisons in these places.
ext/filter support for validating MAC addresses.
2013-02-03 13:24:04 +01:00
Martin Jansen
6186b67600
Add option to specific the expected separator character.
2013-02-03 13:23:54 +01:00
Martin Jansen
0661d03eba
There is no need to use memchr() for comparisons in these places.
2013-02-03 13:23:53 +01:00
Martin Jansen
2f33443883
ext/filter support for validating MAC addresses.
2013-02-03 13:23:53 +01:00
Gustavo Lopes
2b2a34689c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix test on Windows.
NEWS/UPGRADING for changes in sockets, intl
2013-02-03 02:07:08 +01:00
Gustavo Lopes
8771c265a4
Fix test on Windows.
...
Windows complains of invalid parameters because the socket is not bound.
The test expected the error to be EAGAIN/EWOULDBLOCK. Moved the call down,
after the socket is bound.
2013-02-03 02:03:00 +01:00
Gustavo Lopes
a000920dfb
NEWS/UPGRADING for changes in sockets, intl
2013-02-03 01:59:35 +01:00
Gustavo Lopes
4138a8146e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug and hopefully build on WinSDK 6.1
2013-02-03 01:45:14 +01:00
Gustavo Lopes
af1b90d62b
Fix bug and hopefully build on WinSDK 6.1
...
There build was failing on rmtools on the sockets extension for two reasons:
1. IPV6_TCLASS and IPV6_RECVTCLASS not being defined. These are probably
recent additions to SDK. Windows 7 doesn't event seem to have complete
support for IPV6_TCLASS, not accepting in WSASendMsg(). The parts that
needed this constant were not guarded by #ifdefs. They are now.
2. The constants EWOULDBLOCK and EINPROGRESS not being defined. These
were only defined in php_network.h, outside of the extension, and not
all source files included this header. Nevertheless, a macro defined in
php_sockets.h needed these constants. When this macro was used in files
that did not include php_network.h, the compilation would fail.
Surprisingly, the build did not fail when using the 7.1 Windows SDK
(more likely, the CRT headers used in VC10), as somehow errno.h was
being included through some other standard header. This would make the
constant EWOULDBLOCK defined; however, it would be defined to the wrong
value. In the winsock context, WSAEWOULDBLOCK should be used instead.
Because we have difficulty using Windows-only constants in the code, we
(re)define EWOULDBLOCK to WSAEWOULDBLOCK. This has the obvious
disavantage we may miss problems like this again in the future.
2013-02-03 01:36:14 +01:00
Gustavo Lopes
da0012dc26
Merge branch 'PHP-5.5'
...
* PHP-5.5: (40 commits)
php_strerror in ext/sockets renamed in 5.5
Move macro back to .c file
Fix multicast.c not defining errno on Windows
Fix non-Windows build
send/recvmsg() support for Windows
Remove some pre-vista code
Revert "Payload of HOPLIMIT/TCLASS are 8-bit"
Ensure memory is initialized
Payload of HOPLIMIT/TCLASS are 8-bit
Fix buf in string -> int conv.
Build fixes; accept names for if_index
Refactoring: move stuff to new conversions.c
Support sticky IPV6_PKTINFO
Rename some functions for consistency
Destroy ancillary registry on shutdown
Move some multicast stuff to multicast.c
Fix mcast_ipv6_send test
Check return of fstat()
Fix build on Mac OS X
Register extra MSG_* constants
...
2013-02-02 18:42:01 +01:00
Gustavo Lopes
6ba5d0a4a5
Merge branch 'PHP-5.4' into PHP-5.5 (strategy ours)
...
* PHP-5.4:
Move macro back to .c file
2013-02-02 18:40:05 +01:00
Gustavo Lopes
03b1da5d7a
php_strerror in ext/sockets renamed in 5.5
2013-02-02 18:39:47 +01:00
Gustavo Lopes
0110662ae9
Move macro back to .c file
...
Because it depends on a static function on that .c file.
2013-02-02 18:32:38 +01:00
Gustavo Lopes
b11777ca2a
Merge branch 'sendrecvmsg_rebase_55' into PHP-5.5
...
* sendrecvmsg_rebase_55: (31 commits)
Fix multicast.c not defining errno on Windows
Fix non-Windows build
send/recvmsg() support for Windows
Remove some pre-vista code
Revert "Payload of HOPLIMIT/TCLASS are 8-bit"
Ensure memory is initialized
Payload of HOPLIMIT/TCLASS are 8-bit
Fix buf in string -> int conv.
Build fixes; accept names for if_index
Refactoring: move stuff to new conversions.c
Support sticky IPV6_PKTINFO
Rename some functions for consistency
Destroy ancillary registry on shutdown
Move some multicast stuff to multicast.c
Fix mcast_ipv6_send test
Check return of fstat()
Fix build on Mac OS X
Register extra MSG_* constants
Add test for CMSG_RIGHTS
Add test for CMSG_CREDENTIALS message
...
2013-02-02 16:50:38 +01:00
Gustavo Lopes
e2fc17c833
Fix multicast.c not defining errno on Windows
...
Small cleanups in includes as well.
2013-02-02 16:38:09 +01:00
Gustavo Lopes
608254fa57
Fix non-Windows build
2013-02-02 16:38:09 +01:00
Gustavo Lopes
7066cc7267
send/recvmsg() support for Windows
2013-02-02 16:38:09 +01:00
Gustavo Lopes
8561680533
Remove some pre-vista code
2013-02-02 16:38:09 +01:00
Gustavo Lopes
95f8d34f9c
Revert "Payload of HOPLIMIT/TCLASS are 8-bit"
...
This reverts commit 61a5ec7381ba5388a52926779fe3f58af0caea83.
I checked Linux and OpenBSD and both use integers to write the
IPV6_TCLASS messages and they don't force any endianness. This is
despite RFC 3542 explicitly saying the first byte of cmsg_data will
have the result. In any case, it doesn't make any difference in
little-endian archs.
2013-02-02 16:38:08 +01:00
Gustavo Lopes
5c0a8b1a2a
Ensure memory is initialized
2013-02-02 16:38:08 +01:00
Gustavo Lopes
f10baf14ed
Payload of HOPLIMIT/TCLASS are 8-bit
2013-02-02 16:38:08 +01:00
Gustavo Lopes
c846fcef68
Fix buf in string -> int conv.
2013-02-02 16:38:08 +01:00
Gustavo Lopes
bd580db373
Build fixes; accept names for if_index
2013-02-02 16:38:08 +01:00
Gustavo Lopes
4414b33abd
Refactoring: move stuff to new conversions.c
2013-02-02 16:38:08 +01:00
Gustavo Lopes
66ea024587
Support sticky IPV6_PKTINFO
2013-02-02 16:38:08 +01:00
Gustavo Lopes
b18bd8904e
Rename some functions for consistency
2013-02-02 16:38:07 +01:00
Gustavo Lopes
8fb1aa6184
Destroy ancillary registry on shutdown
2013-02-02 16:38:07 +01:00
Gustavo Lopes
51394f76a5
Move some multicast stuff to multicast.c
2013-02-02 16:38:07 +01:00
Gustavo Lopes
3e515a2fd9
Fix mcast_ipv6_send test
2013-02-02 16:38:07 +01:00
Gustavo Lopes
5bf7b08efd
Check return of fstat()
2013-02-02 16:38:07 +01:00
Gustavo Lopes
190a0ed713
Fix build on Mac OS X
...
By deactivating unsupported features on this OS.
2013-02-02 16:38:07 +01:00
Gustavo Lopes
51e65667f5
Register extra MSG_* constants
2013-02-02 16:38:06 +01:00
Gustavo Lopes
74cf40c2fd
Add test for CMSG_RIGHTS
2013-02-02 16:38:06 +01:00
Gustavo Lopes
7fc4671df9
Add test for CMSG_CREDENTIALS message
2013-02-02 16:38:06 +01:00
Gustavo Lopes
a85d7f28f6
Added support for AF_UNIX messages
...
Added constants: SCM_RIGHTS, SCM_CREDENTIALS and SO_PASSCRED.
The function socket_cmsg_space() was modified to support message types with
variable size. Its new signature is:
int socket_cmsg_space(int $level, int $type, int $n)
where $n is the number of repetable elements that the message is composed of.
2013-02-02 16:38:06 +01:00
Gustavo Lopes
131245474b
Redactor to expose socket_import_file_descriptor()
2013-02-02 16:38:06 +01:00
Gustavo Lopes
b3effa60c7
Improve imported socket family detection
...
Also added constant SO_FAMILY.
2013-02-02 16:38:06 +01:00
Gustavo Lopes
17540788ad
Added missing return statements
2013-02-02 16:38:06 +01:00
Gustavo Lopes
0f849fe2aa
Add test and slightly tweak another
2013-02-02 16:38:06 +01:00
Gustavo Lopes
73ab2385cb
Support for IPV6_HOPLIMIT and IPV6_TCLASS
2013-02-02 16:38:05 +01:00
Gustavo Lopes
b27c22d627
Fix bug in from_zval_write_control_array()
2013-02-02 16:38:05 +01:00
Gustavo Lopes
b06f00477c
Fix bug converting zval sockaddr
...
The bug ocurred when the family was not specified but was instead guessed.
2013-02-02 16:38:05 +01:00
Gustavo Lopes
806a6e6399
Add IPV6_UNICAST_HOPS option constant.
2013-02-02 16:38:05 +01:00
Gustavo Lopes
eb4b1f6d46
Add test for recvmsg()
2013-02-02 16:38:05 +01:00
Gustavo Lopes
5e51c85143
Wrap recvmsg() and sendmsg()
...
This introduces two new functions:
int socket_recvmsg(resource $socket, array &$msghdr, int $flags)
int socket_sendmsg(resource $socket, array $msghdr, int $flags)
The arrays representing struct msghdr follow the native counterpart
closely: structs are mapped to arrays, fields to array elements whose
key is the name of the field without the prefix (e.g. "name" instead
of "msg_name") and array are mapped to sequential numeric PHP arrays.
Right now the only type of ancillary data supported is fot the
level/type pair IPPROTO_IPV6/IPV6_PKTINFO.
I also refactored out the name resolution functions and made
sockets_strerror() a global function.
2013-02-02 16:38:05 +01:00
Gustavo Lopes
ac47448abb
Ignore warnings on EAGAIN/EWOULDBLOCK/EINPROGRESS
...
See bug #63570
2013-02-02 15:43:05 +01:00
Gustavo Lopes
e8f0e863ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix wrong blocking state being set
Fix tests (Windows)
Remove a Windows only warning
Move & improve PHP_SOCKET_ERROR def
Move some declarations to sockets.c
Fix overbroad skipif include
2013-02-02 15:32:03 +01:00
Gustavo Lopes
73de4d8c68
Merge branch 'sockets_54_improv' into PHP-5.4
...
* sockets_54_improv:
Fix wrong blocking state being set
Fix tests (Windows)
Remove a Windows only warning
Move & improve PHP_SOCKET_ERROR def
Move some declarations to sockets.c
Fix overbroad skipif include
2013-02-02 15:31:44 +01:00
Gustavo Lopes
ac6342bbc0
Fix wrong blocking state being set
2013-02-02 15:29:18 +01:00
Gustavo Lopes
40663ede83
Fix tests (Windows)
2013-02-02 15:29:18 +01:00
Gustavo Lopes
24e380f970
Remove a Windows only warning
2013-02-02 15:29:18 +01:00
Gustavo Lopes
9283b8aea4
Move & improve PHP_SOCKET_ERROR def
2013-02-02 15:29:11 +01:00
Gustavo Lopes
97d656fc82
Move some declarations to sockets.c
2013-02-02 14:06:23 +01:00
Gustavo Lopes
a100c25ea4
Fix overbroad skipif include
2013-02-02 14:06:23 +01:00
Nikita Popov
86ee2c60c4
Merge branch 'PHP-5.5'
2013-02-01 19:53:23 +01:00
Nikita Popov
114245c1b9
Fix bug #63830 : Segfault on undefined function call in nested generator
...
This also reverses the destruction order of the pushed arguments to
align with how it is done everywhere else.
I'm not exactly sure whether this is the right way to fix it, but it
seems to work fine.
2013-02-01 19:53:04 +01:00
Remi Collet
2080a13348
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Fixed bug #64128 buit-in web server is broken on ppc64.
2013-02-01 19:27:22 +01:00
Remi Collet
2117b8edd1
NEWS
2013-02-01 19:27:10 +01:00
Remi Collet
5d3501c7d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64128 buit-in web server is broken on ppc64.
2013-02-01 19:26:11 +01:00
Remi Collet
0cea9e6843
Fixed bug #64128 buit-in web server is broken on ppc64.
...
fdset management using bit operator is broken on non-x86 arch
and cause built-in server the enter an infinite loop of "select"
and never handle any request.
2013-02-01 19:23:25 +01:00
Nikita Popov
5c3c31127e
Merge branch 'PHP-5.5'
2013-02-01 18:36:10 +01:00
Nikita Popov
3ee20e450f
Fix segfault when cloning generator with properties
...
Rule of thumb: Always implement the object clone handler rather
than the object storage clone handler. Actually I think we should
drop the latter. It's nearly never usable.
2013-02-01 18:33:26 +01:00
Andrey Hristov
642cff08c1
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-01 17:22:21 +01:00
Andrey Hristov
f45a85c386
add new charset, from MySQL 5.6
2013-02-01 17:21:50 +01:00
Anatoliy Belsky
deddec4a15
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix enchant compilation under vc11
2013-02-01 12:44:00 +01:00
Anatoliy Belsky
ac18c318dc
fix enchant compilation under vc11
2013-02-01 12:43:26 +01:00
Johannes Schlüter
8460e0971f
Merge branch 'PHP-5.5'
2013-02-01 12:32:30 +01:00
Johannes Schlüter
9c821ec7a1
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-01 12:32:00 +01:00
Johannes Schlüter
b09f5a4f56
Fix typo in error message
2013-02-01 12:31:07 +01:00
Remi Collet
b12a574ee2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Mark this test as requiring internet connecion.
2013-01-31 14:39:54 +01:00
Remi Collet
4608341303
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Mark this test as requiring internet connecion.
2013-01-31 14:39:42 +01:00
Remi Collet
9d75bf35e9
Mark this test as requiring internet connecion.
2013-01-31 14:38:39 +01:00
Remi Collet
9175da5036
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18) old: Stale NFS file handle new: Stale file handle
2013-01-31 14:26:10 +01:00
Remi Collet
4ad5c82016
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18) old: Stale NFS file handle new: Stale file handle
2013-01-31 14:25:43 +01:00
Remi Collet
f7362232f4
Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18)
...
old: Stale NFS file handle
new: Stale file handle
2013-01-31 14:22:56 +01:00
Johannes Schlüter
4891d3ffe6
Merge branch 'PHP-5.5'
2013-01-31 00:59:27 +01:00
Johannes Schlüter
6167f9dc8d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-31 00:59:10 +01:00
Johannes Schlüter
9d6636364d
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
configure.in
main/php_version.h
2013-01-31 00:58:52 +01:00
Johannes Schlüter
a80fdc47b3
This will be PHP 5.3.23
2013-01-31 00:57:29 +01:00
Lars Strojny
06b1e6a4d3
Merge branch 'PHP-5.5'
2013-01-31 00:35:35 +01:00
Lars Strojny
6b48a86a17
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-31 00:33:46 +01:00
Lars Strojny
836a2b1131
NEWS entry new OpenSSL option [doc]
2013-01-31 00:32:44 +01:00
Daniel Lowrey
4a01ddfb55
Added ssl context option, "disable_compression"
...
The CRIME attack vector exploits TLS compression. This patch adds a stream context option
allowing servers to disable TLS compression for versions of OpenSSL >= 1.0.0 (which first
introduced the SSL_OP_NO_COMPRESSION option). A summary rundown of the CRIME attack can
be found at https://community.qualys.com/blogs/securitylabs/2012/09/14/crime-information-leakage-attack-against-ssltls
Thanks to @DaveRandom for pointing out the relevant section of code.
2013-01-31 00:31:10 +01:00
Nikita Popov
ea56a894e8
Merge branch 'PHP-5.5'
2013-01-30 23:55:59 +01:00
Nikita Popov
8b972efe5f
Fix potential segfault when finally in a generator is run during shutdown
...
If a generator is destroyed in a finally block it will resume the generator to run that finally
block before freeing the generator. This was done in the object storage free handler.
Running user code in the free handler isn't safe though because the free handlers may be run
during request shutdown, already after several key components have been shut down.
This is avoided by doing the finally handling in the dtor handler. These handlers are run at the
start of the shutdown sequence.
2013-01-30 23:52:02 +01:00
Nikita Popov
9a25dd382c
Merge branch 'PHP-5.5'
2013-01-30 20:42:30 +01:00
Nikita Popov
f540e086e2
Fixed bug #64106 : Segfault on SplFixedArray[][x] = y when extended
2013-01-30 20:40:02 +01:00
Nikita Popov
6a70c97dc4
Merge branch 'PHP-5.5'
...
Conflicts:
configure.in
main/php_version.h
2013-01-30 20:38:04 +01:00
Nikita Popov
30270af777
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
configure.in
main/php_version.h
2013-01-30 20:34:01 +01:00
Nikita Popov
bb4d11b405
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-30 20:25:59 +01:00
Nikita Popov
321f4f18e5
Fixed bug #64106 : Segfault on SplFixedArray[][x] = y when extended
2013-01-30 20:23:39 +01:00
Jelle Zijlstra
09e73fd80e
Fix build problem in C++11
2013-01-30 19:08:45 +01:00
Jelle Zijlstra
86b3643807
Fix build problem in C++11
2013-01-30 19:08:24 +01:00
Jelle Zijlstra
31468401b7
Fix build problem in C++11
2013-01-30 19:07:52 +01:00
Ferenc Kovacs
57438e5f77
Merge branch 'PHP-5.5'
...
* PHP-5.5:
having xz makes it three. thanks Mike Ford for spotting it
2013-01-30 17:40:57 +01:00
Ferenc Kovacs
f0fe3d2dbe
having xz makes it three. thanks Mike Ford for spotting it
2013-01-30 17:39:13 +01:00
Kalle Sommer Nielsen
ee149cdd2b
Test commit (simple WS change)
2013-01-30 16:16:43 +01:00
Ferenc Kovacs
c16d8c521e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
now we have also an xz archive
2013-01-30 14:13:31 +01:00
Ferenc Kovacs
cbdf9ea34c
now we have also an xz archive
2013-01-30 14:12:38 +01:00
Stanislav Malyshev
7ae80c585f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
forgot this file :(
2013-01-29 15:03:19 -08:00
Stanislav Malyshev
15e76e6a98
forgot this file :(
2013-01-29 15:02:55 -08:00
Stanislav Malyshev
ffbd93bdca
Merge branch 'PHP-5.5'
...
* PHP-5.5:
branched 5.4.12
update NEWS
2013-01-29 12:35:08 -08:00
Stanislav Malyshev
26de5cc57f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
branched 5.4.12
update NEWS
Conflicts:
configure.in
main/php_version.h
2013-01-29 12:34:45 -08:00
Stanislav Malyshev
09b6e33b40
branched 5.4.12
2013-01-29 12:33:45 -08:00
Stanislav Malyshev
7a6e76fd2f
update NEWS
2013-01-29 12:31:49 -08:00
Stanislav Malyshev
861c16d656
Merge branch 'PHP-5.5'
...
* PHP-5.5:
complete zts fix
2013-01-29 12:12:58 -08:00
Stanislav Malyshev
748b37654d
complete zts fix
2013-01-29 12:12:34 -08:00
Johannes Schlüter
ac8fcecd5c
Merge branch 'PHP-5.5'
2013-01-29 19:50:44 +01:00
Johannes Schlüter
40dd32788c
Merge branch 'master' of git.php.net:/php-src
2013-01-29 19:50:25 +01:00
Johannes Schlüter
78d3e66f3a
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-29 19:50:14 +01:00
Johannes Schlüter
078b025a15
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2013-01-29 19:50:00 +01:00
Johannes Schlüter
1433854681
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-29 19:49:43 +01:00
Johannes Schlüter
264279439b
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-01-29 19:49:39 +01:00
Johannes Schlüter
ec53b60072
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2013-01-29 19:49:13 +01:00
Johannes Schlüter
93fd9c704b
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
2013-01-29 19:47:45 +01:00
Gustavo Lopes
5198a860c7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed paramter count
Make converter work on VS
2013-01-29 19:20:15 +01:00
Gustavo Lopes
3bedc8ec27
Fixed paramter count
2013-01-29 19:19:51 +01:00
Gustavo Lopes
9d1bdaa569
Make converter work on VS
2013-01-29 19:19:49 +01:00
Gustavo Lopes
ae0c9d547d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
intl/converter in line w/ intl error handling
Fix zpp() call in intl/converter
Write local err on intlcal_get_time_zone() failure
Improve ERROR.CONVENTIONS
Fix arginfo of BreakIterator::getLocale
intl: doc explaining error conventions
Add UConverter class (ICU's UConverter API)
2013-01-29 19:12:14 +01:00
Gustavo Lopes
1da67fc65e
intl/converter in line w/ intl error handling
2013-01-29 19:06:15 +01:00
Gustavo Lopes
a721fe2b22
Fix zpp() call in intl/converter
2013-01-29 19:06:14 +01:00
Gustavo Lopes
ee6522bebf
Write local err on intlcal_get_time_zone() failure
2013-01-29 19:06:14 +01:00
Gustavo Lopes
363fd6d6fb
Improve ERROR.CONVENTIONS
2013-01-29 19:06:14 +01:00
Gustavo Lopes
b4ba46cb99
Fix arginfo of BreakIterator::getLocale
2013-01-29 19:06:14 +01:00
Gustavo Lopes
4badc0c071
intl: doc explaining error conventions
2013-01-29 19:06:14 +01:00
Sara Golemon
1faddd15d9
Add UConverter class (ICU's UConverter API)
...
RFC at http://wiki.php.net/rfc/uconverter
2013-01-29 19:05:14 +01:00
Felipe Pena
9307126fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed ZTS build
2013-01-29 09:27:09 -02:00
Felipe Pena
37c304b5db
- Fixed ZTS build
2013-01-29 09:26:54 -02:00
Stanislav Malyshev
0ad8940814
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:29:11 -08:00
Stanislav Malyshev
489073b501
Merge branch 'PHp-5.4' into PHP-5.5
...
* PHp-5.4:
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:28:50 -08:00
Stanislav Malyshev
5382e156f9
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:27:35 -08:00
Stanislav Malyshev
992bba6aef
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add news for bug #60524
Implemented Feature #60524 (sys_temp_dir)
Conflicts:
UPGRADING
2013-01-28 22:56:51 -08:00
Stanislav Malyshev
389d41cc2e
Add news for bug #60524
2013-01-28 22:55:55 -08:00
ALeX Kazik
475a644bd8
Implemented Feature #60524 (sys_temp_dir)
...
Added a new configuration directive which allows it to change the
temporary directory, the default behavior is unchanged.
This is a useful option if you use all/some hosts inside of one .ini file
with sections and want to change the temp dir per user (maybe it's not
allowed to write outside the users home directory). Since the TMPDIR
variable affects the whole php that way can not be used for this scenario.
(see https://bugs.php.net/bug.php?id=60524 )
2013-01-28 22:37:43 -08:00
Stanislav Malyshev
383e317269
oops, unintended addition
2013-01-28 22:28:55 -08:00
Stanislav Malyshev
24447dca5d
post-5.5 changes for bug #46439 as described in the RFC
2013-01-28 22:26:59 -08:00
Stanislav Malyshev
1ca429e1d6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Implement fix for bug #46439 - add CURLFile class for safer uploads
Conflicts:
UPGRADING
2013-01-28 22:24:56 -08:00
Stanislav Malyshev
a9d013bb02
Implement fix for bug #46439 - add CURLFile class for safer uploads
2013-01-28 22:22:59 -08:00
Stanislav Malyshev
ba7544beb2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add new features
Conflicts:
UPGRADING
2013-01-28 12:14:56 -08:00
Stanislav Malyshev
420bcc1a8e
add new features
2013-01-28 12:13:13 -08:00
Anatoliy Belsky
4af8ceb3b2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
allow for libpng 1.5.x
2013-01-28 13:24:39 +01:00
Anatoliy Belsky
263a220997
allow for libpng 1.5.x
2013-01-28 13:23:31 +01:00
Stanislav Malyshev
59cc4d7679
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #60833 - self, parent, static behave inconsistently case-sensitive
Conflicts:
UPGRADING
2013-01-27 18:07:42 -08:00
Stanislav Malyshev
184db665eb
fix bug #60833 - self, parent, static behave inconsistently case-sensitive
2013-01-27 18:02:51 -08:00
Stanislav Malyshev
ebc80d62ec
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix missing parameter
2013-01-27 17:11:53 -08:00
Stanislav Malyshev
581db9c5fa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix missing parameter
2013-01-27 17:11:36 -08:00
Andras Elso
3e6d633a0d
Fix missing parameter
2013-01-27 17:11:14 -08:00
Ferenc Kovacs
016c130f21
now we have also an xz archive
2013-01-24 12:56:55 +01:00
Stanislav Malyshev
c493173f8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix tests
fix tests
2013-01-23 10:45:12 -08:00
Stanislav Malyshev
d86e14b8f6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix tests
2013-01-23 10:45:01 -08:00
Stanislav Malyshev
122570443b
fix tests
2013-01-23 10:44:53 -08:00
Stanislav Malyshev
dc617c74fa
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix valgrind warning
Fix bug #64023 (__toString() & SplFileInfo)
Fix test related to change for #bug64007 and also fix in newInstanceArgs
NEWS: Start PHP 5.5.0 Beta 1 section
NEWS for PHP 5.5.0alpha4
Fix NEWS
2013-01-23 10:44:53 -08:00
Stanislav Malyshev
beb5c8e551
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix tests
2013-01-23 10:44:38 -08:00
Stanislav Malyshev
bcf922b0f8
fix tests
2013-01-23 10:44:25 -08:00
Gustavo Lopes
38bf6951b3
NEWS for bug #64023 (see aa0adce)
2013-01-23 13:30:40 +01:00
Gustavo Lopes
ddc98aa814
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:26:15 +01:00
Gustavo Lopes
fc7b054c2d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:24:50 +01:00
Andrey Hristov
40d9075677
Merge branch 'PHP-5.5'
2013-01-22 16:49:13 +01:00
Andrey Hristov
95346c017c
fix valgrind warning
2013-01-22 16:48:39 +01:00
Gustavo Lopes
b8b3bb08b2
Merge branch 'bug64023' into PHP-5.4
...
* bug64023:
Fix bug #64023 (__toString() & SplFileInfo)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-01-22 12:24:33 +01:00
Gustavo Lopes
aa0adce47d
Fix bug #64023 (__toString() & SplFileInfo)
...
Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().
Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
2013-01-22 11:33:29 +01:00
Xinchen Hui
34928ee9c8
Merge branch 'PHP-5.5'
2013-01-22 17:00:15 +08:00
Xinchen Hui
e6bde1f8f6
Fix test related to change for #bug64007 and also fix in newInstanceArgs
2013-01-22 16:58:40 +08:00
David Soria Parra
51e5022364
NEWS: Start PHP 5.5.0 Beta 1 section
2013-01-22 09:45:04 +01:00
David Soria Parra
ca734cfbc7
NEWS for PHP 5.5.0alpha4
2013-01-22 09:42:04 +01:00
David Soria Parra
03ff2b301c
Fix NEWS
2013-01-22 09:41:53 +01:00
Stanislav Malyshev
c8e4c4c569
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix tests
2013-01-22 00:37:26 -08:00
Stanislav Malyshev
92b5bdc231
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Merge fix of #62836 to ?.re, and regenerate ?.c
Fixed bug #64007 (There is an ability to create instance of Generator by hand).
- Fixed ZTS build
Class Name Resolution As Scalar Via "class" Keyword
2013-01-22 00:36:26 -08:00
Stanislav Malyshev
d78f5ababe
fix tests
2013-01-22 00:36:07 -08:00
Xinchen Hui
679f6e3f56
Merge branch 'PHP-5.5'
2013-01-21 11:49:01 +08:00
Xinchen Hui
85fae636d0
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/standard/var_unserializer.c
2013-01-21 11:42:16 +08:00
Xinchen Hui
86c1a26169
Merge fix of #62836 to ?.re, and regenerate ?.c
2013-01-21 11:35:22 +08:00
Xinchen Hui
a7cb5724c3
Merge branch 'PHP-5.5'
2013-01-19 17:03:53 +08:00
Xinchen Hui
f7b99c481d
Fixed bug #64007 (There is an ability to create instance of Generator by hand).
...
Use get_constrctor instead of access of the ce->constructor directly
2013-01-19 17:01:57 +08:00
Felipe Pena
6c8f9c3451
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed ZTS build
2013-01-18 22:15:22 -02:00
Felipe Pena
e23fca8910
- Fixed ZTS build
2013-01-18 22:15:08 -02:00
Lars Strojny
087a188702
Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
2013-01-19 01:06:13 +01:00
Lars Strojny
b1ddfcbee3
Merge branch 'PHP-5.5'
2013-01-19 01:01:39 +01:00
Lars Strojny
8991ed016f
Class Name Resolution As Scalar Via "class" Keyword
2013-01-19 01:00:47 +01:00
Stanislav Malyshev
f02373fc5a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:45:40 -08:00
Stanislav Malyshev
cd619b47f3
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #63988 (Two Date tests fail) only for PHP-5.5
- Fixed ZTS build
Dereferencing process-handles no longer waits on those processes.
revert change. now it doesn't compile again...someone should fix ext/date...
Use two dtors thus allow allocation based on the alloc model of the connection.
plug a leak - forgot ot use the dtor already written
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
Revert "Update fputcsv() to escape all characters equally."
Add support for connect attributes, as of MySQL 5.6
Bug #62489 : dba_insert not working as expected
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Update README.PARAMETER_PARSING_API
Export zend_parse_parameter()
Expose zend_parse_arg() as zend_parse_parameter()
zend_parse_parameters: allow ! for non pointers
2013-01-18 13:42:19 -08:00
Stanislav Malyshev
deeacc7106
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63462 (Magic methods called twice for unset protected properties)
NEWS for bug #64011 . See 77ee200
Fix bug #64011 (get_html_translation_table())
Fix News
Update the arguments in the prototype of fpm_socket_unix_test_connect().
fixed build
NEWS for bug #63893
Fixed inconsequential bug in strtr()
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
Revert "Update fputcsv() to escape all characters equally."
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-18 13:42:04 -08:00
Stanislav Malyshev
9e7c2e5906
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:35:09 -08:00
Stanislav Malyshev
33b104c778
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:29:43 -08:00
Gustavo Lopes
5da05e5f0a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for bug #64011 . See 77ee200
Fix bug #64011 (get_html_translation_table())
Fix News
2013-01-18 12:12:55 +01:00
Gustavo Lopes
cd2b03d5ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for bug #64011 . See 77ee200
Fix bug #64011 (get_html_translation_table())
Fix News
2013-01-18 12:12:25 +01:00
Gustavo Lopes
b69fd9c9b8
NEWS for bug #64011 . See 77ee200
2013-01-18 12:12:08 +01:00
Gustavo Lopes
77ee200097
Fix bug #64011 (get_html_translation_table())
...
get_html_translation_table() with encoding ISO-8859-1 and HTMLENTITIES
was broken. Only entities for characters U+0000 to U+0040 were being
included in the result.
2013-01-18 12:10:27 +01:00
Ard Biesheuvel
35154c7ebc
Update config.sub to latest GPLv2 upstream version
...
This adds the ability to configure/build for 64-bit ARMv8,
which uses the host triplet 'aarch64-linux-gnu'.
Source:
http://git.savannah.gnu.org/gitweb/?p=config.git;h=306afce
2013-01-18 10:31:05 +01:00
Xinchen Hui
a499a655ee
Merge branch 'PHP-5.5'
2013-01-18 15:51:32 +08:00
Xinchen Hui
4eae087296
Fixed bug #63988 (Two Date tests fail) only for PHP-5.5
2013-01-18 15:49:36 +08:00
Xinchen Hui
87d5701065
Fix skipif section
2013-01-18 15:12:51 +08:00
Ard Biesheuvel
ffc8850d44
Merge branch 'feature/linaro-arm-performance'
...
* feature/linaro-arm-performance:
Added ARM accelerated implementations for ZEND_SIGNED_MULTIPLY_LONG()
Added test cases for ZEND_SIGNED_MULTIPLY_LONG()
2013-01-17 18:07:10 +01:00
Ard Biesheuvel
0b8ec19629
Added ARM accelerated implementations for ZEND_SIGNED_MULTIPLY_LONG()
...
Added inline assembler implementations:
- for 32-bit ARM, as the existing C implementation uses 64-bit
integer arithmetic, which relies on software emulation by libgcc;
- for 64-bit ARM, as the existing C implementation uses long doubles
to check for overflow before using the integer result.
Also updated my email address and fixed some whitespace
2013-01-17 18:04:05 +01:00
Ard Biesheuvel
abb12f5d7b
Added test cases for ZEND_SIGNED_MULTIPLY_LONG()
...
Before making changes to the implementation of
ZEND_SIGNED_MULTIPLY_LONG(), add some test cases
to make sure the various implementations remain
equivalent.
2013-01-17 17:41:58 +01:00
Gustavo Lopes
979ca53734
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update README.PARAMETER_PARSING_API
Export zend_parse_parameter()
Expose zend_parse_arg() as zend_parse_parameter()
zend_parse_parameters: allow ! for non pointers
2013-01-16 23:37:42 +01:00
Gustavo Lopes
b8603035d0
Merge remote-tracking branch 'cataphract/zpp_improv' into PHP-5.5
...
See https://wiki.php.net/rfc/zpp_improv
* cataphract/zpp_improv:
Update README.PARAMETER_PARSING_API
Export zend_parse_parameter()
Expose zend_parse_arg() as zend_parse_parameter()
zend_parse_parameters: allow ! for non pointers
2013-01-16 23:37:06 +01:00
Johannes Schlüter
7276769c4a
Merge branch 'PHP-5.5'
2013-01-16 17:39:09 +01:00
Johannes Schlüter
d7d9ce0f42
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-16 17:38:55 +01:00
Johannes Schlüter
a85ae16e74
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-16 17:38:41 +01:00
Johannes Schlüter
be2f547497
Fix NEWS after 5.3.21
2013-01-16 17:38:17 +01:00
Christopher Jones
94a4e0f823
Fix News
2013-01-15 20:38:24 -08:00
Adam Harvey
6f23a2d70a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
2013-01-16 10:21:51 +08:00
Adam Harvey
77010bf9bf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
2013-01-16 10:19:13 +08:00
Adam Harvey
142c40f32c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
2013-01-16 10:18:00 +08:00
Adam Harvey
f63a9f6c11
Update the arguments in the prototype of fpm_socket_unix_test_connect().
...
Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
2013-01-16 10:06:56 +08:00
Felipe Pena
5d0cd72394
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed ZTS build
2013-01-15 19:59:30 -02:00
Felipe Pena
2f7aafe992
- Fixed ZTS build
2013-01-15 19:59:23 -02:00
Felipe Pena
3efdfb54f3
Merge branch 'master' of git.php.net:php-src
2013-01-15 19:45:43 -02:00
Felipe Pena
7629c8db40
- Fixed ZTS build
2013-01-15 19:45:09 -02:00
Anatoliy Belsky
41433a52d6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed build
NEWS for bug #63893
2013-01-15 22:40:31 +01:00
Anatoliy Belsky
18e160411e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed build
NEWS for bug #63893
Conflicts:
NEWS
2013-01-15 22:39:49 +01:00
Anatoliy Belsky
9498cf6194
fixed build
2013-01-15 22:36:29 +01:00
Lars Strojny
85a949d9d4
Merge branch 'PHP-5.5'
2013-01-15 22:12:09 +01:00
Jille Timmermans
dba22c0864
Dereferencing process-handles no longer waits on those processes.
...
Implements FR #46487
2013-01-15 21:50:35 +01:00
Gustavo Lopes
5466fd1866
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed inconsequential bug in strtr()
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-15 21:47:33 +01:00
Gustavo Lopes
1bd193ed36
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5
...
* remotes/cataphract/strtr_wu94_55:
Fixed inconsequential bug in strtr()
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-15 21:45:22 +01:00
Gustavo Lopes
4c38003dbd
NEWS for bug #63893
2013-01-15 21:07:21 +01:00
Gustavo Lopes
93e35137aa
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4
...
* remotes/cataphract/strtr_wu94_54:
Fixed inconsequential bug in strtr()
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-15 21:05:21 +01:00
Gustavo Lopes
88b82ae54d
Merge branch 'strtr_wu94_54' into strtr_wu94_55
2013-01-15 17:26:24 +01:00
Gustavo Lopes
930ef9ddd6
Fixed inconsequential bug in strtr()
2013-01-15 17:25:59 +01:00
Andrey Hristov
9be02af4ef
Merge branch 'PHP-5.5'
2013-01-15 12:21:22 +01:00
Andrey Hristov
5cfa916aad
revert change. now it doesn't compile again...someone should fix ext/date...
2013-01-15 12:20:58 +01:00
Andrey Hristov
31f3f2d37d
Merge branch 'PHP-5.5'
2013-01-15 12:20:24 +01:00
Andrey Hristov
acc24d1f9e
Use two dtors thus allow allocation based on the alloc model of the
...
connection.
2013-01-15 12:19:52 +01:00
Andrey Hristov
69f010c99d
Merge branch 'PHP-5.5'
2013-01-15 11:33:07 +01:00
Andrey Hristov
d377a266b2
plug a leak - forgot ot use the dtor already written
2013-01-15 11:32:44 +01:00
Andrey Hristov
0b0f87e822
Merge branch 'master' of ssh://git.php.net/php-src
2013-01-15 11:07:58 +01:00
Andrey Hristov
5718568830
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-01-15 11:07:32 +01:00
Andrey Hristov
a7fc90703f
Merge branch 'PHP-5.5'
2013-01-15 11:07:08 +01:00
Andrey Hristov
22ba2b95ce
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-01-15 11:06:59 +01:00
Adam Harvey
ef86530a56
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
...
This reverts commit 0510701474 .
2013-01-15 17:40:30 +08:00
Adam Harvey
cab290d2ad
Revert "Update fputcsv() to escape all characters equally."
...
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.
This reverts commit 9b5cb0e805 .
2013-01-15 17:40:30 +08:00
Adam Harvey
40c1122dcc
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
...
This reverts commit 0510701474 .
2013-01-15 17:40:23 +08:00
Adam Harvey
232cf4a640
Revert "Update fputcsv() to escape all characters equally."
...
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.
This reverts commit 9b5cb0e805 .
2013-01-15 17:40:23 +08:00
Andrey Hristov
c77fe090ea
Merge branch 'master' of ssh://git.php.net/php-src
...
Conflicts:
NEWS
2013-01-15 10:40:15 +01:00
Adam Harvey
83864b470b
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
...
This reverts commit 0510701474 .
2013-01-15 17:37:21 +08:00
Adam Harvey
b1bf524140
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Revert "Update fputcsv() to escape all characters equally."
2013-01-15 17:35:34 +08:00
Adam Harvey
c077074c13
Revert "Update fputcsv() to escape all characters equally."
...
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.
This reverts commit 9b5cb0e805 .
2013-01-15 17:33:54 +08:00
Andrey Hristov
c4fe37bd8c
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-01-15 10:12:54 +01:00
Andrey Hristov
dc495bbe95
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-01-15 10:05:54 +01:00
Andrey Hristov
1ff4352263
Add support for connect attributes, as of MySQL 5.6
2013-01-15 10:04:59 +01:00
Lars Strojny
9d88c8d904
Merge branch 'PHP-5.5'
2013-01-15 09:35:47 +01:00
Lars Strojny
eb40f73ca0
Bug #62489 : dba_insert not working as expected
2013-01-15 09:30:44 +01:00
Stanislav Malyshev
c3a63f580c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix NEWS
2013-01-15 00:08:44 -08:00
Stanislav Malyshev
6dc80f080e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2013-01-15 00:08:29 -08:00
Stanislav Malyshev
374ebc8741
fix NEWS
2013-01-15 00:08:12 -08:00
Stanislav Malyshev
71330a771d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix NEWS
2013-01-15 00:07:22 -08:00
Stanislav Malyshev
10cd61386e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2013-01-15 00:07:07 -08:00
Stanislav Malyshev
643e7a54ec
fix NEWS
2013-01-15 00:06:35 -08:00
Adam Harvey
587ea700cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:52:12 +08:00
Adam Harvey
8bf937f9bf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:50:57 +08:00
Adam Harvey
0510701474
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:49:52 +08:00
Xinchen Hui
0b5e833db8
Merge branch 'PHP-5.5'
2013-01-15 15:34:10 +08:00
Xinchen Hui
4fa5c1d22d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-15 15:33:26 +08:00
Xinchen Hui
3bc7490370
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-01-15 15:32:42 +08:00
Xinchen Hui
4fcf4e0845
Fixed bug #57702 (Multi-row BLOB fetches)
2013-01-15 15:31:49 +08:00
Adam Harvey
1794ef4736
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update fputcsv() to escape all characters equally.
2013-01-15 15:26:50 +08:00
Adam Harvey
ba32970710
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update fputcsv() to escape all characters equally.
2013-01-15 15:26:25 +08:00
Adam Harvey
a4191b0aad
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update fputcsv() to escape all characters equally.
2013-01-15 15:24:21 +08:00
Adam Harvey
9b5cb0e805
Update fputcsv() to escape all characters equally.
...
At present, backslashes have special case handling within fputcsv(): when one
is encountered within a field that's being escaped, escaping stops until the
next instance of the enclosure character is hit. This can result in malformed
CSV.
Fixes bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ").
2013-01-15 15:17:45 +08:00
Xinchen Hui
a744390c50
Merge branch 'PHP-5.5'
2013-01-15 10:41:07 +08:00
Adam Harvey
be1700d467
Fix compile failure introduced by the fix for bug #46408 .
2013-01-15 10:08:26 +08:00
Lars Strojny
212f9f05f0
Merge branch 'PHP-5.5'
2013-01-14 21:43:07 +01:00
Lars Strojny
3ea2b73a30
Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
2013-01-14 21:41:24 +01:00
Derick Rethans
3f20a2dec3
Merge branch 'PHP-5.5'
2013-01-14 20:39:06 +00:00
Derick Rethans
6313fc7e10
Added NEWS item for DateTimeImmutable
2013-01-14 20:36:48 +00:00
Lars Strojny
c4de702d4e
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 21:36:28 +01:00
Lars Strojny
6a065876b9
Bug #52958 : Segfault in PDO_OCI on cleanup after running a long testsuite.
2013-01-14 21:35:48 +01:00
Derick Rethans
cca1a6e344
Merge branch 'PHP-5.5'
2013-01-14 20:35:13 +00:00
Derick Rethans
c20911a850
Make DatePeriod support DateTimeImmutable as well.
...
If the start element is a DateTimeImmutable object, then all returned objects
are also DateTimeImmutable objects. If the start element is a DateTime object,
then all returned objects are DateTime objects.
2013-01-14 20:34:58 +00:00
Derick Rethans
a0618139c9
Fixed crash bug when the non-OO interface was used.
2013-01-14 20:34:58 +00:00
Derick Rethans
017b1f7fca
Rename DateTimePoint to DateTimeImmutable.
2013-01-14 20:34:58 +00:00
Derick Rethans
a0bea9a1de
Added another test to test the unmodified inherited methods.
2013-01-14 20:34:58 +00:00
Derick Rethans
3919d0adf7
Added a few missing TSRMLS_DC/TSRMLS_CC.
2013-01-14 20:34:58 +00:00
Derick Rethans
45a429200c
Added a test case for DateTimePoint.
2013-01-14 20:34:57 +00:00
Derick Rethans
1cc61f0927
Implemented immutable DateTime objects as the DateTimePoint class.
2013-01-14 20:34:57 +00:00
Lars Strojny
fd72588979
Merge branch 'PHP-5.5'
2013-01-14 21:25:01 +01:00
Lars Strojny
92965b033a
Bug #46408 : Fix double formatting for PostgreSQL bound parameters
2013-01-14 21:23:52 +01:00
Lars Strojny
ef6ae113f1
Merge branch 'PHP-5.5'
2013-01-14 20:43:55 +01:00
Lars Strojny
785e66adb5
PR #260 : Update css for 404 pages to feel more up to date and have a consistent layout across browsers
2013-01-14 20:43:14 +01:00
Lars Strojny
02d04c244f
Merge branch 'PHP-5.5'
2013-01-14 18:54:08 +01:00
Lars Strojny
97157b376f
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 18:53:40 +01:00
Lars Strojny
bf9ad4e661
Support BITMAPV5HEADER in getimagesize(): https://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29
2013-01-14 18:52:38 +01:00
Lars Strojny
df8a9e1ecb
Merge branch 'PHP-5.5'
2013-01-14 18:16:48 +01:00
Lars Strojny
3ec2281298
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 18:00:00 +01:00
Lars Strojny
1e9a3ed234
Fix bug #63916 : PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite
2013-01-14 17:59:11 +01:00
Lars Strojny
0c153aeb3b
Merge branch 'PHP-5.5'
2013-01-14 17:44:03 +01:00
Lars Strojny
b16463a9fb
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 17:36:07 +01:00
Lars Strojny
99d087e5d4
Fixed bug #63921 : sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
2013-01-14 17:35:07 +01:00
Gustavo Lopes
70b25e9c61
UPGRADING.INTERNALS: document zend_qsort_r
2013-01-14 17:27:20 +01:00
Gustavo Lopes
22390d3393
Add zend_qsort_r & use it in strtr
2013-01-14 17:24:16 +01:00
Gustavo Lopes
1ce5a22589
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-01-14 17:19:23 +01:00
Gustavo Lopes
200242595d
NEWS for bug #63893
2013-01-14 17:17:58 +01:00
Gustavo Lopes
d7bac4f5ba
Remove _GNU_SOURCE, add local heap sort
2013-01-14 17:06:52 +01:00
Ben Ramsey
3439a098a0
array_column: Removed array_pluck() alias
2013-01-14 10:04:14 -06:00
Gustavo Lopes
e5029ac40b
The compiler can figure this out
2013-01-14 12:22:42 +01:00
Gustavo Lopes
93d1171c47
Remove unused block
2013-01-14 12:22:42 +01:00
Gustavo Lopes
cddbb98ada
strtr() with 2nd param array - optimization
...
About a 1.25x speedup in my test script by writing the result string
only when a match is found and at the end instead of on each iteration.
2013-01-14 12:22:42 +01:00
Gustavo Lopes
2111ee3df5
Refactoring, bugs & leaks
2013-01-14 12:22:41 +01:00
Gustavo Lopes
ccf15cf2dc
Optimize strtr w/ 2nd arg array
...
Fixes bug #63893 : poor efficiency of strtr() using array with keys of
very different length.
The implementation is basically all new, which carries some risk with
it.
The algorithm is described in "A Fast Algorithm For Multi-Pattern
Searching" (1994) by Sun Wu and Udi Manber.
2013-01-14 12:22:41 +01:00
Xinchen Hui
7a31692253
Merge branch 'PHP-5.5'
2013-01-14 17:09:05 +08:00
Xinchen Hui
be07f815f2
Use zend_unmangle_property_name_ex to save strlen
2013-01-14 17:08:21 +08:00
Xinchen Hui
f6260b36dd
Merge branch 'PHP-5.5'
2013-01-14 16:24:26 +08:00
Xinchen Hui
62059c16ee
Fixed bug #63980 (object members get trimmed by zero bytes)
2013-01-14 16:23:22 +08:00
Adam Harvey
5c7ae74f10
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Tinker with UPGRADING's wording for the format string changes for clarity.
2013-01-14 13:56:22 +08:00
Adam Harvey
fe27146b1b
Tinker with UPGRADING's wording for the format string changes for clarity.
2013-01-14 13:54:43 +08:00
Stanislav Malyshev
308d817fb6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:29:06 -08:00
Stanislav Malyshev
30fd25bb49
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:27:05 -08:00
Stanislav Malyshev
1a96fe0b32
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
2013-01-13 17:08:52 -08:00
Stanislav Malyshev
c6203da6c2
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 16:58:27 -08:00
Arnaud Le Blanc
bbf1c9c4a7
Merge branch 'PHP-5.5'
2013-01-13 15:47:33 +01:00
Arnaud Le Blanc
718afb9acf
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-13 15:47:12 +01:00
Arnaud Le Blanc
a06313fe5a
fixed alternate form for 'x' and 'X' formats
...
same fix exists in original code:
https://svn.apache.org/viewvc?view=revision&revision=1152309
2013-01-13 15:45:15 +01:00
Ben Ramsey
a1876b6846
array_column: Set array_pluck as an alias for array_column
2013-01-11 17:09:34 -06:00
Ben Ramsey
5bc2854b37
array_column: Implement ability to specify an index column
2013-01-11 16:58:31 -06:00
Ben Ramsey
94d5b2519a
Cleaning up a memory leak.
2013-01-11 14:16:20 -06:00
Ben Ramsey
20ab30339d
array_column: Adding test for IS_OBJECT and converting object to string
2013-01-11 14:16:19 -06:00
Ben Ramsey
66a02eb25e
array_column: Using add_next_index_zval() at nikic's recommendation.
2013-01-11 14:16:19 -06:00
Ben Ramsey
5f6b20a44d
array_column: Improved tests
2013-01-11 14:16:19 -06:00
Ben Ramsey
e921d28ae3
array_column: Cleaning up, as recommended in pull request #56 comments
2013-01-11 14:16:19 -06:00
Ben Ramsey
10da6f00b8
Fixing typo in test for array_column()
2013-01-11 14:16:19 -06:00
Ben Ramsey
6a27b890e6
Simplify the code and use zend_hash_next_index_insert()
2013-01-11 14:16:19 -06:00
Ben Ramsey
dc4dfe8ae0
Adding test for columns not present in all rows for array_column().
2013-01-11 14:16:19 -06:00
Ben Ramsey
a811e5b6f7
Adding tests for the negative results of array_column()
2013-01-11 14:16:19 -06:00
Ben Ramsey
9035a1ed24
Implement new array function array_column()
...
array_column() returns the values of the specified column from a
multi-dimensional array.
2013-01-11 14:16:19 -06:00
Dmitry Stogov
30588d8c50
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:56 +04:00
Dmitry Stogov
52dd0d1c73
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:37 +04:00
Dmitry Stogov
046ae2f77c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:19 +04:00
Dmitry Stogov
e1410b5a70
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:53:10 +04:00
ULF WENDEL
9202225f29
Merge branch 'PHP-5.5'
...
* PHP-5.5:
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:54:01 +01:00
ULF WENDEL
f787e21ef5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:53:46 +01:00
ULF WENDEL
36e88d78e6
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:51:14 +01:00
Remi Collet
79dc69b75f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:59 +01:00
Remi Collet
b3a934bdb3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:25 +01:00
Remi Collet
f659ec108f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:17:53 +01:00
Remi Collet
dc9f0e70b7
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle)
...
See commit c05ee74e7f
2013-01-10 11:14:38 +01:00
Andrey Hristov
1b25386175
Merge branch 'PHP-5.5'
2013-01-09 19:15:57 +01:00
Andrey Hristov
846e506a3d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-09 19:15:29 +01:00
Andrey Hristov
d430b5a4eb
Add mysqli support - constants and checking in mysqli_options() for the
...
new constant for password expriration
2013-01-09 19:14:48 +01:00
Andrey Hristov
c328520e07
Merge branch 'PHP-5.5'
2013-01-09 19:04:05 +01:00
Andrey Hristov
790096b68b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd_enum_n_def.h
2013-01-09 19:03:56 +01:00
Andrey Hristov
258c76eb41
backport handling of expired passwords in mysqlnd to 5.4
2013-01-09 18:58:29 +01:00
Andrey Hristov
cd45e54006
Merge branch 'PHP-5.5'
2013-01-09 18:41:06 +01:00
Andrey Hristov
1f7f8429af
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd.c
2013-01-09 18:40:57 +01:00
Andrey Hristov
bcd278ad7f
fix compilation error after merge
2013-01-09 18:39:59 +01:00
Andrey Hristov
96ff156f06
Merge branch 'PHP-5.5'
2013-01-09 18:31:15 +01:00
Andrey Hristov
cb6071ef54
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd.c
2013-01-09 18:30:56 +01:00
Andrey Hristov
6a6ec195ac
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-09 18:27:50 +01:00
Andrey Hristov
12e759c2ea
Use during connect the flags set with set_client_option()
2013-01-09 18:27:06 +01:00
Gustavo Lopes
428aec8ce3
Update README.PARAMETER_PARSING_API
2013-01-09 17:16:40 +01:00
Gustavo Lopes
07590e6e45
Export zend_parse_parameter()
2013-01-09 17:00:04 +01:00
Andrey Hristov
34d0562a4f
Merge branch 'PHP-5.5'
2013-01-09 15:33:32 +01:00
Andrey Hristov
ddcb67d446
support for password expiration in mysqlnd, through a flag
2013-01-09 15:33:07 +01:00
Andrey Hristov
8494671de4
Merge branch 'master' of ssh://git.php.net/php-src
2013-01-09 15:07:36 +01:00
Dmitry Stogov
0132cb694d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:53:05 +04:00
Andrey Hristov
3f248fef05
Merge branch 'PHP-5.5'
2013-01-09 14:51:02 +01:00
Dmitry Stogov
149cc8d69d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
2013-01-09 11:33:44 +04:00
Xinchen Hui
f584b9ac50
Merge branch 'PHP-5.5'
2013-01-09 10:58:27 +08:00
Joey Smith
c3acefd9ea
Fix a typo in the ZipArchive error messages
2013-01-08 14:18:31 -07:00
Pierre Joye
c41291feb9
Merge branch 'master' of git.php.net:php-src
2013-01-08 15:21:41 +01:00
Pierre Joye
f566b4d321
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix bug #47358 , glob returns error, should be empty array()
- NEWS entry for #50524
2013-01-08 15:16:35 +01:00
Pierre Joye
10a2c0d574
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- fix bug #47358 , glob returns error, should be empty array()
- NEWS entry for #50524
2013-01-08 15:13:40 +01:00
Pierre Joye
2fb7cd30c5
- fix bug #47358 , glob returns error, should be empty array()
2013-01-08 15:06:58 +01:00
Pierre Joye
50ceeb9f75
- fix bug #47358 , glob returns error, should be empty array()
2013-01-08 15:02:04 +01:00
Adam Harvey
56dd1e30f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add NEWS for the previously cherry picked commit.
sapi/litespeed/lsapi_main.c: Fix bug #63228
2013-01-08 11:45:49 +08:00
Andrey Hristov
4a68c46594
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-01-07 16:46:16 +01:00
Pierre Joye
bcb3ad043a
- NEWS entry for #50524
2013-01-07 13:09:20 +01:00
Pierre Joye
7a13ce61e0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix the fix for bug #50524
2013-01-07 13:04:40 +01:00
Anatoliy Belsky
ae0c512ffd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix windows build
News entry for bug #52126
Conflicts:
NEWS
2013-01-06 18:42:06 +01:00
Derick Rethans
8bca904f96
Merge branch 'master' of git.php.net:/php-src
2013-01-06 15:10:36 +00:00
Derick Rethans
65bae39770
Merge branch 'PHP-5.5'
2013-01-06 15:07:34 +00:00
Lars Strojny
878780c6bb
Merge branch 'PHP-5.5'
2013-01-06 15:12:07 +01:00
Lars Strojny
925da6b14d
Merge branch 'PHP-5.5'
2013-01-06 14:55:05 +01:00
Lars Strojny
44f564e3e6
Merge branch 'PHP-5.5'
2013-01-06 14:12:19 +01:00
Xinchen Hui
786d34f13b
Merge branch 'PHP-5.5'
2013-01-06 10:25:04 +08:00
Lars Strojny
9fae5b68c8
Merge branch 'PHP-5.5'
2013-01-06 03:23:36 +01:00
Lars Strojny
ce76ec56d9
Merge branch 'PHP-5.5'
2013-01-06 02:11:34 +01:00
Pierrick Charron
4084a02ff9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improve resource management for curl handle
2013-01-05 11:12:00 -05:00
Colin Viebrock
98a3d5acc0
update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
2013-01-04 12:05:27 -06:00
Xinchen Hui
8a2208a33c
Merge branch 'PHP-5.5'
2013-01-04 11:06:26 +08:00
Stanislav Malyshev
782f4ac23a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.4.12-dev
2013-01-03 17:34:21 -08:00
Johannes Schlüter
0c6ce227dc
Merge branch 'PHP-5.5'
2013-01-03 23:00:30 +01:00
Remi Collet
a3b7d24e8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
remove set but not used variables
2013-01-02 16:57:44 +01:00
Stanislav Malyshev
5a27e9760b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add bug #63762
2013-01-01 22:10:22 -08:00
Stanislav Malyshev
de816469ef
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add fix #43177
2013-01-01 21:24:43 -08:00
Stanislav Malyshev
6da86acfae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
fix NEWS
2013-01-01 21:21:42 -08:00
Pierrick Charron
a63a725301
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove passwd handler from struct when not needed
2013-01-01 21:18:08 -05:00
Xinchen Hui
642721b38a
Merge branch 'PHP-5.5'
2013-01-01 16:39:03 +08:00
Pierrick Charron
ae5d86270f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
2012-12-29 23:16:53 -05:00
Lars Strojny
3b022e57ed
Merge branch 'PHP-5.5'
2012-12-29 03:38:23 +01:00
Pierrick Charron
90cbe2a01f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add new curl options
2012-12-28 00:53:03 -05:00
Pierrick Charron
f3ff33a2b5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed #63859 Memory leak when reusing curl-handle
2012-12-27 13:39:58 -05:00
Pierrick Charron
c9a080d09f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "Remove a useless memory write in zend_llist_del_element"
2012-12-26 10:19:04 -05:00
Pierrick Charron
407f851732
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix ext/curl tests to work on every libcurl versions
2012-12-26 00:44:25 -05:00
Pierrick Charron
d87ad19683
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove a useless memory write in zend_llist_del_element
2012-12-25 20:59:38 -05:00
Dmitry Stogov
ba6317b05e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
spelling
2012-12-25 16:24:09 +04:00
Dmitry Stogov
245dbb043e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
spelling
2012-12-25 16:22:22 +04:00
Dmitry Stogov
8728ca65c6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed ZTS build
2012-12-25 13:39:13 +04:00
Dmitry Stogov
f3ea497377
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed deprecated fields
2012-12-25 10:50:35 +04:00
Dmitry Stogov
3b17a09017
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Traits refactoring
2012-12-25 10:34:07 +04:00
Nikita Popov
fd25d48494
Merge branch 'PHP-5.5'
2012-12-24 00:30:26 +01:00
Pierrick Charron
c5cfe37def
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update NEWS
New curl_pause() function
Support for curl_strerror and curl_multi_strerror
Add curl_multi_setopt and clean curl_share_setopt
Remove duplicated function definition
2012-12-23 17:51:43 -05:00
Pierrick Charron
6ec81361fe
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update NEWS file
Fixed segfault due to libcurl connection caching
2012-12-22 19:12:27 -05:00
Pierrick Charron
657d3f18f2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update NEWS file
Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
2012-12-21 19:29:14 -05:00
Pierrick Charron
9cf98be846
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix test to work on every libcurl version
- Fixed typo on "SKIPIF" (causing make test to abort on some systems)
2012-12-21 12:26:03 -05:00
Pierrick Charron
a6a4323426
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix test
2012-12-21 11:50:50 -05:00
Nikita Popov
1f4c71b760
Merge branch 'PHP-5.5'
2012-12-21 17:34:14 +01:00
Nikita Popov
4509016309
Merge branch 'PHP-5.5'
2012-12-21 01:58:29 +01:00
Nikita Popov
68730388ae
Merge branch 'PHP-5.5'
2012-12-20 20:36:06 +01:00
Rasmus Lerdorf
d417a054e1
Merge branch 'PHP-5.5'
2012-12-19 23:01:00 -05:00
Pierrick Charron
e33e143296
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #55438 (Curlwapper is not sending http header randomly)
2012-12-19 19:47:34 -05:00
Johannes Schlüter
129580a81c
Merge branch 'PHP-5.5'
2012-12-19 17:02:12 +01:00
Andrey Hristov
456e37da12
Merge branch 'PHP-5.5'
2012-12-19 16:58:47 +01:00
Andrey Hristov
87f80928ba
Merge branch 'master' of ssh://git.php.net/php-src
2012-12-19 16:20:31 +01:00
Andrey Hristov
d57e474267
Merge branch 'PHP-5.4'
2012-12-19 16:20:19 +01:00
Nikita Popov
0e781e2309
Merge branch 'PHP-5.5'
2012-12-19 15:23:52 +01:00
Andrey Hristov
0a8777a515
Merge branch 'master' of ssh://git.php.net/php-src
2012-12-19 15:07:03 +01:00
Andrey Hristov
c780ddbb50
Merge branch 'PHP-5.4'
...
Conflicts:
ext/mysqlnd/mysqlnd_alloc.c
2012-12-19 15:05:47 +01:00
Remi Collet
f98a03b144
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix failing test on Linux build
2012-12-19 10:25:16 +01:00
Nikita Popov
5f7c478d53
Merge branch 'PHP-5.5'
2012-12-18 21:41:55 +01:00
David Soria Parra
2041e0dc18
Merge branch 'PHP-5.5'
...
* PHP-5.5:
News for PHP 5.5.0 Alphas
2012-12-18 17:28:22 +01:00
Xinchen Hui
210d428f99
ixed bug that exception won't be catched
...
Related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)
2012-12-18 15:34:47 +08:00
Xinchen Hui
d3ec9ceb25
Revert "Fixed bug that exception won't be catched"
...
This reverts commit 28db07a0e3 .
Unexpected vm kind change
2012-12-18 15:27:54 +08:00
Xinchen Hui
28db07a0e3
Fixed bug that exception won't be catched
...
related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)
2012-12-18 15:20:58 +08:00
Xinchen Hui
73c9889663
Merge branch 'PHP-5.5'
2012-12-17 14:30:41 +08:00
Xinchen Hui
6f452126ac
Merge branch 'PHP-5.5'
2012-12-17 12:58:38 +08:00
Sebastian Bergmann
8e22b0408a
Merge branch 'PHP-5.5'
2012-12-16 09:08:01 +01:00
Remi Collet
4ef9f00c46
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
2012-12-16 08:52:02 +01:00
Lars Strojny
eb0693a975
Merge branch 'PHP-5.5'
2012-12-14 14:57:04 +01:00
Lars Strojny
765d5200d6
Merge branch 'master' of git://github.com/php/php-src
2012-12-14 14:56:58 +01:00
Xinchen Hui
72f7543668
Merge branch 'PHP-5.5'
2012-12-14 17:27:21 +08:00
Xinchen Hui
3acc729707
Merge branch 'PHP-5.5'
2012-12-14 17:23:07 +08:00
Xinchen Hui
1062052a0d
Merge branch 'PHP-5.5'
2012-12-14 16:53:27 +08:00
Xinchen Hui
a4678099a1
Add test for bug #63741
2012-12-14 16:51:34 +08:00
Dmitry Stogov
ec4ff07415
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed uninitialized EX(call)->called_scope
2012-12-14 12:11:23 +04:00
Rasmus Lerdorf
42f3344d85
Merge branch 'PHP-5.5'
2012-12-13 16:54:51 -08:00
Rasmus Lerdorf
c701aeba0b
Merge branch 'PHP-5.5'
2012-12-13 16:43:04 -08:00
Rasmus Lerdorf
8fbeb6e342
Merge branch 'PHP-5.4'
2012-12-13 16:16:45 -08:00
Arpad Ray
c66e54d72e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #63379 - Don't reset mod_user_is_open in destroy
2012-12-14 00:03:08 +00:00
Johannes Schlüter
f8a2407655
Merge branch 'PHP-5.5'
2012-12-13 22:50:55 +01:00
Anatoliy Belsky
54a04d2553
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:06:15 +01:00
Dmitry Stogov
432902a875
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed unreachable code
2012-12-13 17:51:41 +04:00
Dmitry Stogov
7dd16bcff4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed unnecessary checks
2012-12-13 17:30:39 +04:00
Dmitry Stogov
cc118f78d7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed redundand checks from release build
2012-12-13 14:47:23 +04:00
Dmitry Stogov
20113b5640
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
2012-12-13 13:41:04 +04:00
Xinchen Hui
7ed8593576
Merge branch 'PHP-5.5'
2012-12-13 10:45:50 +08:00
Xinchen Hui
3516b9857f
Merge branch 'license_fix' of https://github.com/leight/php-src
2012-12-13 10:38:20 +08:00
Dmitry Stogov
0450cb7487
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Really fix test pdo_mysql_class_constants.phpt
2012-12-13 02:53:06 +04:00
Dmitry Stogov
7b84d129d7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
An exception thrown in try or catch block is disacarded by return statement in finally block.
2012-12-13 02:52:23 +04:00
Remi Collet
1f73ce3ed6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Really fix test pdo_mysql_class_constants.phpt
2012-12-12 16:58:51 +01:00
Dmitry Stogov
e7364e14da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Restored proper generators behaviour in conjunction with "finally". (Nikita)
2012-12-12 17:50:01 +04:00
Leigh
349baa3da4
Fixed license
...
Looks like a find and replace gone wrong.
2012-12-12 12:14:52 +00:00
Remi Collet
261995e02a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #63738 unpack: back result with Z format
2012-12-11 16:34:51 +01:00
Dmitry Stogov
2025021ed5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
2012-12-11 17:28:09 +04:00
Adam Harvey
b10460dc4b
Merge branch 'PHP-5.5'
2012-12-11 19:58:04 +08:00
Adam Harvey
ac0fb01a21
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Deprecate ext/mysql.
2012-12-10 22:26:17 +08:00
Johannes Schlüter
ef7ab813d8
Merge branch 'PHP-5.5'
2012-12-10 13:36:20 +01:00
Johannes Schlüter
ab2bfb6000
Merge branch 'PHP-5.5'
2012-12-10 13:34:45 +01:00
Xinchen Hui
80e585027e
Merge branch 'PHP-5.5'
2012-12-10 20:31:01 +08:00
Xinchen Hui
107093e4a3
Merge branch 'PHP-5.5'
2012-12-10 18:35:44 +08:00
Dmitry Stogov
3067f54b27
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Generatirs are going to be used less than regular functions
2012-12-06 13:20:49 +04:00
Sebastian Bergmann
4f4262e9be
Merge branch 'PHP-5.5'
2012-12-06 09:44:20 +01:00
Sebastian Bergmann
6fc2ecaaf2
Merge branch 'PHP-5.5'
2012-12-06 09:30:47 +01:00
Sara Golemon
5ac35770f4
Add UConverter class (ICU's UConverter API)
...
RFC at http://wiki.php.net/rfc/uconverter
2012-12-05 15:07:36 -08:00
Johannes Schlüter
c058ed51e3
Merge branch 'PHP-5.5'
2012-12-05 19:03:15 +01:00
Dmitry Stogov
5ae182e349
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use get_gc instead of hacks of get_properties
2012-12-05 18:00:00 +04:00
Dmitry Stogov
73601e21e1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
2012-12-05 17:56:10 +04:00
Dmitry Stogov
55e1a9786a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed comments
2012-12-05 16:03:37 +04:00
Dmitry Stogov
4facafddbb
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Two tests deactivated until #63688 was fixed
2012-12-05 13:36:55 +04:00
Dmitry Stogov
77a9b9ac22
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Slight performance improvement
2012-12-05 13:36:28 +04:00
Anatoliy Belsky
9e50c54eec
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Two tests deactivated until #63688 was fixed
2012-12-05 09:58:25 +01:00
Stanislav Malyshev
fdd339677b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.4.11-dev
2012-12-04 21:33:44 -08:00
Stanislav Malyshev
7883c07297
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update NEWS
2012-12-04 21:28:12 -08:00
Stanislav Malyshev
8277f0f3f0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #63666 - Poor date() performance
2012-12-04 21:03:14 -08:00
David Soria Parra
981bc6fd96
Merge branch 'PHP-5.5'
...
* PHP-5.5:
News for enabling systemtap support on linux
2012-12-05 00:54:45 +01:00
David Soria Parra
808afd6db3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Pass zend_execute_data instead of zend_op_array
2012-12-05 00:46:30 +01:00
David Soria Parra
e4c1aa33ab
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Overwrite execute_ex instead of execute in dtrace_execute
Enable dtrace probes on linux as they are compatible with systemtap
2012-12-04 21:02:23 +01:00
Colin Viebrock
6eb0aa9794
fix for scrolling, other minor tweaks
2012-12-04 09:37:10 -06:00
Dmitry Stogov
4d5859558a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Increased version numbers
2012-12-04 10:48:49 +04:00
Dmitry Stogov
f4263c2d0f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Moved zend_create_execute_data_from_op_array() implementation from zend_vm_execute.skl to zend_execute.c
2012-12-04 10:43:59 +04:00
Dmitry Stogov
3f47131fc6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Optimized access to temporary and compiled VM variables
2012-12-04 10:35:52 +04:00
Remi Collet
65973c240e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce case where this test will fails: - no connection AND no mysqli extension
2012-12-03 15:35:15 +01:00
Anatoliy Belsky
5619122fd2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert the previous test fix
2012-12-03 15:16:54 +01:00
Remi Collet
f78a68ff95
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix inifile.c:419:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] Please check this minor change.
use php_stream_copy_to_stream_ex instead of deprecated php_stream_copy_to_stream
2012-12-03 13:39:58 +01:00
Anatoliy Belsky
243da297c3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix test with a slightly different warning in TS
Adding tests for private and protected properties
Fixing test according to @jpauli's suggestions
Adding regression test for behavior of magic methods with unset public properties
Conflicts:
NEWS
2012-12-03 10:53:14 +01:00
Lars Strojny
87b8ee755a
Merge branch 'PHP-5.5'
2012-12-02 19:52:16 +01:00
Lars Strojny
d1b8c6df76
Merge branch 'PHP-5.4'
2012-12-02 19:41:55 +01:00
Remi Collet
d77dab19eb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
2012-12-01 10:26:55 +01:00
Felipe Pena
80004db65d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed ZTS build
2012-11-30 09:07:47 -02:00
Dmitry Stogov
8cbe4f7e17
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63066 (Calling an undefined method in a generator results in a seg fault) (fixed with previous commit).
2012-11-30 14:16:38 +04:00
Dmitry Stogov
3985f06115
Merge branch 'PHP-5.5'
...
* PHP-5.5:
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 14:03:23 +04:00
Xinchen Hui
db74b9c76e
Merge branch 'PHP-5.5'
2012-11-30 14:50:35 +08:00
Xinchen Hui
79331f7533
Merge branch 'PHP-5.5'
2012-11-30 14:34:10 +08:00
Xinchen Hui
d173909e88
Merge branch 'PHP-5.5'
2012-11-30 14:31:19 +08:00
Dmitry Stogov
2d458b2348
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
2012-11-29 16:45:22 +04:00
Dmitry Stogov
2cfe91f684
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #61557 (Crasher in tt-rss backend.php)
2012-11-29 14:43:46 +04:00
Dmitry Stogov
8b7df4bbd8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63635 (Segfault in gc_collect_cycles)
2012-11-29 13:48:44 +04:00
Remi Collet
351e80e753
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #63581 Possible buffer overflow
Fixed Bug #63581 Possible null dereference
2012-11-28 10:39:23 +01:00
Remi Collet
e4eb026834
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
BFN #61272
fix bug #61272 ob_start callback get passed empty string
2012-11-28 10:32:23 +01:00
Michael Wallner
178e9919b2
Merge branch 'PHP-5.4'
2012-11-28 10:24:42 +01:00
Remi Collet
6c7c11c2cc
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
updated NEWS
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
This test isn't supposed to pass on windows
Fixed Bug #63614 (Fatal error on Reflection)
2012-11-28 10:23:50 +01:00
Anatoliy Belsky
df3e1fd484
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
2012-11-27 17:05:48 +01:00
Anatoliy Belsky
1e8b6536ab
Merge branch 'PHP-5.5'
...
* PHP-5.5:
This test isn't supposed to pass on windows
2012-11-27 16:14:00 +01:00
Xinchen Hui
344f228798
Merge branch 'PHP-5.5'
2012-11-27 13:38:38 +08:00
Remi Collet
23e1996a0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Related bug #63588 fix length computation + optimize for speed
2012-11-26 13:06:00 +01:00
Remi Collet
a45aad9f1f
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
count($test_files) already be checked above : if ($test_cnt)
2012-11-26 13:04:34 +01:00
Xinchen Hui
0fa937e106
Merge branch 'PHP-5.5'
2012-11-25 16:20:30 +08:00
Remi Collet
128cc30d85
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63588 Duplicate implementation of php_next_utf8_char
2012-11-25 08:21:35 +01:00
Remi Collet
1550fd880e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #63361 Header not installed
NEWS entries
2012-11-25 07:49:27 +01:00
Xinchen Hui
62c3ef9c32
Merge branch 'PHP-5.5'
2012-11-25 12:05:09 +08:00
Xinchen Hui
20d7ef43f7
XFAIL test should not be considered as failed
2012-11-25 11:46:35 +08:00
Xinchen Hui
f03a91226e
let make test report the run-test result
...
(patch by reeze.xia@gmail.com )
2012-11-25 11:45:36 +08:00
Xinchen Hui
f50f703571
Merge branch 'php.ini_text_fix' of https://github.com/BryanH/php-src
2012-11-25 11:24:32 +08:00
Stanislav Malyshev
f3f4556cc6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix NEWS
5.4.10-dev
2012-11-24 16:30:23 -08:00
Nikita Popov
6e1b84a646
Merge branch 'PHP-5.5'
2012-11-24 19:24:40 +01:00
Remi Collet
239416dd5d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #63149 Feature missing with system SQLite
2012-11-24 17:57:08 +01:00
Remi Collet
5d0e82222e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add unit test for bug 63126
2012-11-24 17:35:30 +01:00
Remi Collet
122e2657e0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
2012-11-24 15:04:22 +01:00
Anatoliy Belsky
35c0928334
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Backported the fix for bug #63248 from 5.4+
2012-11-23 14:02:11 +01:00
Anatoliy Belsky
3a83926ec1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed test for bug #63297
2012-11-22 19:06:19 +01:00
Dmitry Stogov
ffc1f5b2cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved "finally" im[plementation
2012-11-22 15:39:48 +04:00
Johannes Schlüter
015ee80606
Merge branch 'PHP-5.5'
2012-11-21 21:11:44 +01:00
David Soria Parra
fe17de54a2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add myself to QA
2012-11-21 18:42:18 +01:00
Xinchen Hui
458b71e3ee
Merge branch 'PHP-5.5'
2012-11-21 12:31:16 +08:00
Xinchen Hui
e27314e9fa
Merge branch 'PHP-5.5'
...
Conflicts:
UPGRADING
2012-11-21 12:20:21 +08:00
Adam Harvey
74d9254ecc
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fixed bug #63468 (wrong called method as callback with inheritance)
Add actual branch version number to UPGRADING
Remove PHP 5.5 changes from master UPGRADING
Put the new php.ini directives together.
Move the deprecated functions up to the Deprecated Functionality section so they're more visible.
Regenerate Zend ini scanner
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
Fixed ext/intl/tests/timezone_createDefault_basic.phpt
Skip test if directory does not exist
2012-11-21 09:22:03 +08:00
Dmitry Stogov
51abbe5dea
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63468 (wrong called method as callback with inheritance)
Add actual branch version number to UPGRADING
Put the new php.ini directives together.
Move the deprecated functions up to the Deprecated Functionality section so they're more visible.
Conflicts:
UPGRADING
2012-11-20 13:17:21 +04:00
Christopher Jones
ca418b233c
Remove PHP 5.5 changes from master UPGRADING
2012-11-18 14:28:26 -08:00
Christopher Jones
faa7b32ba4
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Regenerate Zend ini scanner
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-18 14:21:01 -08:00
Pierrick Charron
82183b7f62
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Regenerate Zend ini scanner
2012-11-16 18:29:59 -05:00
Pierrick Charron
a4c52f0678
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-16 18:09:51 -05:00
Christopher Jones
05317c5986
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fixed ext/intl/tests/timezone_createDefault_basic.phpt
Skip test if directory does not exist
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
Leftover: Bump version to 5.6.0
Fixed test sapi/cli/tests/006.phpt
Fixed compiler reenterability
Fixed compiler reenterability
Updated NEWS
UPdated NEWS
Updated NEWS
2012-11-15 19:29:56 -08:00
Anatoliy Belsky
6311a864d2
Merge branch 'PHP-5.5'
2012-11-15 14:36:55 +01:00
Johannes Schlüter
358e8e18ab
Merge branch 'PHP-5.5'
2012-11-15 12:30:10 +01:00
Adam Harvey
f55019f1f7
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src: (24 commits)
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
Leftover: Bump version to 5.6.0
Fixed test sapi/cli/tests/006.phpt
Fixed compiler reenterability
Fixed compiler reenterability
Updated NEWS
UPdated NEWS
Updated NEWS
Bump API versions
Bump version to 5.6.0
Enabled apache 2.4 handler build option
Bump version to 5.5.99 and reset NEWS
Build .xz archive during makedist
NEWS: remove dots at the end of the NEWS file
PHP-5.5 is open
Add missing parts from UPGRADING to NEWS
Fixed sockets ext build on win
- Updated to version 2012.10 (2012j)
List ext/intl changes also in NEWS
Update arginfo for preg_match_all() to reflect reality.
...
2012-11-15 09:31:45 +08:00
Anatoliy Belsky
8b6e0c4808
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
2012-11-14 21:31:53 +01:00
Sebastian Bergmann
79726be67d
Leftover: Bump version to 5.6.0
2012-11-14 16:50:33 +01:00
Anatoliy Belsky
b27ef7a4f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed test sapi/cli/tests/006.phpt
2012-11-14 16:25:29 +01:00
Dmitry Stogov
a6ab007435
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compiler reenterability
Fixed compiler reenterability
2012-11-14 18:42:12 +04:00
Anatoliy Belsky
45b9ae5f83
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Updated NEWS
UPdated NEWS
Updated NEWS
2012-11-14 10:17:15 +01:00
David Soria Parra
2e6a4a286e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Bump API versions
2012-11-13 20:58:51 +01:00
David Soria Parra
d71577d2df
Bump version to 5.6.0
2012-11-13 20:43:08 +01:00
Anatoliy Belsky
4259f89b12
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Enabled apache 2.4 handler build option
2012-11-13 19:49:10 +01:00
David Soria Parra
012519839a
Bump version to 5.5.99 and reset NEWS
2012-11-13 17:42:01 +01:00
David Soria Parra
ac0c20e4f8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Build .xz archive during makedist
NEWS: remove dots at the end of the NEWS file
PHP-5.5 is open
Add missing parts from UPGRADING to NEWS
2012-11-13 17:35:45 +01:00
Bryan Hanks, PMP
e7f8f7c01c
Corrected spelling of 'shortcut'
2012-11-12 13:12:13 -06:00
Bryan Hanks, PMP
d0727b58da
Corrected grammar/spelling of text in php.ini files
...
There are no actual code changes here; I corrected grammar and spelling
errors in the php.ini-production and php.ini-development files. I also
rewrote some sentences to make them less cumbersome.
2012-11-12 13:04:32 -06:00
Adam Harvey
9b433e356f
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
make failed tests fail the test target
fix invalid read when trimming empty string
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
2012-11-12 09:10:47 +08:00
Colin Viebrock
65411432bc
Bump up table width a bit more and make columns consistent
2012-11-09 10:04:50 -06:00
Adam Harvey
509f3fe221
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
This will be PHP 5.3.20
fix NEWS
Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
News entry for png memleak fix
News entry for png memleak fix
These need to be volatile in order to prevent leaking after the longjmp in the error handler
These need to be volatile in order to prevent leaking after the longjmp in the error handler
2012-11-09 17:27:05 +08:00
Colin Viebrock
ff93287fff
Bringing CSS up to this decade's standards.
...
Here are some tweaks to the phpinfo() styling, since this really hasn't
been touched in almost a decade:
- color codes are shortened
- table width is bigger and handled via CSS
- fix so that long INI entries don't make the layout super wide
- bgcolor for "Additional Modules" wasn't set
- fix my email address
Signed-off-by: Colin Viebrock <colin@viebrock.ca >
2012-11-08 12:08:45 -06:00
Gustavo André dos Santos Lopes
13f1d53b68
Expose zend_parse_arg() as zend_parse_parameter()
...
Sometimes, one wants to accept several types for a given parameter. zpp
has special functionality for detecting the NULL type, since the NULL
type is frequently used to skip parameters.
However, supporting several types is otherwise very tedious. There are
many cases where this situation arises -- for instance one may want
to accept an arbitrary number of integer and expect them in an array,
but allow a bare integer too; one may want to accept something that
will be used as an array key (which can be either and int or a string);
one may want to accept integer and double numbers. A search for IS_LONG
reveals many situations where this need arises.
The usual solution is to fetch the argument with 'z'/'Z', check its
type, and then convert the argument, e.g. with convert_to_long_ex().
As explain in the last commit, this has different behavior and
generates inconsistency.
Another -- even more flawed strategy --, is to try zpp with a specific
format, forcing it quiet, and if it fails retrying with another form.
But because zpp changes the arguments directly in the stack (for
instance, using "l" converts the zval in the stack to IS_LONG), the
arguments may look different after the first zpp, leaving subtle bugs.
This commit also allows more complex scenarios, for instance where the
expected type of one parameter depends on other parameters.
2012-07-18 23:30:03 +02:00
Gustavo André dos Santos Lopes
980dc7111b
zend_parse_parameters: allow ! for non pointers
...
This commit allows getting information about whether a certain value
was a NULL value by using the ! modifier together with the l/L, d and
b.
Example:
long l;
zend_bool is_null;
zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l!", &l, &is_null)
For the specifiers l/L, d and b, NULL values are reported as 0, 0., or
false. But sometimes one wants to distinguish NULL from those other
values -- for instance, to give NULL the same effect as the argument
not having been passed.
The usual way this problem is handled is by fetching the parameter
with 'z' or 'Z', check if it is NULL and if not use
convert_to_long_ex()/convert_to_double_ex(), etc. Unfortunately, this
is not equivalent. convert_to_long_ex() does a cast, while zpp() is
stricter. For instance, zpp will not accept 'foo' for a long argument,
and it will emit a notice when encountering '5foo'.
In fact, the only way to otherwise zpp semantics (without duplicating
its logic) is to fetch the raw zval from the stack and check whether
it's NULL (with zpp itself or its relatives) and then run zpp again.
That is not an elegant solution.
2012-07-18 23:30:03 +02:00
Leigh
6809c388b5
Tests, fixes and optimisations
...
* Amended existing tests to cater for new functionality.
* Implemented fixes and optimisations recommended by NikiC
* Added create_sid to the registered interface. This was breaking
tests. It also now breaks BC for people implementing the interface
directly instead of extending the class.
2012-06-26 14:57:10 +01:00
Leigh
59cf3a2404
Add create_sid to session_set_save_handler and SessionHandler
...
A lot of code already existed to allow a custom create_sid handler, but
lacked a specific implementation.
Therefore I have added a 7th (optional) argument
session_set_save_handler, to allow a user function to be supplied for
session id generation.
If a create_sid function is not supplied, the default function is
called in its absence to preserve backwards compatibility.
Likewise create_sid only added to SessionHandler class, and not the
interface to maintain backwards compatibility. If the result is not
overridden, the default is called.
2012-06-15 15:06:47 +01:00
SVN Migration
3e94ce6a97
This commit was manufactured by cvs2svn to create tag 'NEWS'.
2008-12-19 02:13:42 +00:00