aa042d0c35
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-06 15:39:33 +08:00
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
6e505f4969
PHP 5.5.2 has already branched
2013-08-05 16:03:22 -07:00
4f87f26d06
Doh. PHP 5.5 NEWS needs own commit.
2013-08-05 15:56:46 -07:00
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
47d66a0b4e
NEWS for recent DTrace merges.
...
Remove redundant 'cp' during DTrace install.
2013-08-05 15:38:36 -07:00
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
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
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
3c5e229212
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
2013-08-05 14:52:12 -07:00
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
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
cabf38af6d
Merge branch 'PHP-5.4'
2013-08-05 17:23:00 +02:00
963c1be38d
Merge branch 'PHP-5.5'
2013-08-05 17:16:05 +02:00
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
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
e59143e896
add news about session fix
2013-08-04 20:06:48 -07:00
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
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
a93a462dce
First fixes for a 64bit compatible ftp extension
2013-08-04 19:31:30 -07:00
e4f9619fad
fix compiler warning, use longs for hashes
2013-08-04 18:04:45 -07:00
b80d73ce15
fix crash, enable session_id and fix test
2013-08-04 17:43:20 -07:00
82b0e8be99
Strict session. Detect session id collision
2013-08-04 16:36:53 -07:00
25e8fcc88f
Strict session
2013-08-04 16:36:45 -07:00
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
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
3626db6142
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo
2013-08-04 16:02:53 -07:00
5f137d080a
fix typo
2013-08-04 16:02:27 -07:00
626d96ab6d
This doesn't fail in 5.5 anymore
2013-08-03 12:14:47 -04:00
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
a03f0943ca
We shouldn't load any local ini files for these tests
2013-08-02 16:23:18 -04:00
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
d60e168a7a
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:12:21 -04:00
9ca7910661
Merge commit 'ea75b1b' into PHP-5.5
...
* commit 'ea75b1b':
This test needs local infile enabled
2013-08-02 15:33:40 -04:00
ea75b1b5db
This test needs local infile enabled
2013-08-02 15:33:18 -04:00
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
e55f08a5ae
This test will only work if gc is enabled
2013-08-02 12:00:48 -04:00
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
5753b74fab
Make sure test.php isn't coming in from the include_path
2013-08-02 11:47:12 -04:00
47ac4f8670
Fixed tests (inet_pton behaves differently on Darwin)
2013-08-02 18:43:08 +08:00
6f1a762fab
Update NEWS
2013-08-02 18:39:41 +08:00
1e942dde24
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-02 18:39:18 +08:00
ce9169e360
Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-02 18:37:15 +08:00
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
cb13f8318b
Add user contributed test. Bug #61748
2013-08-02 09:52:08 +09:00
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
146b933ab4
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
...
This reverts commit 017145bc57
2013-08-01 08:47:13 -07:00
c069b5f571
Use PHP's major version when cleaning up Apache .module files
2013-07-31 12:35:10 -07:00
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
017145bc57
Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:31:50 -07:00
Xinchen Hui