George Wang
78d1228ef6
Fixed Buf #68812 Unchecked return value.
2015-06-08 15:38:59 -04:00
Stanislav Malyshev
07241bbd70
FIx darwin build
2015-05-31 14:52:08 -07:00
Xinchen Hui
d2649af6b9
Fixed Bug #69733 (PHP fails to build with --enable-phpdbg-debug)
2015-05-31 13:35:01 +08:00
Anatol Belski
d361c72168
removed sapi/nsapi
2015-05-30 09:26:40 +02:00
Xinchen Hui
c17029315f
Fixed sapi/tests (maybe needs some run-test.php people's reviewing)
2015-05-27 17:37:34 +08:00
Xinchen Hui
2b41c04124
Seems useless now
2015-05-27 16:54:32 +08:00
Xinchen Hui
151e52f6eb
Fixed the fix in f68dc94aa7
2015-05-27 16:47:15 +08:00
Xinchen Hui
90df7e75e6
Merge branch 'master' into merge-fastcgi
...
Conflicts:
sapi/fpm/fpm/fpm_main.c
2015-05-27 16:36:15 +08:00
Reeze Xia
f68dc94aa7
Remove useless cast
2015-05-27 10:45:19 +08:00
Bob Weinand
5bec1490f9
Fix phpdbg class fetch / method opcodes
2015-05-27 00:55:26 +02:00
Reeze Xia
ca31711625
Fixed phpdbg exit unexpected after signal SIGCONT on OS X
2015-05-26 22:04:50 +08:00
Xinchen Hui
4a728227fc
Merge branch 'PHP-5.6'
2015-05-26 16:26:23 +08:00
Xinchen Hui
1f077cc4f4
Merge branch 'PHP-5.5' into PHP-5.6
2015-05-26 16:24:39 +08:00
Xinchen Hui
76a290d0be
Fixed C89
2015-05-26 16:24:18 +08:00
Anatol Belski
6d582c6a24
added the shared fcgi imp to sapi/cgi
...
This is yet a workaround, if another part of the source would need
the same object file, it'll end up producing duplicated nmake target.
Some additional implementation is needed so same object files can be
shared between different modules, to handle this situation better.
2015-05-26 09:44:41 +02:00
Xinchen Hui
49b10ee264
Merge branch 'master' into merge-fastcgi
2015-05-26 14:17:21 +08:00
Xinchen Hui
9f1788f00d
Only link fastcgi into fpm and cgi
2015-05-26 13:55:39 +08:00
Xinchen Hui
5f753f9e2e
Micro optimizations
2015-05-26 11:47:01 +08:00
Anatol Belski
cfadcfc734
cleanup more redundant S_IS* declarations
2015-05-25 18:03:26 +02:00
Xinchen Hui
06483a98d6
Fixed va_list double used
2015-05-25 15:40:32 +08:00
Nikita Popov
a1ef8b418d
Improve phpdbg opcode dump
...
Don't show <unused>, just don't display anything instead.
Dump nums used in op1/op2/result, e.g. for SEND, RECV etc.
Split the switch into three parts, one for each operand.
2015-05-24 20:29:57 +02:00
Xinchen Hui
f20118aa66
Avoid multipy allocating of request env
2015-05-24 01:07:36 +08:00
Xinchen Hui
86de98caba
Use weak function for fcgi_log
2015-05-23 19:19:48 +08:00
Xinchen Hui
18cf4e0a8a
Fixed fpm-side (tests passes)
2015-05-23 19:01:41 +08:00
Xinchen Hui
fef18f4bea
Merge branch 'master' into merge-fastcgi
2015-05-23 10:29:45 +08:00
Xinchen Hui
ba5ecf355f
Use logger pointer
2015-05-19 16:34:08 +08:00
Xinchen Hui
e383cb4493
Move fastcgi.c to main
2015-05-19 16:04:35 +08:00
Aaron Piotrowski
5c54bf015d
Throwable method signatures.
2015-05-18 14:29:51 -05:00
Aaron Piotrowski
e97d5fab35
Update exception names in tests after formatting changes.
2015-05-17 17:31:43 -05:00
Aaron Piotrowski
fb7206e452
Merge branch 'master' into throwable-interface
2015-05-17 16:15:35 -05:00
Aaron Piotrowski
0eba6f597a
Merge branch 'master' into throwable-interface
2015-05-17 12:12:02 -05:00
Nikita Popov
3ae995f03c
Tweak uncaught exception message display
...
This implements a reduced variant of #1226 with just the following
change:
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d
The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
2015-05-17 18:47:06 +02:00
Aaron Piotrowski
434a46612e
Fix a few missed tests.
2015-05-16 22:04:16 -05:00
Aaron Piotrowski
64b167d201
Updated tests to reflect exception class changes.
2015-05-16 16:49:14 -05:00
Stanislav Malyshev
2660fb96aa
Merge branch 'pull-request/1277'
...
* pull-request/1277:
fix typos
2015-05-16 14:20:41 -07:00
Nikita Popov
c9f27ee422
Display EngineExceptions like ordinary exceptions
...
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.
closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
2015-05-15 23:40:32 +02:00
Dmitry Stogov
0604df8a82
Fixed phpdbg build
2015-05-14 16:47:22 +03:00
olshevskiy87
8bdec7a248
fix typos
...
Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru>
2015-05-13 22:28:35 +04:00
Dmitry Stogov
abb616ae20
Merged fastcgi.* reated changes from sapi/cgi
2015-05-13 18:54:41 +03:00
Matthias Breddin
3b6381125c
Update www.conf.in
2015-05-12 13:52:49 +02:00
Matthias Breddin
6bd4c3e17d
Detailed information about the strftime access.log format
...
More descriptive usage of a custom timeformat
2015-05-12 13:52:49 +02:00
Mats Lindh
7a57061a1f
Add comment about SEARCH HTTP Verb being possible as well
2015-05-12 11:24:27 +02:00
Mats Lindh
b6018144cd
Add test for the SEARCH HTTP verb in the CLI HTTP server.
2015-05-12 11:24:27 +02:00
Mats Lindh
98d015c5b7
Add "SEARCH" as supported HTTP verb.
...
The "SEARCH" HTTP request method is described in RFC5323 as part of
WebDAV, and allows a client to initiate a server side search.
2015-05-12 11:24:27 +02:00
Xinchen Hui
16265a59ac
Use explicit type here
2015-05-12 16:35:57 +08:00
Xinchen Hui
81049cdf06
Implemented fpm_trace for PHP7
2015-05-11 11:22:38 +08:00
Xinchen Hui
460e2e6a04
Fixed test in some cases(for more children, needs more time)
2015-05-07 19:25:04 +08:00
Bob Weinand
49bd5eaabf
Print should be in *current* context (stack)
2015-04-25 19:15:08 +02:00
Bob Weinand
a9a6799964
Add line_start/end info to main op_array
2015-04-25 19:10:58 +02:00
Xinchen Hui
af3c72bc80
fixed warning & test pushing
2015-04-22 10:53:49 +08:00
Bob Weinand
0ec3a6ff33
FAST_RET opcode also returns
2015-04-22 01:11:59 +02:00
Bob Weinand
e09a0bfc9e
Also consider specific catches when checking for uncaught
2015-04-22 01:08:08 +02:00
Bob Weinand
73d31d44e8
Break on uncaught exceptions in current frame in phpdbg
2015-04-22 01:08:07 +02:00
Bob Weinand
76b1d755fc
Fix first frame in backtrace
2015-04-21 22:20:11 +02:00
Bob Weinand
05f896eefd
Add next command docs
2015-04-21 19:42:23 +02:00
Xinchen Hui
e121ccaaad
Fixed warnings and folder marks mess
2015-04-21 21:53:12 +08:00
Bob Weinand
f83ee6a05d
Add next command / Fix recursion/exceptions with u/F/L
2015-04-21 12:31:57 +02:00
Bob Weinand
54018ada7d
Adapt test for new format
2015-04-20 21:05:10 +02:00
Bob Weinand
5f10e84208
Shrink phpdbg opcode dump output a bit more
2015-04-20 20:59:13 +02:00
Bob Weinand
61ba269f4c
Show full stacktraces for exceptions in phpdbg
2015-04-20 14:12:47 +02:00
Bob Weinand
890212866d
Fix uncaught exception in phpdbg
2015-04-20 13:55:09 +02:00
Bob Weinand
5f35e571fa
show opcode count
2015-04-20 13:04:56 +02:00
Bob Weinand
1a249bd674
Shorten opline dump lines and show literals
2015-04-20 12:23:11 +02:00
Bob Weinand
31e98386db
Provide method to access opcodes via command line argument
2015-04-19 21:54:09 +02:00
Bob Weinand
740c86bcbd
Stabilize watchpoints
2015-04-19 12:53:29 +02:00
Dmitry Stogov
ec077328fd
Make valgrind happy
2015-04-15 14:20:59 +03:00
Stanislav Malyshev
b3709bfc52
Merge branch 'PHP-5.6'
...
* PHP-5.6: (27 commits)
fix non-standard C
update NEWS
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix test
fix type in fix for #69085
fix memory leak & add test
Fix tests
fix CVE num
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
...
Conflicts:
Zend/zend_exceptions.c
ext/curl/interface.c
ext/dom/document.c
ext/fileinfo/libmagic/softmagic.c
ext/gd/gd.c
ext/hash/hash.c
ext/pgsql/pgsql.c
ext/phar/phar.c
ext/phar/phar_internal.h
ext/standard/http_fopen_wrapper.c
ext/standard/link.c
ext/standard/streamsfuncs.c
ext/xmlwriter/php_xmlwriter.c
ext/zlib/zlib.c
2015-04-14 01:28:06 -07:00
Stanislav Malyshev
5776fceb16
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5: (27 commits)
fix non-standard C
update NEWS
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix test
fix type in fix for #69085
fix memory leak & add test
Fix tests
fix CVE num
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
...
Conflicts:
ext/standard/http_fopen_wrapper.c
2015-04-14 01:05:01 -07:00
Stanislav Malyshev
0cb9d75cb6
Merge branch 'PHP-5.4.40' into PHP-5.5.24
...
* PHP-5.4.40:
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
Fixed bug #68901 (use after free)
Fixed bug #68740 (NULL Pointer Dereference)
Fix bug #66550 (SQLite prepared statement use-after-free)
Better fix for #68601 for perf 81e9a993f2
Fix bug #68601 buffer read overflow in gd_gif_in.c
Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
Fixed bug #69293
Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
2015-04-11 16:56:12 -07:00
Stanislav Malyshev
809610f5ea
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
2015-04-11 16:53:21 -07:00
Kalle Sommer Nielsen
ca0a2e7a3c
Drop VC6 support in sapi/apache2handler
2015-03-29 06:37:07 +02:00
Kalle Sommer Nielsen
8153286efe
Drop zend_indent() as it was never used, complete or working
2015-03-27 20:04:46 +01:00
Anatol Belski
fc28ae2786
fix test
2015-03-23 22:21:30 +01:00
Stanislav Malyshev
c8aec7665c
Merge branch 'pull-request/1182'
...
* pull-request/1182:
Treat NetBSD the same as FreeBSD wrt. TCP_INFO usage.
2015-03-22 15:29:38 -07:00
Bob Weinand
278adf99de
Fix parent command offsets
2015-03-21 23:19:12 +01:00
Bob Weinand
ea643307db
Put info to info and made print always output opcodes
2015-03-21 23:16:53 +01:00
Bob Weinand
2ed0085833
Add phpdbg -h for help
2015-03-21 23:16:53 +01:00
Bob Weinand
97887e3716
Stabilize (simple) watchpoints with IS_INDIRECT/IS_REFERENCE situations
2015-03-21 23:16:53 +01:00
Xinchen Hui
8aa76a5bdd
Fixed test
2015-03-21 17:50:50 +08:00
Xinchen Hui
c524dd6d1e
Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src
...
Conflicts:
Zend/zend_vm_gen.php
ext/pcre/php_pcre.c
2015-03-21 14:01:11 +08:00
Anatol Belski
49fdb8a91d
fix include
2015-03-19 22:33:14 +01:00
Anatol Belski
d3ab945d9c
using zend_stat_t
2015-03-19 22:33:13 +01:00
Havard Eidnes
36e251ade3
Treat NetBSD the same as FreeBSD wrt. TCP_INFO usage.
2015-03-19 09:39:54 +01:00
Anatol Belski
eb5dfedb6b
don't expect set/get title symbols are always there
2015-03-18 20:50:54 +01:00
Nikita Popov
e39db5773d
Fix phpdbg
2015-03-17 22:59:11 +01:00
Xinchen Hui
50e4033475
Let phpdbg refused to be compiled with no CALL zend vm kind
2015-03-16 17:10:26 +08:00
Lior Kaplan
d79fe57216
Fix copyright years
2015-03-13 11:27:40 +02:00
Lior Kaplan
a4384bd3d4
s/PHP Version 5/PHP Version 7/g
...
Follow up for d0cb7153
2015-03-13 11:09:42 +02:00
Dmitry Stogov
ae26a51f0f
Added API function to call VM opcode handler in a portable way
2015-03-13 11:29:43 +03:00
Wei Dai
25566c67fe
Implement preg_replace_callback_array function
2015-03-13 11:52:36 +08:00
Xinchen Hui
f678c14a6c
Merge branch 'fixed-build' of https://github.com/zxcvdavid/php-src
2015-03-10 10:31:36 +08:00
Wei Dai
3f3e34040a
Fixed compile warnings
2015-03-09 21:25:43 +08:00
Nikita Popov
b0055678bf
Fix CLI test and drop some now unnecessary code
2015-03-09 14:09:34 +01:00
Dmitry Stogov
1c94ff0595
Implement engine exceptions
...
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7
Pending changes regarding naming of BaseException and whether it
should be an interface.
2015-03-09 14:01:32 +01:00
Reeze Xia
2a2c74997d
Now opened_path is a zend_string
2015-03-09 16:12:53 +08:00
Xinchen Hui
96f7a33df6
Temorary fix for phpdbg segfault while use zend_mm_set_custom_handlers
2015-03-09 11:19:05 +08:00
xingxing
1b0d32b350
Add configtest option to fpm init.d script
2015-03-08 22:48:29 +08:00
Xinchen Hui
fd5a756ad4
Revive Zend Signals handler (and fixed bug #61083 )
2015-03-05 18:11:22 +08:00
Reeze Xia
c6e415aeb2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
Conflicts:
main/main.c
2015-03-03 11:44:52 +08:00
Reeze Xia
4e2c87edb3
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
...
This also fixes bug #54081
2015-03-03 11:43:23 +08:00
Reeze Xia
34f09b6240
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
...
This also fixes bug #54081
2015-03-03 11:25:30 +08:00
George Wang
bb491c2de1
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
...
Conflicts:
sapi/litespeed/lsapilib.c
2015-02-25 11:30:33 -05:00
George Wang
65810bf259
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-02-25 11:24:19 -05:00
George Wang
f13a88ac13
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-02-25 11:23:36 -05:00
George Wang
8584cc010a
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-02-25 10:48:19 -05:00
Dmitry Stogov
c2c78dc963
Added specialized versions of DO_FCALL handler:
...
DO_ICALL - for internal functions
DO_UCALL - for user functions
DO_FCALL_BY_NAME - plain, most probably user, funcstions (not methods)
2015-02-25 10:37:21 +03:00
Anatol Belski
af3ca74501
made ZEND_TSRMLS_CACHE_* macros look like function calls
...
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
Felipe Pena
a80ad10d9b
- Fix merge
2015-02-16 12:21:20 -02:00
Antony Dovgal
1d94cd4bfa
Merge branch 'pull-request/995' into PHP-5.5
...
* pull-request/995:
fix bug #68822 (request time is reset too early)
2015-02-16 15:20:39 +03:00
Antony Dovgal
c4664d1731
Merge branch 'pull-request/995' into PHP-5.6
...
* pull-request/995:
fix bug #68822 (request time is reset too early)
2015-02-16 15:15:11 +03:00
redfoxli
3664345aba
fix bug #68822 (request time is reset too early)
...
this caused wrong time in the logs
2015-02-16 15:10:09 +03:00
Dmitry Stogov
e10e151e9b
Merged zend_array and HashTable into the single data structure.
...
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
2015-02-13 22:20:39 +03:00
Anatol Belski
5d8ebcc73c
remove useless condition (same as headers_list())
2015-02-13 11:21:49 +01:00
Reeze Xia
bb20917049
Silence unused variable warning
2015-02-13 10:13:19 +00:00
Reeze Xia
46d9572945
Fixed phpdbg zend_bailout error when compiling syntax error code
...
@krakjoe if there is something wrong, tell me plz
2015-02-13 17:47:47 +08:00
Xinchen Hui
3224459232
Merge branch 'master' of https://git.php.net/repository/php-src
2015-02-13 14:29:27 +08:00
Reeze Xia
39203441ed
Fixed phpdbg backtrace argument's name missing
2015-02-13 06:22:04 +00:00
Xinchen Hui
da7d94cd73
Merge branch 'PHP-5.6'
...
Conflicts:
ext/soap/soap.c
ext/standard/basic_functions.c
ext/zlib/zlib.c
2015-02-13 13:28:24 +08:00
Xinchen Hui
5e7fd50376
Remove useless TSRMLS by merge
2015-02-13 11:02:37 +08:00
Xinchen Hui
309e90638d
Cleanup globals initialization
2015-02-13 10:58:35 +08:00
Anatol Belski
61d85cedd5
fix values for gid and uid
...
As stated by MSDN, these fields are always set to zero
2015-02-11 11:46:31 +01:00
Anatol Belski
e6bf9b45dd
silence unused variable warning
2015-02-11 11:46:30 +01:00
Anatol Belski
12a42433b2
remove useless condition
2015-02-11 11:46:29 +01:00
Reeze Xia
6c9d75b44d
Add missing header inclusion
2015-02-10 22:30:54 +08:00
Dmitry Stogov
1eb4352143
Use new ZEND_HASH_FOREACH_... API.
2015-02-10 15:43:12 +03:00
Anatol Belski
575199a754
removed sapi/webjames
2015-02-10 08:41:22 +01:00
Anatol Belski
f5c796cee4
removed sapi/tux
2015-02-10 08:40:59 +01:00
Anatol Belski
3ef7136cae
removed sapi/thttpd
2015-02-10 08:40:34 +01:00
Anatol Belski
15ab00ddf6
removed sapi/roxed
2015-02-10 08:40:13 +01:00
Anatol Belski
49fc89d1cb
removed sapi/pi3web
2015-02-10 08:39:31 +01:00
Anatol Belski
6482e90970
removed sapi/phttpd
2015-02-10 08:38:47 +01:00
Anatol Belski
e6f62c50cc
removed sapi/milter
2015-02-10 08:38:21 +01:00
Anatol Belski
4fedc42c2b
removed sapi/isapi
2015-02-10 08:37:44 +01:00
Anatol Belski
591f16f392
removed sapi/continuity
2015-02-10 08:37:14 +01:00
Anatol Belski
6d7d1a1bde
removed sapi/caudium
2015-02-10 08:36:43 +01:00
Anatol Belski
fd9c95bac5
removed sapi/apache2filter
2015-02-10 08:36:12 +01:00
Anatol Belski
53349d69dd
removed sapi/apache_hooks
2015-02-10 08:35:36 +01:00
Anatol Belski
51ca2dba53
removed sapi/apache
2015-02-10 08:34:56 +01:00
Anatol Belski
4949fa55ab
removed sapi/aolserver
2015-02-10 08:33:34 +01:00
Bob Weinand
fc444fbc70
Shut up, my lovely compiler; I do not like your warnings
...
Conflicts:
Zend/zend_object_handlers.c
2015-02-09 11:23:35 +08:00
George Wang
c90cd09331
Fixed #68790 (Missing return)
2015-02-07 12:19:53 -05:00
George Wang
c892127f76
Fixed #68790 (Missing return)
2015-02-07 12:18:42 -05:00
George Wang
5e3f0f5671
Fixed #68790 (Missing return)
2015-02-07 12:16:54 -05:00
Stanislav Malyshev
c440043de5
Merge branch 'pull-request/884'
...
* pull-request/884:
Fix #66479 : Wrong response to FCGI_GET_VALUES
2015-02-01 00:36:53 -08:00
Stanislav Malyshev
ac3a4e4200
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66479 : Wrong response to FCGI_GET_VALUES
2015-02-01 00:36:21 -08:00
Frank Stolle
6a905a9a3c
Fix #66479 : Wrong response to FCGI_GET_VALUES
...
Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.
Conflicts:
sapi/cgi/fastcgi.c
2015-02-01 00:35:23 -08:00
Stanislav Malyshev
62d6f91b3e
Merge branch 'pull-request/1011'
...
* pull-request/1011:
Fix for a previous commit. i read it as size_t, notssize_t.
Remove useless tests
2015-02-01 00:21:47 -08:00
Joshua Rogers
d492bc8b6b
Fix for a previous commit. i read it as size_t, notssize_t.
2015-02-01 19:02:25 +11:00
Stanislav Malyshev
141b14454c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Conflicts:
ext/sockets/sockaddr_conv.c
ext/standard/dns.c
2015-01-31 21:50:08 -08:00
Stanislav Malyshev
6a960b6d1b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018
Use better constant since MAXHOSTNAMELEN may mean shorter name
2015-01-31 21:46:56 -08:00
Stanislav Malyshev
2cdbd3537f
use right sizeof for memset
2015-01-31 21:30:58 -08:00
Stanislav Malyshev
41bdd6e7cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925 )
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:12:20 -08:00
Stanislav Malyshev
237128603f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:13 -08:00
Stanislav Malyshev
457367e0b6
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:04:55 -08:00
Michael Wallner
130d7320b1
Merge branch 'incorrect_close' of github.com:MegaManSec/php-src
...
* 'incorrect_close' of github.com:MegaManSec/php-src:
Use correct deallocator in phpdbg
2015-01-30 23:11:33 +01:00
Michael Wallner
c0477fbcb5
Squashed commit of the following:
...
commit 5cee14b14b
Merge: 6392e1e
59593ba
Author: Shafreeck Sea <renenglish@gmail.com>
Date: Tue Jan 27 19:15:48 2015 +0800
Merge branch 'master' of git://github.com/php/php-src
commit 6392e1e86a
Author: Shafreeck Sea <renenglish@gmail.com>
Date: Tue Jan 27 11:32:04 2015 +0800
Remove duplicated line
2015-01-30 23:01:26 +01:00
Anatol Belski
563e7822fd
fix datatype mismatches, improve error checks
2015-01-30 16:31:19 +01:00
Xinchen Hui
88e13bda6a
Fixed bug #68945 (Unknown admin values segfault pools)
2015-01-30 11:01:42 +08:00
Xinchen Hui
95142d9015
Merge branch 'PHP-5.6'
2015-01-27 22:25:55 +08:00
Xinchen Hui
b881de9937
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:25:45 +08:00
Xinchen Hui
4c5995b172
fcgi_write in fpm returns ssizt_t, but it returns int in cgi
2015-01-27 22:25:38 +08:00
Xinchen Hui
737b6f69e3
Merge branch 'PHP-5.6'
2015-01-27 22:20:17 +08:00
Xinchen Hui
92d56b0af6
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:20:03 +08:00
Xinchen Hui
c3ff9aa17d
Revert previous unintentional change to this
2015-01-27 22:19:11 +08:00
Xinchen Hui
9fdf62d64a
Merge branch 'PHP-5.6'
...
Conflicts:
sapi/cgi/cgi_main.c
2015-01-27 22:15:12 +08:00
Xinchen Hui
6336fa18c4
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:13:04 +08:00
Xinchen Hui
8c2d91761a
Also Fixed #68571 in CGI SAPI, and some cleanup
2015-01-27 22:11:23 +08:00
Xinchen Hui
6c87372199
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
2015-01-27 22:04:23 +08:00
Joshua Rogers
305c03e757
Use correct deallocator in phpdbg
2015-01-27 09:28:54 +11:00
Nikita Popov
e05993dfa2
Remove dl() on fpm-fcgi
2015-01-26 21:00:23 +01:00
Dmitry Stogov
3e31838d19
zend_read_property() has to provide a holder for return value.
...
Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
2015-01-22 11:50:42 +03:00
Rasmus Lerdorf
e242f871df
Slightly modify and merge PR#105 from @MegaManSec
2015-01-21 11:40:27 -08:00
Rasmus Lerdorf
295926855b
Slightly modify and merge PR#105 from @MegaManSec
2015-01-21 11:39:23 -08:00
Joshua Rogers
eba0e0348e
Remove useless tests
...
Respective variables are unsigned and cannot be <0.
2015-01-21 05:23:28 +11:00
Xinchen Hui
1b53a99fbf
Remove dead codes
2015-01-19 10:46:59 -05:00
Rasmus Lerdorf
a29601a2b4
Weird, is nobody compiling this?
2015-01-15 17:44:11 -08:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Xinchen Hui
2193de0d18
Faster sorting algo
2015-01-14 18:02:41 +08:00
Xinchen Hui
d805fa0d81
Fixed #68790 (Missing return)
2015-01-10 22:19:49 -05:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Rasmus Lerdorf
dbd02ad23b
Fix bug #68784
2015-01-09 18:09:44 -08:00
Rasmus Lerdorf
5065505c93
Fix bug #68784
2015-01-09 18:09:13 -08:00
Rasmus Lerdorf
e4b3d623a2
Fix bug #68784
2015-01-09 18:08:36 -08:00
Rasmus Lerdorf
50c721a623
These tests all assume that IPV6 is available.
2015-01-09 17:24:48 -08:00
Remi Collet
1b5e87862f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
cleanup old unused typedef
2015-01-06 11:07:10 +01:00
Remi Collet
0ba32e5cf9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
cleanup old unused typedef
2015-01-06 11:06:53 +01:00
Remi Collet
8404f8ac2a
cleanup old unused typedef
2015-01-06 11:06:25 +01:00
Adam Harvey
a607a1db1d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.
Conflicts:
sapi/cli/php_cli_server.c
2015-01-06 01:29:40 +00:00
Adam Harvey
27ff425b78
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.
Conflicts:
sapi/cli/tests/php_cli_server.inc
2015-01-06 01:27:37 +00:00
Adam Harvey
448ef30f75
Handle NULL strings in sapi_cli_server_register_variable().
...
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
2015-01-06 01:23:27 +00:00
Adam Harvey
0cc2810498
Allow CLI server test scripts to specify the name of the router file.
...
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
2015-01-06 01:22:59 +00:00
Remi Collet
e7cdf9df7c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:36:26 +01:00
Remi Collet
eb1a1d5feb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:35:14 +01:00
Remi Collet
1b6d076244
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:33:57 +01:00
Xinchen Hui
28985e982b
Still -1 on *BSD now
2015-01-04 22:08:35 -05:00