David Soria Parra
f7b10abae9
Replace $Revision$ with $Id$ in keyword expansion enable files
2012-03-20 17:53:47 +01:00
David Soria Parra
eb8812e58b
Enable $Id$ expansion for files with the $Revision$ keyword
...
Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.
2012-03-20 17:49:42 +01:00
Matt Nowack
76ef76d2f8
Adding Braces in json.c to conform with coding standards
2012-03-20 17:29:04 +01:00
Xinchen Hui
7aa2b75db2
Ignore the temporay files in sapi/*/tests/
2012-03-20 17:20:15 +08:00
Christopher Jones
4a6d9b348f
Minor text changes (to try new git repo)
2012-03-19 15:16:33 -07:00
Ilia Alshanetsky
edb57810a7
Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
2012-03-19 13:10:23 -04:00
Sebastian Bergmann
bcd19cf649
Add missing files.
2012-03-19 18:25:37 +01:00
David Soria Parra
887ee455dc
Add .gitignore
...
The gitignore file was created using git svn show-ignore and the overlapping
patterns were removed.
2012-03-19 15:58:34 +01:00
David Soria Parra
3fd0b5f18a
Merge branch 'PHP-5.2' into PHP-5.3
...
This merge is a "fake". It was done with the merge strategy
"ours" to ensure Git thinks both branches are in sync after
the migration from SVN.
2012-03-19 06:11:40 -07:00
Gustavo André dos Santos Lopes
227112cb0f
- Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
...
when get_properties returns a hash table with (inaccessible) dynamic
numeric properties).
2012-03-18 18:23:27 +00:00
Gustavo André dos Santos Lopes
714f1ff4b3
- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
...
FilesystemIterator's iterators are requested more than once without
having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
ef19fba2d5
- Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
...
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
fixing bug #61115 . This better fix for #61115 fixes the leak (the inhibition
for deleting the context was too broad) and so prevents segfaults in new
circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
Michael Wallner
a07759a013
add --PUT-- section support based on POST_RAW
2012-03-17 09:35:25 +00:00
Ilia Alshanetsky
1ef5fa8710
Fixed bug #60947 (Segmentation fault while executing ibase_db_info)
2012-03-15 19:59:26 +00:00
Ilia Alshanetsky
601d17d1ae
Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO).
2012-03-14 20:20:33 +00:00
Ulf Wendel
8665e02ccd
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
Christopher Jones
19c0803b77
Test portability and coverage changes
2012-03-12 18:08:34 +00:00
Ilia Alshanetsky
9c886ea553
Fixed bug #60222 (time_nanosleep() does validate input params).
2012-03-12 16:53:07 +00:00
Xinchen Hui
943a4fed4e
reduce memory usage
2012-03-12 14:52:02 +00:00
Ilia Alshanetsky
2cc64c28f0
Fixed bug #60569 (Nullbyte truncates Exception $message).
2012-03-11 18:15:13 +00:00
Felipe Pena
af2fc625df
- Fixed memory leak when calling SplFileInfo's constructor twice
2012-03-11 15:42:57 +00:00
Xinchen Hui
eac33b454c
Typo when merging from trunk
2012-03-11 15:31:19 +00:00
Xinchen Hui
7536bf963d
Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes)
2012-03-11 15:28:31 +00:00
Xinchen Hui
7ace6dd108
Fix wrong type in the marco of fetching thread globals
2012-03-11 15:12:28 +00:00
Xinchen Hui
41fa157c44
Fixed bug #61088 (Memory leak in readline_callback_handler_install).
2012-03-11 09:19:38 +00:00
Xinchen Hui
e2efb68056
Sorry for wrong order again.
2012-03-11 09:06:12 +00:00
Xinchen Hui
fc3e63e412
Re-order them according to README.SVN-RULES
2012-03-11 09:02:00 +00:00
Xinchen Hui
eff668a596
Oops, sorry for my poor english
2012-03-11 08:34:06 +00:00
Xinchen Hui
533d90066e
Fix test
2012-03-11 08:30:30 +00:00
Xinchen Hui
a7639291b4
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
2012-03-11 08:27:55 +00:00
Gustavo André dos Santos Lopes
7bbf5fe650
- Fixed bug #61326 (ArrayObject comparison).
2012-03-10 17:19:39 +00:00
Michael Wallner
b39ffa3f34
merge 322758 (detect a php-cgi which is a sibling of php cli)
2012-03-09 19:51:09 +00:00
Ilia Alshanetsky
b61f335b9d
Fixed bug #60842 , #51775 (Chunked response parsing error when chunksize length line is > 10 bytes).
2012-03-08 20:14:26 +00:00
Johannes Schlüter
ecf87a96b9
Use correct property ctor, should fix threading issue in bug #55334
...
# The code was refactored in 5_4/trunk, no need to merge
2012-03-08 12:52:12 +00:00
Gustavo André dos Santos Lopes
b976ebad35
- Oops committed old version of the patch in r324020. Fixed. See bug #61253 .
2012-03-08 12:39:48 +00:00
Gustavo André dos Santos Lopes
f413b3726c
- Fixed bug #61253 : Wrappers opened with errors concurrency problem
...
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
Gustavo André dos Santos Lopes
b7c9f8ae8a
- Fixed bug #61267 : pdo_pgsql's PDO::exec() returns the number of SELECTed
...
rows on postgresql >= 9
2012-03-08 08:52:28 +00:00
Ilia Alshanetsky
f005f36cd6
Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
2012-03-08 03:31:46 +00:00
Derick Rethans
c9436c200e
Fixed version numbers.
2012-03-06 18:34:10 +00:00
Derick Rethans
ecf8986a9a
Add the ZEND_DONT_UNLOAD_MODULES environment variable for debugging to 5.3 as
...
well.
2012-03-06 18:25:55 +00:00
Johannes Schlüter
abd5670566
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails
2012-03-06 01:43:49 +00:00
Johannes Schlüter
512fdb4cc2
Fix bug #61003 mysql_stat() require a valid connection
2012-03-06 00:15:40 +00:00
Johannes Schlüter
dc0070e323
Fix bug #61194 PDO should export compression flag with myslqnd
2012-03-05 23:57:24 +00:00
Johannes Schlüter
b526e0e410
Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work
2012-03-05 23:38:15 +00:00
Pierre Joye
2c43149f21
- fix bug #61290 , fix build
2012-03-05 20:53:40 +00:00
Dmitry Stogov
a05a3a0a4a
Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent header)
2012-03-05 12:59:01 +00:00
Dmitry Stogov
e182aeec10
Fixed module numbering
2012-03-05 12:47:25 +00:00
Pierre Joye
3a24a0b76e
- fix bug #54407 , Incorrectly defined NTDDI_VERSION macro
2012-03-04 22:15:12 +00:00
Gustavo André dos Santos Lopes
02592974b4
- size_t may be shorter than long and definitely is not signed. Note that the
...
z modifier was only added in C99, so we can't use it.
2012-03-04 19:30:01 +00:00
Pierre Joye
d85cc4a1a1
- fix bug #54407 , Incorrectly defined NTDDI_VERSION macro
2012-03-04 15:23:24 +00:00