Andrey Hristov
1f7c46b579
be cautious about the result of strrchr
2012-12-18 16:21:05 +01:00
Xinchen Hui
05deaf1706
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-17 14:29:45 +08:00
Xinchen Hui
06739a1b72
dos2unix & skip on connect fail
2012-12-17 14:29:13 +08:00
Xinchen Hui
2f7f57a407
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-17 12:57:37 +08:00
Xinchen Hui
d2cc097049
Fix failed test
2012-12-17 12:56:55 +08:00
Lars Strojny
36a5eca89c
Updating news entry to list new filetypes
2012-12-15 12:00:42 +01:00
Lars Strojny
c3b480323f
News entry for updated mime types
2012-12-14 14:54:38 +01:00
pascalc
d813af0618
update test for supported Mime Types checking
2012-12-14 13:59:06 +01:00
pascalc
e5b1ebc082
update list of common Mime Types in PHP development server to support Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
2012-12-14 13:59:01 +01:00
Rasmus Lerdorf
77c4b84ac8
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:54:31 -08:00
Rasmus Lerdorf
7a49e09fd8
Need connect.inc here
2012-12-13 16:54:16 -08:00
Rasmus Lerdorf
d845549257
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:42:33 -08:00
Rasmus Lerdorf
9d1bc1b622
Fix broken test
...
Need to use the configured connection parameters here. We can't assume
the test user has access.
2012-12-13 16:41:56 -08:00
Rasmus Lerdorf
538d8338c0
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:15:06 -08:00
Rasmus Lerdorf
eecdb4c254
Fix broken test
...
This was missing a %s for the path here
2012-12-13 16:13:37 -08:00
Arpad Ray
6566ea6173
Fix #63379 - Don't reset mod_user_is_open in destroy
...
The parent handler is still open so the reset here was in error.
2012-12-13 23:51:43 +00:00
Johannes Schlüter
ef37055c34
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 22:40:23 +01:00
Johannes Schlüter
a11606b18f
Fix Bug #63762 Sigsegv when Exception::$trace is changed by user
2012-12-13 22:39:35 +01:00
Anatoliy Belsky
0d458ae89f
Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:01:01 +01:00
Dmitry Stogov
35f86d24d8
Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
2012-12-13 13:39:42 +04:00
Xinchen Hui
1f516510b7
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 10:44:56 +08:00
Xinchen Hui
39a3007ab2
MFH
2012-12-13 10:44:14 +08:00
Adam Harvey
2d1694d4eb
Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
...
Fixes bug #63737 (json_decode does not properly decode with options parameter).
2012-12-11 19:51:30 +08:00
Johannes Schlüter
95fd52ff3d
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-10 13:35:57 +01:00
Johannes Schlüter
a2cf4f1932
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2012-12-10 13:35:27 +01:00
Johannes Schlüter
bd36d4901c
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-10 13:32:50 +01:00
Johannes Schlüter
795e3f1c0f
Fix typo
2012-12-10 13:32:08 +01:00
Xinchen Hui
3d86e6d881
Fixed bug #63726 (Memleak with static properties and internal/user classes)
...
No test scripts provided (will try to find one)
2012-12-10 20:29:51 +08:00
Xinchen Hui
8b8fb649dc
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-10 20:29:38 +08:00
Xinchen Hui
ad553a7af2
Fixed bug #63726 (Memleak with static properties and internal/user classes)
2012-12-10 20:28:27 +08:00
Xinchen Hui
a1e401fb34
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-10 18:47:53 +08:00
Xinchen Hui
db6d8e2724
skip 32-bit OS
2012-12-10 18:47:21 +08:00
Xinchen Hui
2a75f59355
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-10 18:29:34 +08:00
Xinchen Hui
d86decd7b4
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2012-12-10 18:28:26 +08:00
Xinchen Hui
fa7e230c76
Need more that 2G memory
2012-12-10 18:28:01 +08:00
Johannes Schlüter
811cd765a9
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
configure.in
main/php_version.h
2012-12-05 19:02:41 +01:00
Johannes Schlüter
22fe268ad4
this will become PHP 5.3.21
2012-12-05 18:55:05 +01:00
Dmitry Stogov
df97c3aa0d
Use get_gc instead of hacks of get_properties
2012-12-05 17:58:36 +04:00
Dmitry Stogov
881416cda6
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
2012-12-05 17:53:26 +04:00
Anatoliy Belsky
73e66ff1bd
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Two tests deactivated until #63688 was fixed
2012-12-05 09:57:36 +01:00
Anatoliy Belsky
94cbd6374a
Two tests deactivated until #63688 was fixed
2012-12-05 09:55:49 +01:00
Stanislav Malyshev
c3b6f6feed
5.4.11-dev
2012-12-04 21:30:50 -08:00
Stanislav Malyshev
d398456e48
update NEWS
2012-12-04 21:27:25 -08:00
Stanislav Malyshev
fd650ec93e
fix bug #63666 - Poor date() performance
2012-12-04 21:02:09 -08:00
Anatoliy Belsky
b8553d8494
Revert the previous test fix
...
The fail seems to be due to network error
2012-12-03 15:14:43 +01:00
Anatoliy Belsky
89e547ce7f
Fix test with a slightly different warning in TS
2012-12-03 10:41:17 +01:00
Marco Pivetta
627eb9e3d9
Adding tests for private and protected properties
2012-12-02 19:47:18 +01:00
Marco Pivetta
12f451c771
Fixing test according to @jpauli's suggestions
2012-12-02 19:47:13 +01:00
Marco Pivetta
1377942b69
Adding regression test for behavior of magic methods with unset public properties
...
Verifies that after having unset a public property, any access to it, be it read or write, causes calls to public magic methods
Signed-off-by: Marco Pivetta <ocramius@gmail.com>
2012-12-02 19:47:09 +01:00
Lars Strojny
12de2e91d0
News entry for bug #49341
2012-12-02 19:41:19 +01:00
